summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.6.19' into PHP-7.0.4Stanislav Malyshev2016-03-011-1/+1
|\
| * fix ts buldphp-5.6.19RC1Anatol Belski2016-02-181-1/+1
* | fpm: call zend_signal_init() in childMickaƫl2016-02-151-0/+4
* | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-02-141-0/+13
|\ \ | |/
| * 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
* | Fix format attributes in ZTSNikita Popov2016-02-141-9/+0
* | Fixed inherited functions from unspecified files being included in phpdbg_get...Bob Weinand2016-02-111-1/+1
* | 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
| |\ \ | | |/
| | * 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
| * | Merge branch 'PHP-5.6' into PHP-7.0Remi Collet2016-01-291-1/+25
| |\ \ | | |/
| | * Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setupRemi Collet2016-01-291-1/+25
| * | 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
|\ \ | |/
| * fix testAnatol Belski2016-01-181-5/+5
* | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-01-111-9/+9
|\ \ | |/
| * 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
| |\
| | * 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
|\ \ \
| * | | 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
* | | | Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-01-042-3/+3
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | 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
|\ \ \ | |/ /
| * | 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
* | | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2015-11-233-5/+5
|\ \ \ | |/ /
| * | Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_i...Lior Kaplan2015-11-233-5/+5