clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-26 20:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,392 Commits 494 Branches 1,367 Tags 881 MiB
19adcf8cb9
Commit Graph

93392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
19adcf8cb9 Merge branch 'PHP-7.0' 2015-11-24 11:06:18 +08:00
Xinchen Hui
31b4581c45 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2015-11-24 11:05:56 +08:00
Xinchen Hui
26a526fb4a Merge branch 'PHP-7.0' 2015-11-24 11:05:13 +08:00
Xinchen Hui
91fb1edbbf Fixed bug #70963 (Unserialize shows UNKNOW in result) 
Thanks to ryat for reportinig
 2015-11-24 11:04:42 +08:00
Côme Bernigaud
e6759644ec Revert "Added back support for undocummented host:port syntax" 
This reverts commit 15876e85e5.
 2015-11-24 03:45:21 +01:00
Côme Bernigaud
5a8bcf73ba Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)" 
This reverts commit 391087ed28.
 2015-11-24 03:45:17 +01:00
Lior Kaplan
c1b374554c Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)
 2015-11-23 19:02:41 +02:00
Lior Kaplan
a8bd182ccd Align NEWS entries format 2015-11-23 19:00:42 +02:00
Lior Kaplan
818bffc534 Add NEWS entry for #61751 2015-11-23 18:58:03 +02:00
Lior Kaplan
9642710a09 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)

 Conflicts:
	sapi/cgi/config9.m4
	sapi/fpm/config.m4
 2015-11-23 18:56:13 +02:00
Bob Weinand
9bbdb86ed7 Merge branch 'PHP-7.0' 2015-11-23 17:46:39 +01:00
Lior Kaplan
1c72e5b299 Align NEWS entries format 2015-11-23 18:46:19 +02:00
Bob Weinand
c1189eccae Output stderr on real stderr in phpdbg 2015-11-23 17:46:07 +01:00
Lior Kaplan
532912d8ab Add NEWS entry for #61751 2015-11-23 18:42:21 +02:00
Lior Kaplan
d6b78a3511 Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions) 2015-11-23 18:40:47 +02:00
Xinchen Hui
34bff5b91c Merge branch 'PHP-7.0' 2015-11-23 23:16:11 +08:00
Xinchen Hui
7e9f416218 Fixed bug #70959 (ArrayObject unserialize does not restore protected fields) 2015-11-23 23:15:33 +08:00
Xinchen Hui
26f3710ae8 Merge branch 'PHP-7.0' 2015-11-23 06:22:11 -08:00
Xinchen Hui
801e46d8c0 Add test for bug (count on symbol table) 
I should have do this ....
 2015-11-23 06:21:30 -08:00
Xinchen Hui
8c22edc546 Merge branch 'PHP-7.0' 2015-11-23 06:12:46 -08:00
Xinchen Hui
6313e16a04 Improved fix for bug (count on symbol table) 2015-11-23 06:12:03 -08:00
Xinchen Hui
2ae9a6fca6 Merge branch 'master' of git.php.net:/php-src 2015-11-23 18:49:25 +08:00
Xinchen Hui
6dbf8d142f Merge branch 'PHP-7.0' 2015-11-23 18:48:59 +08:00
Xinchen Hui
8c51578c81 Merge branch 'PHP-5.6' into PHP-7.0 2015-11-23 18:48:51 +08:00
Xinchen Hui
b9845e5006 Add bug #70957 and #70958 releated test in refection 2015-11-23 18:48:21 +08:00
Andrey Hristov
6b0d026c76 Remove unused variable 2015-11-23 11:36:25 +01:00
Xinchen Hui
42252f409b Merge branch 'PHP-7.0' 2015-11-23 18:33:21 +08:00
Xinchen Hui
45c5e27183 Fixed test 2015-11-23 18:33:14 +08:00
Xinchen Hui
51ccc88b87 Port fix to 7.0 2015-11-23 18:31:56 +08:00
Xinchen Hui
397be4ff54 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	Zend/zend_compile.c
 2015-11-23 18:30:41 +08:00
Xinchen Hui
a2b85ddecf Fixed bug #70958 (Invalid opcode while using ::class as trait method paramater default value) 2015-11-23 18:29:59 +08:00
Xinchen Hui
f49078fd76 Merge branch 'master' of git.php.net:/php-src 2015-11-23 12:41:15 +08:00
Xinchen Hui
3bd231c0a0 Merge branch 'PHP-7.0' 2015-11-23 12:40:54 +08:00
Xinchen Hui
1b16c2f41c Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	Zend/zend_compile.c
 2015-11-23 12:22:17 +08:00
Xinchen Hui
ab17840d33 Fixed bug #70957 (self::class can not be resolved with reflection for abstract class) 2015-11-23 12:20:44 +08:00
Côme Bernigaud
56b584491b Merge branch 'php-7.0' 
* php-7.0:
  Revert "Added back support for undocummented host:port syntax"
  Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)"
 2015-11-23 03:15:46 +01:00
Côme Bernigaud
ab39f981f8 Revert "Added back support for undocummented host:port syntax" 
This reverts commit 15876e85e5.
 2015-11-23 03:08:25 +01:00
Côme Bernigaud
a9bfdcb82c Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)" 
This reverts commit 391087ed28.
 2015-11-23 03:08:02 +01:00
Xinchen Hui
58168b48e2 Fixed tests (new opcache will optimize serias echo IS_CONST into one) 2015-11-22 06:49:28 -08:00
Xinchen Hui
3178242cda Merge branch 'PHP-7.0' 2015-11-21 20:58:34 -08:00
Xinchen Hui
eada2aa91a Fixed bug (count on symbol tables) 2015-11-21 20:58:29 -08:00
Xinchen Hui
7bfc4fca60 cleanup 2015-11-21 07:14:12 -08:00
Xinchen Hui
fb7564d457 Merge branch 'PHP-7.0' 2015-11-21 06:11:02 -08:00
Xinchen Hui
31d93fcf4b Port the fix of 5.6 to 7.0 2015-11-21 05:41:53 -08:00
Xinchen Hui
c6961cb41b Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	Zend/tests/bug70944.phpt
	Zend/zend_exceptions.c
 2015-11-21 05:03:20 -08:00
Xinchen Hui
205e0ba81d Update test script 2015-11-21 05:01:51 -08:00
Xinchen Hui
cbc71995a8 Unused var 2015-11-21 04:54:48 -08:00
Xinchen Hui
7b195c9875 Improved fix for bug #70944 2015-11-21 00:27:56 -08:00
Xinchen Hui
1e9fcb49ac conflicts variable name 2015-11-20 19:03:18 -08:00
Dmitry Stogov
4d49736155 cleanup 2015-11-21 01:19:45 +03:00