Julien Pauli
f0120ff878
5.5.35 now
2016-03-29 18:11:03 +02:00
Anatol Belski
c7f7139985
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix dir separator in test
2016-03-29 14:20:30 +02:00
Anatol Belski
23d0065744
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dir separator in test
2016-03-29 14:19:35 +02:00
Anatol Belski
551423c642
fix dir separator in test
2016-03-29 14:18:25 +02:00
Anatol Belski
dd0a96ae70
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
2016-03-29 13:12:47 +02:00
Anatol Belski
5272184a1e
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-29 13:11:25 +02:00
Anatol Belski
84990ab346
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
2016-03-29 13:11:17 +02:00
Anatol Belski
fe13566c93
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-29 13:10:39 +02:00
Joe Watkins
5074fd9c7c
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
2016-03-29 11:34:58 +01:00
Joe Watkins
d12ed0c7fa
remove unused param
2016-03-29 11:34:18 +01:00
Anatol Belski
3b08638340
update NEWS
2016-03-29 12:05:36 +02:00
Xinchen Hui
f5bdc137fb
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:/php-src:
Fixed bug #71704 php_snmp_error() Format String Vulnerability
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
Updated to version 2016.3 (2016c)
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
Fix bug #71798 - Integer Overflow in php_raw_url_encode
update NEWS
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.
Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.
Fix bug #71860 : Require valid paths for phar filenames
Fix bug #71860 : Require valid paths for phar filenames
update NEWS
Fixed bug #71704 php_snmp_error() Format String Vulnerability
Merge branch 'PHP-5.6' into PHP-7.0
Updated to version 2016.2 (2016b)
update libs versions
set RC1 versions
Going for 5.5.34
2016-03-29 18:02:00 +08:00
Xinchen Hui
256593abcf
Update tests
2016-03-29 17:52:58 +08:00
Anatol Belski
f2ca3c6036
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
2016-03-29 11:26:09 +02:00
Anatol Belski
6afa41cf80
Merge remote-tracking branch 'origin/PHP-7.0.5' into PHP-7.0
...
* origin/PHP-7.0.5:
Fixed bug #71704 php_snmp_error() Format String Vulnerability
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
Updated to version 2016.3 (2016c)
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
Fix bug #71798 - Integer Overflow in php_raw_url_encode
update NEWS
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.
Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.
Fix bug #71860 : Require valid paths for phar filenames
Fix bug #71860 : Require valid paths for phar filenames
update NEWS
Fixed bug #71704 php_snmp_error() Format String Vulnerability
Merge branch 'PHP-5.6' into PHP-7.0
Updated to version 2016.2 (2016b)
update libs versions
set RC1 versions
Going for 5.5.34
2016-03-29 11:24:33 +02:00
Xinchen Hui
2e6d70787c
Fixed bug #71914 (Reference is lost in "switch")
2016-03-29 17:14:36 +08:00
Joe Watkins
dd70c39556
fix bug #71428 : Validation type inheritance with = NULL
2016-03-29 09:57:51 +01:00
Joe Watkins
3f56dfe866
Bug #71428 work ... hopefully, fix drupal 8
2016-03-29 09:36:08 +01:00
Stanislav Malyshev
67fbb06311
Merge branch 'PHP-5.5' into PHP-7.0.5
...
* PHP-5.5:
Fixed bug #71704 php_snmp_error() Format String Vulnerability
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
Fix bug #71798 - Integer Overflow in php_raw_url_encode
Fix bug #71860 : Require valid paths for phar filenames
Going for 5.5.34
Conflicts:
configure.in
ext/phar/phar_object.c
ext/phar/tests/badparameters.phpt
ext/phar/tests/create_path_error.phpt
ext/phar/tests/pharfileinfo_construct.phpt
ext/snmp/snmp.c
ext/standard/url.c
main/php_version.h
2016-03-28 23:55:05 -07:00
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
Stanislav Malyshev
cc7631dd08
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #71704 php_snmp_error() Format String Vulnerability
2016-03-28 23:45:15 -07:00
Anatol Belski
9c19a08b9d
Fixed bug #71704 php_snmp_error() Format String Vulnerability
...
Conflicts:
ext/snmp/snmp.c
2016-03-28 23:42:19 -07:00
Stanislav Malyshev
a18b1f74fa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
2016-03-28 23:30:14 -07:00
Stanislav Malyshev
3dd82caf57
Merge branch 'PHP-5.5.34' into PHP-5.5
...
* PHP-5.5.34:
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
2016-03-28 23:29:45 -07:00
Stanislav Malyshev
62da5cdf3d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
Fix bug #71798 - Integer Overflow in php_raw_url_encode
Fix bug #71860 : Require valid paths for phar filenames
Going for 5.5.34
Conflicts:
configure.in
ext/phar/tests/create_path_error.phpt
main/php_version.h
2016-03-28 23:21:15 -07:00
Stanislav Malyshev
f8dd10508b
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
2016-03-28 23:15:16 -07:00
Derick Rethans
2d112e1378
Updated to version 2016.3 (2016c)
2016-03-28 15:31:51 +02:00
Joe Watkins
ee9a78a033
work on #71428
2016-03-28 11:54:25 +01:00
Stanislav Malyshev
64f42c73ef
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
2016-03-28 01:22:37 -07: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
Stanislav Malyshev
95433e8e33
Fix bug #71798 - Integer Overflow in php_raw_url_encode
2016-03-27 14:22:19 -07:00
Joe Watkins
28f66763a4
fix #70189 (SAPI sends empty Content-Type when default_mimetype is empty)
2016-03-27 06:50:11 +01:00
Joe Watkins
32df2210d7
my commits are bad, and I feel bad (test for bug #71414 )
2016-03-26 23:59:46 +00:00
Joe Watkins
4327370d13
fix #71414 (Interface method override inherited method and implemented in a trait causes fatal error)
2016-03-26 23:47:31 +00:00
Joe Watkins
1a75cd29a2
add test for bug
2016-03-26 11:15:08 +00:00
Joe Watkins
373da7aa6f
fix standard object handler for properties when type == BP_VAR_IS
2016-03-26 11:15:08 +00:00
Nikita Popov
bd90f5507f
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/standard/crypt.c
2016-03-25 20:23:04 +01:00
Nikita Popov
54da966883
Fixed bug #67512
2016-03-25 20:18:46 +01:00
Xinchen Hui
1929fc9b16
Fixed bug #71891 (header_register_callback() and register_shutdown_function())
...
Actually, this fixed the memleak not the behavior(it is expected
behavior that "shutdown" is not outputed)
2016-03-25 12:34:22 +08:00
Derick Rethans
70878a92b1
Updated to version 2016.3 (2016c)
2016-03-24 11:09:07 +00:00
Derick Rethans
35b19d8dcc
Empty merge
2016-03-24 11:09:06 +00:00
Derick Rethans
c4681ec8e1
Updated to version 2016.3 (2016c)
2016-03-24 11:09:05 +00:00
Anatol Belski
d6eff6655c
update NEWS
2016-03-23 12:32:16 +01: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
Xinchen Hui
a3946de339
Fixed Bug #71884 (Null pointer deref (segfault) in stream_context_get_default)
2016-03-23 16:16:26 +08:00
Anatol Belski
241ba9dcb1
if there's no JIT support, no RINIT is really needed
2016-03-22 21:42:21 +01:00
Rasmus Lerdorf
1efcdaf092
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-22 08:04:53 -07:00
Xinchen Hui
b49ec68134
Update test script
2016-03-22 11:28:19 +08:00