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
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
3240dd93b3
Merge branch 'PHP-5.6' into PHP-7.0
2016-03-03 19:27:35 +01:00
Christoph M. Becker
2d4ad66ff2
Fixed bug #69953
...
Added support for MKCALENDAR request method in CLI web server.
2016-03-03 19:22:38 +01:00
Nikita Popov
1ac152938c
Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
...
Also re bug #71575 .
2016-03-03 16:50:01 +01:00
James Titcumb
c4b188871e
Fix bug #71575 removing extra semicolons outside macros
2016-03-03 16:41:03 +01:00
Nikita Popov
5527c5b083
Merge branch 'PHP-5.6' into PHP-7.0
2016-03-03 16:38:13 +01:00
Nikita Popov
bdd578fcbb
Disable upload_2G test on travis
2016-03-03 16:35:45 +01:00
Dmitry Stogov
908b662f7f
PHP-7 zend_call_function() doesn't support symbol_table substitution
2016-03-02 16:56:39 +03:00
Stanislav Malyshev
22d8e9aced
Merge branch 'PHP-7.0.4' into PHP-7.0
...
* PHP-7.0.4: (21 commits)
update NEWS
fix test file
Fix version
update NEWS
Update NEWS
Fix bug #71610 : Type Confusion Vulnerability - SOAP / make_http_soap_request()
Fix bug #71637 : Multiple Heap Overflow due to integer overflows
extend check for add_flag
Fixed another segfault with file_cache_only now
set version
fix nmake clean in phpize mode
Fixed segfault with file_cache_only
Fixed possible crash at PCRE on MSHUTDOWN
Fixed more synchronisation issues during SHM reload
Set proper type flags (REFCOUNTED and COPYABLE) according to interned or regular string
sync with improvements in NEWS
Fixed process synchronisation problem, that may cause crashes after opcache restart
Fix bug #71498 : Out-of-Bound Read in phar_parse_zipfile()
fix ts buld
prep for 5.6.19RC1
...
Conflicts:
configure.in
main/php_version.h
2016-03-01 23:08:19 -08:00
Stanislav Malyshev
90a0cbd594
Merge branch 'PHP-5.6.19' into PHP-7.0.4
...
* PHP-5.6.19:
fix test file
Fix version
update NEWS
Update NEWS
Fix bug #71498 : Out-of-Bound Read in phar_parse_zipfile()
fix ts buld
prep for 5.6.19RC1
5.6.20 is next
Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize
Conflicts:
configure.in
ext/wddx/wddx.c
main/php_version.h
2016-03-01 23:01:48 -08:00
Anatol Belski
68a51ae953
fix ts buld
2016-02-18 10:31:24 +01:00
Anatol Belski
a329dc70e9
fix ts buld
2016-02-18 07:11:36 +01:00
Bob Weinand
055b411218
Fix crash when advancing inside an internal function
...
This just happened in the "double ctrl+c" mode, when we halted inside an internal function; there was some code assuming a proper op_array
2016-02-17 20:27:46 +01:00
Mickaël
0c2e184eac
fpm: call zend_signal_init() in child
...
This addresses bug #71269 .
When an fpm child handles more than one request, zend_signal_startup() will
override the saved signal handlers with the internal zend handlers set from the
previous request, causing a SIGQUIT signal to result in a core dump rather than
gracefully exiting (the expected behaviour).
This is fixed by adding a call to zend_signal_init() after setting the
signal handlers in the child. The same technique is used in the apache SAPI
module in commit fd5a756ad4
which addresses
bug #61083 .
2016-02-15 13:23:37 +08:00
Anatol Belski
724ee19111
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
2016-02-14 20:49:03 +01:00
Anatol Belski
ce4a2f0fc6
Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
2016-02-14 20:47:23 +01:00
Nikita Popov
c9357f82d3
Format string fixes
...
Conflicts:
ext/pgsql/pgsql.c
2016-02-14 14:45:53 +01:00
Nikita Popov
5983378364
Fix format attributes in ZTS
2016-02-14 14:44:27 +01:00
Bob Weinand
1a01a5ec83
Fixed inherited functions from unspecified files being included in phpdbg_get_executable()
...
See also https://github.com/krakjoe/phpdbg/issues/152
2016-02-11 06:42:51 +01:00
Joe Watkins
daf3d0c875
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
2016-02-10 12:58:19 +00:00
Joe Watkins
3ac63df9bc
be more precise about the meaning of -n
2016-02-10 12:57:48 +00:00
Lior Kaplan
fb7d673ef2
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Align spacing in make install messages
Add entry for re-fix of #70976 in commit 14e4d393
2016-02-08 20:29:24 +02:00
Lior Kaplan
6772fbff62
Align spacing in make install messages
2016-02-08 20:27:19 +02:00
Guillaume Outters
10b2172f01
phpdbg config.m4: make it detectable by old shells
...
--enable-phpdbg is not detected on old systems (e.g.: stock FreeBSD 8), due to a PHPism in config.m4 (use of == operator).
Replacing == with the historic = makes it pass.
2016-01-29 17:01:04 +01:00
Remi Collet
c0802af52c
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
NEWS
Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
2016-01-29 10:24:15 +01:00
Remi Collet
07d2dcdf09
Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
...
Only needed with Apache version < 2.4.12 (ex RHEL-7)
2016-01-29 10:20:42 +01:00
Bob Weinand
65ef7f8c33
Use uint64_t for flags (warning)
2016-01-23 18:16:57 +01:00
Anatol Belski
71dbad172f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fork test
fix test
fork test
fork test for win32
fork test
2016-01-18 17:02:23 +01:00
Anatol Belski
5673ede6e9
fix test
2016-01-18 16:52:48 +01:00
Anatol Belski
ce568f98bf
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Simplify code per Anatol.
Insert bug number.
Use strtoll() when apr_off_t is 64 bits.
2016-01-11 21:39:31 +01:00
Adam Harvey
f301a0b23c
Simplify code per Anatol.
2016-01-11 21:36:55 +01:00
Adam Harvey
3217c033a5
Insert bug number.
2016-01-11 21:36:53 +01:00
Adam Harvey
c895dc5b5b
Use strtoll() when apr_off_t is 64 bits.
2016-01-11 21:36:51 +01:00
Anatol Belski
c0928be7f8
Merge remote-tracking branch 'phpsec/PHP-7.0' into PHP-7.0
...
* phpsec/PHP-7.0:
add NEWS entries for 7.0.2
re-apply the patch from 1785d2b805
Improve fix for bug #70976
Fix bug #70976 : fix boundary check on gdImageRotateInterpolated
Fixed bug #70755 : fpm_log.c memory leak and buffer overflow
fix merge mistake
Fixed #70728
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
2016-01-06 06:09:12 +01:00
Stanislav Malyshev
13750cb0a1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS
Improve fix for bug #70976
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
Fixed bug #70741 : Session WDDX Packet Deserialization Type Confusion Vulnerability
Fixed #70728
Fixed bug #70755 : fpm_log.c memory leak and buffer overflow
Fix bug #70976 : fix boundary check on gdImageRotateInterpolated
typofix
2016-01-05 19:38:29 -08:00
George Wang
69112d7e97
Fixed runtime php.ini override, ini name length is off by 1.
...
(cherry picked from commit 5bcb7a7019
)
2016-01-05 23:48:42 +02:00
Julien Pauli
736b91c650
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
Conflicts:
ext/json/php_json_encoder.h
sapi/continuity/capi.c
2016-01-04 18:13:38 +01:00
Stanislav Malyshev
2eaa755660
Fixed bug #70755 : fpm_log.c memory leak and buffer overflow
2016-01-04 17:36:42 +01:00
Lior Kaplan
53fb2f1e5c
Happy new year (Update copyright to 2016)
2016-01-03 01:44:37 +02:00
Lior Kaplan
2eb1f38d24
Happy new year (Update copyright to 2016)
2016-01-01 20:03:16 +02:00
Lior Kaplan
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Xinchen Hui
05defb4f56
Fixed test after fix lineno of finally
2016-01-01 13:46:19 +08:00
Julien Pauli
ea12ff149c
Added support for HTTP 451
2015-12-23 11:31:18 +01:00
George Wang
0a1a4dc033
Fixed a bug in apache_request_headers() that adds an extra \0 to header name.
2015-12-17 15:20:08 -05:00
Reeze Xia
95ad414658
Unused value casting should be void
2015-12-12 23:25:30 +08:00
George Wang
6d933b463e
Bumped SAPI version to 6.9
2015-12-09 11:37:46 +01:00
George Wang
b3458eddfd
Added "mod_auth_basic" to apache module list.
2015-12-09 11:37:45 +01:00
George Wang
5a319a02d8
Add sanitizing checks for request data.
2015-12-09 11:37:43 +01:00