php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-05 07:02:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
92,239 Commits 547 Branches 1,481 Tags
a96f99e30a91f00de8ff49bb925ba5fda296d2c2
Commit Graph

92239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Jones
a96f99e30a Final diff fixes for PHP7 on base platform (some mem leaks still to be fixed). Update driver name. Improve test portability (Senthil) 2015-09-12 09:10:32 +10:00
Christopher Jones
4ee6a9a9a9 Merge branch 'master' of https://git.php.net/repository/php-src 2015-09-12 09:05:41 +10:00
Bob Weinand
b0174a14c0 Fixed bug #70478 (**= does no longer work) 
Reordered ZEND_(ASSIGN_)POW opcodes in zend_vm_def.h so that it won't be missed in future
 2015-09-12 00:54:48 +02:00
Christopher Jones
8c63d69aa9 Merge branch 'master' of https://git.php.net/repository/php-src 2015-09-12 08:51:24 +10:00
Dmitry Stogov
51aa1b5a1d Manual CSE to avoid double read 2015-09-11 14:13:41 +03:00
Xinchen Hui
465d0326d1 Change this as sixd suggested 2015-09-11 15:05:56 +08:00
Xinchen Hui
874dc06156 Merge branch 'PHP-5.6' 2015-09-11 13:52:00 +08:00
Xinchen Hui
37d814b84c Add test XFAIL for bug #70470 2015-09-11 13:45:18 +08:00
Xinchen Hui
4ddeeb49a5 Remove free_string_zval 2015-09-11 10:58:24 +08:00
Dmitry Stogov
719664dec2 fixed compilation error 2015-09-10 20:24:11 +03:00
Dmitry Stogov
1b8bf059c4 Don't keep dangling pointer. 2015-09-10 20:03:42 +03:00
Xinchen Hui
97b85364a5 Fixed Sixd :< 2015-09-10 20:14:22 +08:00
Xinchen Hui
bb4c0c0703 Merge branch 'PHP-5.6' 2015-09-10 19:56:18 +08:00
Xinchen Hui
a8368ddc38 Fixed bug #70431 (Memory leak in php_ini.c) 2015-09-10 19:56:13 +08:00
Xinchen Hui
66643f6192 Use efree_size 2015-09-10 16:22:07 +08:00
Xinchen Hui
213b49620d Simplfy zend_is_true 2015-09-10 16:13:22 +08:00
Xinchen Hui
f3e8675d38 Added folder marks 2015-09-10 15:01:28 +08:00
Xinchen Hui
7a0e68b97c Unexpected 2015-09-10 14:57:22 +08:00
Xinchen Hui
6852f9cd43 cleanup tmp_member handling 2015-09-10 14:39:25 +08:00
Dmitry Stogov
27f6b8864e Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Aligned IntlChar protos to their ARG_INFO (related to #70453)
  Skip IntlChar related test if ext/intl is not available
 2015-09-10 02:53:57 +03:00
Dmitry Stogov
c174e4cd73 Change array sorting implementation to avoid two level callbacks system. 
Simplify zval comparion API.
 2015-09-10 02:51:23 +03:00
Christoph M. Becker
46c20ecf0a Aligned IntlChar protos to their ARG_INFO (related to #70453) 2015-09-10 01:38:15 +02:00
Christoph M. Becker
31962306f4 Skip IntlChar related test if ext/intl is not available 2015-09-10 01:31:55 +02:00
Côme Bernigaud
059dd18c37 Added support of LDAP_OPT_TIMEOUT, fixes #69574 2015-09-09 18:02:10 +02:00
Dmitry Stogov
2ea18cd431 Better array_compare improvement 2015-09-09 15:11:03 +03:00
Lior Kaplan
e0f390cb72 Add entry for #70284 in 7.0.0RC2 2015-09-09 14:22:46 +03:00
Lior Kaplan
43f6099ce4 Add entry for #70284 in 5.6.13 2015-09-09 14:20:04 +03:00
Dmitry Stogov
ac83eaef10 Don't inline "slow" and rarely used functions. 2015-09-09 13:42:35 +03:00
Xinchen Hui
6d885e395c Merge branch 'master' of git.php.net:/php-src 2015-09-09 18:02:27 +08:00
Xinchen Hui
59e8eae4b0 Useless ZVAL_UNDEF 2015-09-09 18:00:04 +08:00
Xinchen Hui
67d1a47887 Improved array_compare 2015-09-09 17:56:44 +08:00
Côme Bernigaud
fb9d934d51 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
 2015-09-09 11:05:29 +02:00
Dmitry Stogov
b1be126788 Avoid useless EG(exception) checks 2015-09-09 11:54:44 +03:00
Côme Bernigaud
a483a79c85 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
 2015-09-09 10:34:46 +02:00
Côme Bernigaud
cc7140e8d9 Merge branch 'pull-request/1512' into PHP-5.5 
* pull-request/1512:
  Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
 2015-09-09 10:30:17 +02:00
Xinchen Hui
b00a315806 Unused var 2015-09-09 15:15:43 +08:00
Xinchen Hui
98bf9156d5 unused var 2015-09-09 15:11:42 +08:00
Christoph M. Becker
502b70c50c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Skip test for old glibc iconv
 2015-09-09 04:33:28 +02:00
Christoph M. Becker
71da4f1f7f Skip test for old glibc iconv 
bug32001.phpt has a high failure rate for the submitted reports. According to
several samples it seems the iconv implementation of glibc 2.12 (released
2010-05) is the culprit. It seems appropriate to skip the test for such old
versions.
 2015-09-09 04:27:28 +02:00
Nikita Popov
7c8798834a Small cleanup in pack() implementation 2015-09-09 03:58:37 +02:00
Tyson Andre
c3fc65eb7c Fix bug in LDAP extensions' saving TIMELIMIT and DEREF 
LDAP_OPT_TIMELIMIT and LDAP_OPT_DEREF's original values weren't
saved properly because of a bug introduced when copy and pasting.

This lead to the original timeout being changed
when specifying a temporary override (e.g. for ldap_search(..., $timeout))
 2015-09-08 18:42:02 -07:00
Christoph M. Becker
6886bb688b updated NEWS 2015-09-09 03:21:17 +02:00
Christoph M. Becker
71f90dfbad Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #70456: mysqlnd doesn't activate TCP keep-alive when connecting to a server

Resolved conflicts:
	ext/mysqlnd/mysqlnd_net.c
 2015-09-09 03:19:55 +02:00
Christoph M. Becker
b89f128480 updated NEWS 2015-09-09 03:12:59 +02:00
Dmitry Stogov
c7dffb5673 Don't inline "Undefined variable" warning reporting. 2015-09-09 03:18:52 +03:00
Sergei Turchanov
7b3616db77 Fix #70456: mysqlnd doesn't activate TCP keep-alive when connecting to a server 
libmysqlclient activates TCP keep-alive when connecting to a server. PHP
mysqlnd extension must do the same to maintain compatibility.
 2015-09-09 01:43:29 +02:00
Bob Weinand
c12917aa45 Merged RFC Random Functions Throwing Exceptions in PHP 7 
Squashes commits from PR #1397

commit cd5dcc8c9eb43603d908abcea69c9e18df0f2ed5
Author: SammyK <sammyk@sammykmedia.com>
Date:   Tue Sep 8 13:53:42 2015 -0500

    Add min max samezies

commit b719499218a4e84efecd4dc1d4235d16142c9793
Author: SammyK <sammyk@sammykmedia.com>
Date:   Wed Sep 2 07:00:25 2015 -0500

    Make random_bytes() throw Error when $length <= 0 and random_int() throw Error when $min > $max

commit 0cca557291c278716ec4b00b32fc2bdc1c1c8848
Author: SammyK <sammyk@sammykmedia.com>
Date:   Wed Sep 2 06:55:59 2015 -0500

    Make random_*() functions throw Error exception when random bytes cannot be obtained

commit 998c7f1e209123605b41139e8d9093075ce16bd6
Author: SammyK <sammyk@sammykmedia.com>
Date:   Wed Sep 2 06:41:20 2015 -0500

    Make random_*() functions throw TypeError when zend_parse_parameters fails

commit 99d305c18820ff55d82d952777cbcdf1cf0158be
Author: SammyK <sammyk@sammykmedia.com>
Date:   Mon Jul 6 19:50:47 2015 -0500

    Make exceptions less specific

commit b042dfab290713366741a663a420cf12bf802f39
Author: SammyK <sammyk@sammykmedia.com>
Date:   Mon Jul 6 17:20:13 2015 -0500

    Upgrade warnings to RuntimeExceptions
 2015-09-09 01:00:29 +02:00
Dmitry Stogov
aa3fd8c849 Fixed typo that might cause serious bugs in MM. May be it was the reason of bug #70392 (SIGSEGV during PHP shutdown). 2015-09-08 17:22:26 +03:00
Dmitry Stogov
bfab74d574 Check EG(exception) only if it's really necessary 2015-09-08 17:20:52 +03:00
Yasuo Ohgaki
3bf9bd5e92 Fix typo in comment. 2015-09-08 18:52:31 +09:00