summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.6.19' into PHP-7.0.4Stanislav Malyshev2016-03-011-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * fix ts buldphp-5.6.19RC1Anatol Belski2016-02-181-1/+1
| |
* | fpm: call zend_signal_init() in childMickaël2016-02-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 fd5a756ad44124ffa7e9a5810a31ff49e91708cf which addresses bug #61083.
* | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-02-141-0/+13
|\ \ | |/ | | | | | | * PHP-5.6: Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
| * Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bugAnatol Belski2016-02-141-0/+13
| |
* | Format string fixesNikita Popov2016-02-148-25/+38
| | | | | | | | | | Conflicts: ext/pgsql/pgsql.c
* | Fix format attributes in ZTSNikita Popov2016-02-141-9/+0
| |
* | Fixed inherited functions from unspecified files being included in ↵Bob Weinand2016-02-111-1/+1
| | | | | | | | | | | | phpdbg_get_executable() See also https://github.com/krakjoe/phpdbg/issues/152
* | Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0Joe Watkins2016-02-105-5/+29
|\ \
| * \ Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-02-082-2/+2
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.6: Align spacing in make install messages Add entry for re-fix of #70976 in commit 14e4d393
| | * Align spacing in make install messagesLior Kaplan2016-02-082-2/+2
| | |
| * | phpdbg config.m4: make it detectable by old shellsGuillaume Outters2016-01-291-1/+1
| | | | | | | | | | | | | | | --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.
| * | Merge branch 'PHP-5.6' into PHP-7.0Remi Collet2016-01-291-1/+25
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.6: NEWS Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
| | * Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setupRemi Collet2016-01-291-1/+25
| | | | | | | | | | | | Only needed with Apache version < 2.4.12 (ex RHEL-7)
| * | Use uint64_t for flags (warning)Bob Weinand2016-01-231-1/+1
| | |
* | | be more precise about the meaning of -nJoe Watkins2016-02-101-1/+1
|/ /
* | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-01-181-5/+5
|\ \ | |/ | | | | | | | | | | | | | | * PHP-5.6: fork test fix test fork test fork test for win32 fork test
| * fix testAnatol Belski2016-01-181-5/+5
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-01-111-9/+9
|\ \ | |/ | | | | | | | | | | * PHP-5.6: Simplify code per Anatol. Insert bug number. Use strtoll() when apr_off_t is 64 bits.
| * Simplify code per Anatol.Adam Harvey2016-01-112-41/+8
| |
| * Insert bug number.Adam Harvey2016-01-111-1/+1
| |
| * Use strtoll() when apr_off_t is 64 bits.Adam Harvey2016-01-112-9/+42
| |
| * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2016-01-051-0/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * Fixed bug #70755: fpm_log.c memory leak and buffer overflowStanislav Malyshev2015-12-081-0/+5
| | |
* | | Merge remote-tracking branch 'phpsec/PHP-7.0' into PHP-7.0Anatol Belski2016-01-061-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpsec/PHP-7.0: add NEWS entries for 7.0.2 re-apply the patch from 1785d2b805f64eaaacf98c14c9e13107bf085ab1 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)
| * | | Fixed bug #70755: fpm_log.c memory leak and buffer overflowStanislav Malyshev2016-01-041-0/+5
| | | |
* | | | Fixed runtime php.ini override, ini name length is off by 1.George Wang2016-01-051-2/+3
| | | | | | | | | | | | | | | | (cherry picked from commit 5bcb7a7019a49c2f80eda7d2aa947efebeee0034)
* | | | Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-01-042-3/+3
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016) Conflicts: ext/json/php_json_encoder.h sapi/continuity/capi.c
| * | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-033-4/+4
| | |
* | | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-0114-14/+14
| | |
* | | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-0169-77/+77
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-0199-108/+108
| | |
| * | Added support for HTTP 451Julien Pauli2015-12-233-0/+3
| | |
| * | Bumped SAPI version to 6.9George Wang2015-12-091-1/+1
| | |
| * | Added "mod_auth_basic" to apache module list.George Wang2015-12-091-1/+1
| | |
| * | Add sanitizing checks for request data.George Wang2015-12-091-2/+54
| | |
| * | Clear secret after use.George Wang2015-12-091-5/+8
| | |
| * | Fixed __DIR__ in CLI mode.George Wang2015-12-091-0/+2
| | |
* | | Fixed test after fix lineno of finallyXinchen Hui2016-01-011-6/+8
| | |
* | | Fixed a bug in apache_request_headers() that adds an extra \0 to header name.George Wang2015-12-171-10/+2
| | |
* | | Unused value casting should be `void`Reeze Xia2015-12-121-1/+1
| | |
* | | Bumped SAPI version to 6.9George Wang2015-12-091-1/+1
| | |
* | | Added "mod_auth_basic" to apache module list.George Wang2015-12-091-1/+1
| | |
* | | Add sanitizing checks for request data.George Wang2015-12-091-2/+54
| | |
* | | Clear secret after use.George Wang2015-12-091-5/+8
| | |
* | | Fixed __DIR__ in CLI mode.George Wang2015-12-091-0/+2
| | |
* | | standard tsrm usage for sevenJoe Watkins2015-12-063-9/+10
| | |
* | | Fix bug #71005 (Segfault in php_cli_server_dispatch_router()).Adam Harvey2015-12-012-0/+48
| | | | | | | | | | | | | | | | | | We didn't initialise the retval variable in php_cli_server_dispatch_router(); let's now initialise it to be IS_UNDEF, as the following if condition expects.
* | | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2015-11-233-5/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions) Conflicts: sapi/cgi/config9.m4 sapi/fpm/config.m4
| * | Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: ↵Lior Kaplan2015-11-233-5/+5
| | | | | | | | | | | | php_register_internal_extensions)
View Lorry Controller Status