Commit Graph

93715 Commits

Author SHA1 Message Date
Stanislav Malyshev
57d170aae0 Merge remote-tracking branch 'security/PHP-7.0.5' into PHP-7.0.5
* security/PHP-7.0.5:
  Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
  Fix bug #71860: Require valid paths for phar filenames
  update NEWS
  Fixed bug #71704 php_snmp_error() Format String Vulnerability
2016-03-28 23:49:03 -07:00
Derick Rethans
2d112e1378 Updated to version 2016.3 (2016c) 2016-03-28 15:31:51 +02:00
Anatol Belski
e93c6910fc Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
The actual fix is applying the upstream patch from
6713ca45e7
2016-03-28 00:45:19 +02:00
Anatol Belski
4bbc811ff4 update NEWS 2016-03-23 12:28:48 +01:00
Rasmus Lerdorf
06c2b31866 Disable huge pages in the Zend allocator by default
As per the discussion on internals, this is an expert feature
that needs special system-level configuration and care.
2016-03-23 12:23:35 +01:00
Dmitry Stogov
75dd4a7a50 Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0. 2016-03-23 12:23:03 +01:00
Stanislav Malyshev
1e9b175204 Fix bug #71860: Require valid paths for phar filenames 2016-03-20 21:24:12 -07:00
Anatol Belski
884c7d181f update NEWS 2016-03-16 09:50:51 +01:00
Anatol Belski
6e25966544 Fixed bug #71704 php_snmp_error() Format String Vulnerability 2016-03-16 09:48:40 +01:00
Remi Collet
ffe82dd775 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix #ifdef usage
2016-03-16 08:11:50 +01:00
Derick Rethans
89919b5ec5 Updated to version 2016.2 (2016b) 2016-03-15 11:17:57 +01:00
Anatol Belski
68a29ccb84 update libs versions 2016-03-15 09:51:47 +01:00
Anatol Belski
7fead8e8f5 set RC1 versions 2016-03-15 08:32:03 +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
Anatol Belski
3edd33083c fix invalid pointer on 64-bit 2016-03-10 08:45:29 +01:00
Xinchen Hui
753bbad535 Useless check (part of #71753) 2016-03-10 15:43:22 +08:00
Xinchen Hui
a0fac47364 object->ce should not be NULL 2016-03-10 15:26:15 +08:00
Xinchen Hui
351201bc7b Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed typo (partially fix for #71753)

Conflicts:
	ext/standard/uuencode.c
2016-03-10 15:23:40 +08:00
Xinchen Hui
915a3762ef Fixed typo (partially fix for #71753) 2016-03-10 15:22:34 +08:00
Xinchen Hui
c3cf6f2a68 emalloc never returns NULL (partially fix for #71753) 2016-03-10 15:15:26 +08:00
Xinchen Hui
675c295722 Improve the codes (FETCH_DIM_R/IS is read context, we should not expose IS_REFERENCE) 2016-03-10 15:09:51 +08:00
Xinchen Hui
98c625a31c Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi) 2016-03-10 15:02:10 +08:00
Xinchen Hui
9833c76d3f Bug #71756 (Call-by-reference widens scope to uninvolved functions when used in switch) 2016-03-10 14:58:10 +08:00
Xinchen Hui
7d5f71b0b1 tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752) 2016-03-10 14:24:13 +08:00
Nikita Popov
5a6da79fd0 Fix bug #71659 2016-03-09 23:00:53 +01:00
Anatol Belski
86229f9943 fix SKIPIF sections 2016-03-09 14:28:38 +01:00
Anatol Belski
a2022fd82a Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix directory separator
2016-03-09 14:17:30 +01:00
Anatol Belski
a1d1f54b42 fix directory separator 2016-03-09 14:16:29 +01:00