summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Collapse)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
| | | | | | | | | | | | | | | | Fixed a crash in CLI mode.
* | | | Use zval_ptr_dtor_nogc() to free IS_TMP_VAR operands.Dmitry Stogov2014-09-231-1/+0
| | | | | | | | | | | | | | | | Removed ZEND_SWITCH_FREE opcode (ZEND_FREE used instead).
* | | | Move smart_str implementation into Zend/Nikita Popov2014-09-218-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just move that one struct into zend_types.h.
* | | | Removes accidentally added files.Florian MARGAINE2014-09-201-15/+0
| | | |
* | | | Merge branch 'master' into issue-67910Florian MARGAINE2014-09-20103-158/+244
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.PARAMETER_PARSING_API ext/gmp/tests/001.phpt
| * | | | Make number printing functions less genericNikita Popov2014-09-192-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that zend_ulong is 64bit on 64bit platforms, it should be sufficient to always use it, rather than supporting multiple types. API changes: * _zend_print_unsigned_to_buf and _zend_print_signed_to_buf no longer exist. * smart_str(ing)_print_long and smart_str(ing)_print_unsigned no longer exist. * Instead of all these, zend_print_ulong_to_buf and zend_print_long_to_buf should be used. * smart_str_append_generic_ex no longer exists. * smart_str(ing)_append_off_t(_ex) no longer exists, use smart_str(ing)_append_long(_ex) instead.
| * | | | Use inline functions for most of smart_strNikita Popov2014-09-192-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | smart_str_free_ex no longer exists, always use smart_str_free instead. smart_str_alloc no longer requires a newlen variable to be in scope, instead it returns the new length.
| * | | | 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
| | | | | | | | | | | | | | | Change of php5 for php7
| * | | | 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
| | | | | | | | | | | | | | | Change of php5 for php7
| * | | | Update php.symjfha732014-09-181-1/+1
| | | | | | | | | | | | | | | Change of php5 for php7
| * | | | Update and rename mod_php5.c to mod_php7.cjfha732014-09-181-2/+2
| | | | | | | | | | | | | | | Change of php5 for php7
| * | | | Update config.w32jfha732014-09-181-3/+3
| | | | | | | | | | | | | | | Change of php5 for php7
| * | | | Update config.m4jfha732014-09-181-6/+6
| | | | | | | | | | | | | | | Change of php5 for php7
| * | | | 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
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: NEWS NEWS Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-09-151-0/+11
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | * PHP-5.5: NEWS Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache
| | | * | Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when ↵Remi Collet2014-09-151-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using Apache ProxyPass is unable to provide correct PATH_INFO as it is not aware of file path (while SetHandler is). As we can extract PATH_INFO from PATH_TRANSLATED, we also need to check if present in SCRIPT_NAME and remove it. After applying this patch. With mod_php _SERVER["REQUEST_URI"] /info.php/foo/bar?q=1 _SERVER["SCRIPT_NAME"] /info.php _SERVER["PATH_INFO"] /foor/bar _SERVER["PHP_SELF"] /info.php/foo/bar _SERVER["QUERY_STRING"] q=1 With mod_proxy_fcgi + SetHandler _SERVER["REQUEST_URI"] /info.php/foo/bar?q=1 _SERVER["SCRIPT_NAME"] /info.php _SERVER["PATH_INFO"] /foo/bar _SERVER["PHP_SELF"] /info.php/foo/bar _SERVER["QUERY_STRING"] q=1 With mod_proxy_fcgi + ProxyPass _SERVER["REQUEST_URI"] /info.php/foo/bar?q=1 _SERVER["SCRIPT_NAME"] /info.php _SERVER["PATH_INFO"] /foo/bar _SERVER["PHP_SELF"] /info.php/foo/bar _SERVER["QUERY_STRING"] q=1
| * | | | Merge branch 'PHP-5.6'Remi Collet2014-09-153-7/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e34c8b303945945c650d4bc90dcc2ac0b17 Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e34c8b303945945c650d4bc90dcc2ac0b17 Fix bug #111 (compile error without ZEND_SIGNALS) Don't run travis against master (phpng) Update README.md
| | * | | 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
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: fixed the cast and incompatible pointer warning Conflicts: sapi/cgi/fastcgi.c
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-09-121-2/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * PHP-5.5: fixed the cast and incompatible pointer warning
| | | * | 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
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: fix NEWS for fcgi fix merge restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
| | | | | * restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes ↵David Zuelke2014-08-281-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | bug 67606
| | | | * | Fix bug #67878 program_prefix not honoured in man pagesRemi Collet2014-08-211-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add @program_prefix@ in php, phpize and php-config man pages - set date to 2014 - fix "SEE ALSO" alignment
| | | * | | Update LSAPI to 6.7, added support for 'filter_input'.George Wang2014-09-032-7/+67
| | | | | | | | | | | | | | | | | | | | | | | | Fixed a crash in CLI mode.
| | * | | | 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 ↵Dmitry Stogov2014-09-111-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | exacly the same as ZEND_QM_ASSIGN and ZEND_JMP_SET)
| * | | | | Revert "Removing ext/ereg and dependencies"Dmitry Stogov2014-09-112-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 86de7963fe69638431c0aa8f413d25e01bf99d68.
| * | | | | Removing ext/ereg and dependenciesTjerk Meesters2014-09-112-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Affected extensions: - opcache (use pcre) - mbstring (removed ereg functions overloading) - pgsql (use pcre) - reflection (test cases using 'ereg') SAPI: - apache (header only) - apache_hooks (header only)
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | (php-cgi -T [<number-of-warmup-requests>,]<number-of-benchmark-requests> <file>)