clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-30 22:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,729 Commits 494 Branches 1,367 Tags 797 MiB
910e6dc6b8
Commit Graph

93729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
910e6dc6b8 Fixed for master 2016-03-17 21:10:08 +08:00
Xinchen Hui
aef22ac1c1 Remove unnecessary pattern 2016-03-17 20:21:36 +08:00
Xinchen Hui
041a01fd6c Fixed for PHP7 2016-03-17 20:20:01 +08:00
Xinchen Hui
820b0aa2ab Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER)
 2016-03-17 19:54:33 +08:00
Xinchen Hui
8e2f658f49 Fixed bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER) 2016-03-17 19:54:19 +08:00
Xinchen Hui
dae086040e Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed test script
 2016-03-17 17:07:07 +08:00
Xinchen Hui
6d4aec029a Fixed test script 2016-03-17 17:06:56 +08:00
Xinchen Hui
e12456603a Remove typo 2016-03-17 15:27:36 +08:00
Xinchen Hui
b8f0cb063f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed test script
 2016-03-17 15:23:53 +08:00
Xinchen Hui
ead7632cf9 Fixed test script 2016-03-17 15:23:44 +08:00
Xinchen Hui
47f3b3df45 Update NEWS 2016-03-17 15:23:21 +08:00
Xinchen Hui
fe1a3fc08b Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #71841 (EG(error_zval) is not handled well)
  Fixed bug #71840 (Unserialize accepts wrongly data)

Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/standard/var_unserializer.c
 2016-03-17 15:22:44 +08:00
Xinchen Hui
5546f8be56 Fixed bug #71841 (EG(error_zval) is not handled well) 2016-03-17 15:16:47 +08:00
Xinchen Hui
6f241f5fad Fixed bug #71840 (Unserialize accepts wrongly data) 2016-03-17 15:15:28 +08:00
Ferenc Kovacs
fba1c7629c Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  prepare for 5.6.20RC1
 2016-03-17 01:47:37 +01:00
Ferenc Kovacs
14f4848fb0 prepare for 5.6.20RC1 2016-03-17 01:46:00 +01:00
Andrey Hristov
fa4addd409 More email fixing 2016-03-16 10:54:56 +01:00
Andrey Hristov
f2ab731a8c Fix emails in headers. @mysql.com addresses are no more since many years. 2016-03-16 10:24:52 +01:00
Remi Collet
46293ed6d4 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix #ifdef usage
 2016-03-16 07:18:09 +01:00
Remi Collet
478c807128 fix #ifdef usage 2016-03-16 07:17:49 +01:00
Derick Rethans
ba71144b8c Updated to version 2016.2 (2016b) 2016-03-15 09:14:11 +00:00
Derick Rethans
a1c6481c63 Empty merge 2016-03-15 09:14:10 +00:00
Derick Rethans
ddc62f2e8b Updated to version 2016.2 (2016b) 2016-03-15 09:14:09 +00:00
Anatol Belski
ba5b98db8c update libs versions 2016-03-15 09:44:05 +01:00
Anatol Belski
6ec7ef39f4 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update libs versions
 2016-03-15 09:43:08 +01:00
Anatol Belski
73b9941622 update libs versions 2016-03-15 09:41:34 +01:00
Anatol Belski
2921c0e3f6 prepare next 2016-03-15 08:24:41 +01:00
Anatol Belski
0ce801a587 update NEWS 2016-03-15 07:11:21 +01:00
Sean DuBois
68ebfc87ad Fix bug #71624, PHP_MODE_PROCESS_STDIN (CLI SAPI called with '-R') did not properly set $argi and $argn 2016-03-15 07:02:40 +01:00
Anatol Belski
84651b32eb fix uninitialized value 2016-03-15 06:43:29 +01:00
Anatol Belski
704a9aeea7 fix pointer truncation on 64 bit 2016-03-14 16:44:27 +01:00
Anatol Belski
ab7764d99b Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix test
 2016-03-14 15:58:05 +01:00
Anatol Belski
beda05269c fix test 
Many warnings won't appear with libxml2 >= 2.9.3 because in many
cases libxml2 2.9.3 will just abort processing.
 2016-03-14 15:53:02 +01:00
Yasuo Ohgaki
ec12385f04 Update NEWS 
Fixed Bug #71754 Regression in PHP7.0: trivial script segfaults php-cgi
    Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
    Fixed Bug #71599 trans sid handling rework broke interaction with cookies

    All of these bugs are caused by git global change in PHP-7.0.
 2016-03-12 08:52:16 +09:00
Yasuo Ohgaki
ca61f5954b Fixed Bug #71754 Regression in PHP7.0: trivial script segfaults php-cgi 
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
Fixed Bug #71599 trans sid handling rework broke interaction with cookies

All of these bug is caused by git global change in PHP-7.0.
 2016-03-12 08:40:37 +09:00
Yasuo Ohgaki
50fca7a02a Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket 2016-03-12 08:15:47 +09:00
Nikita Popov
02743f43c2 Fixed bug #71806 2016-03-11 22:45:38 +01:00
Grigorii Sokolik
ccc5150f15 Fix bug #71767 2016-03-11 22:27:48 +01:00
Anatol Belski
fca831e8ad update NEWS 2016-03-11 14:23:34 +01:00
Anatol Belski
884f3f0afd Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update NEWS
 2016-03-11 14:23:07 +01:00
Anatol Belski
9d02e3b97e update NEWS 2016-03-11 14:22:11 +01:00
Anatol Belski
d26d80ab75 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix DatePeriod::getEndDate() segfault
 2016-03-11 14:12:54 +01:00
Thomas Punt
f3f5a07aa5 Fix DatePeriod::getEndDate() segfault 2016-03-11 14:08:48 +01:00
Anatol Belski
741bfe3932 fix build with clang on Winodws 2016-03-10 15:30:20 +01:00
Anatol Belski
8b5d09a195 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix error condition, part of bug #71753
 2016-03-10 11:39:16 +01:00
Anatol Belski
8cd903ea68 fix error condition, part of bug #71753 2016-03-10 11:35:50 +01:00
Dmitry Stogov
99c44458da Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:php-src:
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
 2016-03-10 13:34:41 +03:00
Dmitry Stogov
f8506c062f More effecient fix for bug #71756 2016-03-10 13:33:36 +03:00
Anatol Belski
4d4c6cf14e Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
 2016-03-10 09:35:55 +01:00
Xinchen Hui
67f0770036 tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752) 
cherry-picked from 7d5f71b0b1
 2016-03-10 09:33:39 +01:00