summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.6'Remi Collet2014-09-151-0/+11
|\
| * Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-09-151-0/+11
| |\
| | * Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when us...Remi Collet2014-09-151-0/+11
* | | Merge branch 'PHP-5.6'Remi Collet2014-09-153-7/+6
|\ \ \ | |/ /
| * | Merge phpdbg into PHP-5.6Bob Weinand2014-09-153-7/+6
* | | fix formatAnatol Belski2014-09-141-1/+1
* | | fix ftell/fseek callsAnatol Belski2014-09-141-2/+2
* | | reduce struct size by 8 byte on 64 bitAnatol Belski2014-09-141-2/+2
* | | fix ftell/fseek callsAnatol Belski2014-09-141-2/+2
* | | Merge branch 'PHP-5.6'Anatol Belski2014-09-121-2/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-09-121-2/+2
| |\ \ | | |/
| | * fixed the cast and incompatible pointer warningAnatol Belski2014-09-121-2/+2
| | * Fine tuned the order of adding request variables.George Wang2014-09-091-1/+2
| | * Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5George Wang2014-09-038-33/+75
| | |\
| | | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-281-3/+8
| | | |\
| | | | * restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes b...David Zuelke2014-08-281-3/+8
| | | * | Fix bug #67878 program_prefix not honoured in man pagesRemi Collet2014-08-211-18/+18
| | * | | Update LSAPI to 6.7, added support for 'filter_input'.George Wang2014-09-032-7/+67
| * | | | Fine tuned the order of adding request variables.George Wang2014-09-091-1/+2
* | | | | Removed ZEND_QM_ASSIGN_VAR and ZEND_JMP_SET_VAR opcodes (in PHPNG they did ex...Dmitry Stogov2014-09-111-9/+0
* | | | | Revert "Removing ext/ereg and dependencies"Dmitry Stogov2014-09-112-0/+2
* | | | | Removing ext/ereg and dependenciesTjerk Meesters2014-09-112-2/+0
* | | | | Fine tuned the order of adding request variables.George Wang2014-09-091-1/+2
* | | | | Added ability to make a number of "warmup" requests before an actual benchmark.Dmitry Stogov2014-09-081-6/+27
* | | | | Merge branch 'PHP-5.6'Nikita Popov2014-09-042-7/+67
|\ \ \ \ \ | |/ / / /
| * | | | Update LSAPI to 6.7, added support for 'filter_input'.George Wang2014-09-032-7/+67
| * | | | Fix bug #67878 program_prefix not honoured in man pagesRemi Collet2014-08-211-17/+17
* | | | | fixed reference countingDmitry Stogov2014-09-021-1/+1
* | | | | fix apache handler buildStanislav Malyshev2014-09-011-1/+1
* | | | | Refactored INI subsystem to use zend_string* instead of char*Dmitry Stogov2014-09-011-6/+5
* | | | | Allow PHP 7 to install in Apache 2 on OS XChristopher Jones2014-08-291-1/+1
* | | | | closesocket is defined in php_network.hXinchen Hui2014-08-281-4/+0
* | | | | closesocket is already defined in main/php_network.hXinchen Hui2014-08-281-1/+3
* | | | | first show to make 's' work with size_tAnatol Belski2014-08-273-7/+7
* | | | | fixed several long vs zend_long castsAnatol Belski2014-08-261-2/+2
* | | | | Fixed incompatible pointer type (int64)Xinchen Hui2014-08-261-4/+4
* | | | | Remove ZEND_ACC_INTERACTIVE and CG(interactive)Nikita Popov2014-08-256-15/+1
* | | | | master renames phase 4Anatol Belski2014-08-251-3/+3
* | | | | master renames phase 3Anatol Belski2014-08-257-39/+39
* | | | | master renames phase 2Anatol Belski2014-08-257-16/+16
* | | | | master renames phase 1Anatol Belski2014-08-2516-57/+57
* | | | | Merge remote-tracking branch 'php/master'Anatol Belski2014-08-211-17/+17
|\ \ \ \ \
| * | | | | Fix bug #67878 program_prefix not honoured in man pagesRemi Collet2014-08-211-17/+17
* | | | | | fixed some incompatible typesAnatol Belski2014-08-202-6/+6
* | | | | | Merge remote-tracking branch 'php/master'Anatol Belski2014-08-201-6/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fixed off-by-one memory allocation that could lead to invalid memory reads on...Tjerk Meesters2014-08-201-5/+4
| * | | | | Merge branch 'fpmConfFix' of github.com:DaveRandom/php-srcAndrea Faulds2014-08-201-5/+25
| |\ \ \ \ \
| | * | | | | Allow unlimited line length in fpm config filesChris Wright2013-10-281-5/+25
* | | | | | | ported apache handlerAnatol Belski2014-08-192-7/+10
* | | | | | | ported fcgiAnatol Belski2014-08-192-16/+17