summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* removed *.dsw and *.dsp filesAnatol Belski2014-09-289-1227/+0
* Merge branch 'PHP-5.6'Johannes Schlüter2014-09-271-2/+0
|\
| * Merge branch 'PHP-5.5' into PHP-5.6Johannes Schlüter2014-09-271-2/+0
| |\
| | * Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2014-09-271-2/+0
| | |\
| | | * This test should passJohannes Schlüter2014-09-271-2/+0
| | | * Fine tuned the order of adding request variables.George Wang2014-09-081-1/+2
| | | * Update LSAPI to 6.7, added support for 'filter_input'.George Wang2014-09-032-7/+67
* | | | Use zval_ptr_dtor_nogc() to free IS_TMP_VAR operands.Dmitry Stogov2014-09-231-1/+0
* | | | Move smart_str implementation into Zend/Nikita Popov2014-09-218-8/+8
* | | | Removes accidentally added files.Florian MARGAINE2014-09-201-15/+0
* | | | Merge branch 'master' into issue-67910Florian MARGAINE2014-09-20103-158/+244
|\ \ \ \
| * | | | Make number printing functions less genericNikita Popov2014-09-192-8/+8
| * | | | Use inline functions for most of smart_strNikita Popov2014-09-192-3/+3
| * | | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-1994-94/+94
| * | | | Fixed useless or duplicated IS_INTERNED() checksDmitry Stogov2014-09-191-1/+1
| * | | | Update sapi_apache2.cjfha732014-09-181-4/+4
| * | | | Update php_functions.cjfha732014-09-181-1/+1
| * | | | Update php_apache.hjfha732014-09-181-2/+2
| * | | | Update and rename php5apache2.dsp to php7apache2.dspjfha732014-09-181-17/+17
| * | | | Update php.symjfha732014-09-181-1/+1
| * | | | Update and rename mod_php5.c to mod_php7.cjfha732014-09-181-2/+2
| * | | | Update config.w32jfha732014-09-181-3/+3
| * | | | Update config.m4jfha732014-09-181-6/+6
| * | | | Update apache_config.cjfha732014-09-181-1/+1
| * | | | fix macro usageAnatol Belski2014-09-171-1/+5
| * | | | fix atol usageAnatol Belski2014-09-171-1/+1
| * | | | 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