Xinchen Hui
3994a70b91
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes)
fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)
fix #72206 (xml_parser_create/xml_parser_free leaks mem)
improve 7132fe19c2
fix 1bb8a7b0b8
fix #72180 (Env variables incorrectly pretty printed in config.nice, phpinfo)
Conflicts:
acinclude.m4
2016-05-16 11:21:39 +08:00
Xinchen Hui
1559fd7e48
Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes)
2016-05-16 11:19:45 +08:00
Anatol Belski
09dae4dc85
prepare next 7.0.8
2016-05-10 13:06:55 +02:00
Joe Watkins
66fc5a3436
Implement #51879 stream context socket option tcp_nodelay
2016-04-29 12:11:58 +01:00
Joe Watkins
c07069495b
Merge branch 'PHP-7.0'
...
* PHP-7.0:
simplify expression
2016-04-28 15:52:45 +01:00
Joe Watkins
2787a24f86
simplify expression
2016-04-28 15:52:30 +01:00
Joe Watkins
c2ef11e86f
Merge branch 'PHP-7.0'
...
* PHP-7.0:
simplify expression
2016-04-28 15:50:36 +01:00
Joe Watkins
f580540c8d
simplify expression
2016-04-28 15:50:27 +01:00
Dmitry Stogov
6499162ff0
- get rid of EG(scope). zend_get_executed_scope() should be used instead.
...
- ichanged zval_update_constant_ex(). Use IS_TYPE_IMMUTABLE flag on shared constants and AST, instead of "inline_change" parameter.
2016-04-28 04:13:34 +03:00
Dmitry Stogov
f0a2e8eb13
Removed "zend_fcall_info.function_table". It was assigned in many places, but is never used.
2016-04-27 13:46:38 +03:00
Anatol Belski
6e06ab1464
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #72035 php-cgi.exe fails to run scripts relative to drive root
2016-04-23 19:22:22 +02:00
Anatol Belski
e0edb25cf2
Fixed bug #72035 php-cgi.exe fails to run scripts relative to drive root
2016-04-23 18:55:52 +02:00
Dmitry Stogov
650c1c0a7d
Safe execution timeout handling.
2016-04-20 13:52:21 +03:00
Anatol Belski
57ffb2bd80
prepare next
2016-04-12 06:49:30 +02:00
Joe Watkins
4954d623de
Merge branch 'PHP-7.0'
...
* PHP-7.0:
remove unused params || woops
2016-03-31 12:51:25 +01:00
Joe Watkins
d9e4510224
remove unused params || woops
2016-03-31 12:51:00 +01:00
Joe Watkins
05b44c20e1
Merge branch 'PHP-7.0'
...
* PHP-7.0:
fix #71609 : Segmentation fault on ZTS with gethostbyname
2016-03-31 12:39:45 +01:00
Joe Watkins
233115ea23
fix #71609 : Segmentation fault on ZTS with gethostbyname
2016-03-31 12:39:01 +01:00
Joe Watkins
a3f0add913
Merge branch 'PHP-7.0'
...
* PHP-7.0:
fix #70189 (SAPI sends empty Content-Type when default_mimetype is empty)
2016-03-27 06:51:03 +01:00
Joe Watkins
28f66763a4
fix #70189 (SAPI sends empty Content-Type when default_mimetype is empty)
2016-03-27 06:50:11 +01:00
Xinchen Hui
0e5fa32883
Merge branch 'PHP-7.0'
2016-03-25 12:35:20 +08: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
Anatol Belski
2921c0e3f6
prepare next
2016-03-15 08:24:41 +01:00
Nikita Popov
7ed893712f
Merge branch 'PHP-7.0'
...
Conflicts:
ext/mysqlnd/mysqlnd_priv.h
main/php_streams.h
2016-03-03 23:20:50 +01:00
Nikita Popov
5602f64213
Eliminate usages of _PP macros
...
These are either in debug code (fix them), commented out (drop
them) or in dead compatibility macros (drop them).
One usage was in php_stream_get_from_zval(), which we have not used
since at least PHP 5.2 and, judging from the fact that nobody
complained about it causing compile errors in PHP 7, nobody else
uses it either, so drop it.
There are still remaining uses in mysqli embedded and odbc birdstep.
These probably need to be dropped outright.
2016-03-03 23:20:12 +01:00
Nikita Popov
f57c0b3249
Merge branch 'PHP-7.0'
2016-03-03 16:50:47 +01:00
James Titcumb
c4b188871e
Fix bug #71575 removing extra semicolons outside macros
2016-03-03 16:41:03 +01:00
Dmitry Stogov
c67c166f93
Removed zend_fcall_info.symbol_table
2016-03-02 17:50:55 +03:00
Stanislav Malyshev
6ae4c11b45
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fix bug #71629 : sync php_url_decode definition
2016-02-21 17:11:51 -08:00
Stanislav Malyshev
d25e67eee6
Fix bug #71629 : sync php_url_decode definition
2016-02-21 17:11:34 -08:00
Anatol Belski
2a1dffbaf0
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Bug #71596 Segmentation fault on ZTS with date function (setlocale)
2016-02-18 19:14:37 +01:00
Anatol Belski
4b5cce269b
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Bug #71596 Segmentation fault on ZTS with date function (setlocale)
2016-02-18 19:14:22 +01:00
Anatol Belski
632fc51d98
Bug #71596 Segmentation fault on ZTS with date function (setlocale)
2016-02-18 19:13:07 +01:00
Stanislav Malyshev
5c79cc5290
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Remove TSRMLS_* from code, they are not used anymore
2016-02-17 22:44:50 -08:00
Stanislav Malyshev
9afb29aa68
Remove TSRMLS_* from code, they are not used anymore
2016-02-17 22:44:05 -08:00
Ferenc Kovacs
4762ed4d27
5.6.20 is next
2016-02-18 00:31:18 +01:00
Anatol Belski
837e2a912d
prepare next
2016-02-16 09:14:05 +01:00
Nikita Popov
2d605e5f24
Merge branch 'PHP-7.0'
2016-02-14 14:47:42 +01:00
Nikita Popov
5983378364
Fix format attributes in ZTS
2016-02-14 14:44:27 +01:00
Anatol Belski
95a47ab556
fix version header
2016-02-11 16:23:19 +01:00
Xinchen Hui
095096c7ab
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/curl/interface.c
2016-02-05 19:51:33 +08:00
Nikita Popov
af66ad2857
Remove use of register keyword in headers
...
Headers must be C++ compatible -- this throws warnings.
The register keyword is not used for optimization, at least not
in optimized builds.
2016-02-04 13:34:19 +01:00
Stanislav Malyshev
ea35de6e31
Merge branch 'PHP-7.0'
...
* PHP-7.0: (35 commits)
fix tests
update NEWS
fix tests
fix NEWS
Update NEWS
update NEWS
Fixed bug #71475 : openssl_seal() uninitialized memory usage
Fixed bug #71488 : Stack overflow when decompressing tar archives
fix tests
fix wrong gc sequence
revert the API string as well
update NEWS
Revert "Fix #70720 "
sync NEWS
reset ext/session to the state of 7.0.2
update NEWS
update NEWS
add missing headers for SIZE_MAX
backport the escapeshell* functions hardening branch
add tests
...
2016-02-01 20:46:06 -08:00
Stanislav Malyshev
c631f1ee2b
Merge branch 'PHP-7.0.3' into PHP-7.0
...
* PHP-7.0.3: (35 commits)
fix tests
update NEWS
fix tests
fix NEWS
Update NEWS
update NEWS
Fixed bug #71475 : openssl_seal() uninitialized memory usage
Fixed bug #71488 : Stack overflow when decompressing tar archives
fix tests
fix wrong gc sequence
revert the API string as well
update NEWS
Revert "Fix #70720 "
sync NEWS
reset ext/session to the state of 7.0.2
update NEWS
update NEWS
add missing headers for SIZE_MAX
backport the escapeshell* functions hardening branch
add tests
...
Conflicts:
configure.in
ext/session/tests/bug69111.phpt
main/php_version.h
2016-02-01 20:45:49 -08:00
Stanislav Malyshev
e231830f16
Merge branch 'PHP-5.6.18' into PHP-7.0.3
...
* PHP-5.6.18:
fix tests
fix NEWS
Update NEWS
update NEWS
Fixed bug #71488 : Stack overflow when decompressing tar archives
update NEWS
add missing headers for SIZE_MAX
backport the escapeshell* functions hardening branch
add tests
Fix bug #71459 - Integer overflow in iptcembed()
prepare 5.6.18RC1
Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
improve fix for bug #71201
Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input
Fix bug #71391 : NULL Pointer Dereference in phar_tar_setupmetadata()
Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
Fix bug #71335 : Type Confusion in WDDX Packet Deserialization
Fix bug #71354 - remove UMR when size is 0
Conflicts:
configure.in
ext/phar/dirstream.c
ext/phar/phar_object.c
ext/phar/tar.c
ext/standard/exec.c
ext/standard/iptc.c
ext/standard/math.c
ext/standard/streamsfuncs.c
ext/wddx/wddx.c
main/php_version.h
main/streams/memory.c
2016-02-01 20:00:01 -08:00
Stanislav Malyshev
41be90d95b
Merge branch 'PHP-5.6.18' into PHP-5.6
...
* PHP-5.6.18:
fix tests
fix NEWS
Update NEWS
update NEWS
Fixed bug #71488 : Stack overflow when decompressing tar archives
update NEWS
add missing headers for SIZE_MAX
backport the escapeshell* functions hardening branch
add tests
Fix bug #71459 - Integer overflow in iptcembed()
prepare 5.6.18RC1
Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input
Fix bug #71391 : NULL Pointer Dereference in phar_tar_setupmetadata()
Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
Fix bug #71335 : Type Confusion in WDDX Packet Deserialization
Fix bug #71354 - remove UMR when size is 0
Conflicts:
configure.in
main/php_version.h
2016-02-01 19:16:34 -08:00
Stanislav Malyshev
309ead112f
Merge branch 'PHP-5.5.32' into PHP-5.6.18
...
* PHP-5.5.32:
Fixed bug #71488 : Stack overflow when decompressing tar archives
update NEWS
add missing headers for SIZE_MAX
backport the escapeshell* functions hardening branch
add tests
Fix bug #71459 - Integer overflow in iptcembed()
Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input
Fix bug #71391 : NULL Pointer Dereference in phar_tar_setupmetadata()
Fix bug #71335 : Type Confusion in WDDX Packet Deserialization
Fix bug #71354 - remove UMR when size is 0
2016-02-01 18:32:31 -08:00
Nikita Popov
93dc91b386
Remove version checks
...
PHP_VERSION_ID
PHP_API_VERSION
ZEND_MODULE_API_NO
PHP_MAJOR_VERSION, PHP_MINOR_VERSION
ZEND_ENGINE_2
I've left litespeed alone, as it seems to genuinely maintain support
for many PHP versions.
2016-01-30 15:35:28 +01:00
Xinchen Hui
f6d8af73ad
Merge branch 'PHP-7.0'
2016-01-29 20:38:59 -08:00
Xinchen Hui
3dadd654cf
Also WIN32 side
2016-01-29 20:38:50 -08:00