| #
d805fa0d |
| 11-Jan-2015 |
Xinchen Hui |
Fixed #68790 (Missing return) |
|
Revision tags: php-5.5.21RC1, php-5.6.5RC1 |
|
| #
b7a7b1a6 |
| 03-Jan-2015 |
Stanislav Malyshev |
trailing whitespace removal |
| #
f579ae81 |
| 29-Dec-2014 |
Xinchen Hui |
Fixed build of litespped |
|
Revision tags: POST_NATIVE_TLS_MERGE, PRE_NATIVE_TLS_MERGE, php-5.5.20, php-5.4.36, php-5.6.4 |
|
| #
bdeb220f |
| 13-Dec-2014 |
Anatol Belski |
first shot remove TSRMLS_* things |
|
Revision tags: php-5.6.4RC1, php-5.5.20RC1 |
|
| #
dce692df |
| 20-Nov-2014 |
George Wang |
made lsapi_main.c compatible with PHP7/phpng .
Conflicts:
sapi/litespeed/lsapi_main.c |
| #
620db04e |
| 20-Nov-2014 |
George Wang |
made lsapi_main.c compatible with PHP7/phpng . |
|
Revision tags: php-5.6.3, php-5.5.19, php-5.4.35 |
|
| #
79de59e8 |
| 03-Nov-2014 |
George Wang |
set default response code to 200 |
| #
44351614 |
| 03-Nov-2014 |
George Wang |
set default response code to 200 |
|
Revision tags: php-5.6.3RC1, php-5.5.19RC1, php-5.5.18, php-5.4.34 |
|
| #
2fd7d60e |
| 03-Oct-2014 |
George Wang |
Merge branch 'master' of git.php.net:php-src
|
| #
a7d27478 |
| 03-Oct-2014 |
George Wang |
Fixed a bug that causes crash when environment variable is access while parsing php.ini |
| #
5b08e56e |
| 03-Oct-2014 |
George Wang |
Fixed a bug that causes crash when environment variable is access while parsing php.ini |
|
Revision tags: php-5.5.18RC1, php-5.6.1, php-5.6.2 |
|
| #
d0cb7153 |
| 19-Sep-2014 |
Johannes Schlüter |
s/PHP 5/PHP 7/ |
|
Revision tags: php-5.4.33, php-5.5.17, php-5.6.1RC1 |
|
| #
2470e01a |
| 09-Sep-2014 |
George Wang |
Fine tuned the order of adding request variables. |
| #
4bdd9aab |
| 09-Sep-2014 |
George Wang |
Fine tuned the order of adding request variables. |
| #
00805ffb |
| 04-Sep-2014 |
Nikita Popov |
Merge branch 'PHP-5.6'
Conflicts:
ext/soap/php_http.c
|
| #
b85b78db |
| 03-Sep-2014 |
George Wang |
Update LSAPI to 6.7, added support for 'filter_input'.
Fixed a crash in CLI mode. |
|
Revision tags: php-5.5.17RC1, php-5.4.33RC1, php-5.6.0, POST_AST_MERGE, PRE_AST_MERGE |
|
| #
c3e3c98e |
| 25-Aug-2014 |
Anatol Belski |
master renames phase 1 |
|
Revision tags: POST_64BIT_BRANCH_MERGE, PRE_64BIT_BRANCH_MERGE, php-5.5.16, php-5.4.32 |
|
| #
63d3f0b8 |
| 19-Aug-2014 |
Anatol Belski |
basic macro replacements, all at once |
|
Revision tags: POST_PHPNG_MERGE, PRE_PHPNG_MERGE, php-5.6.0RC4, php-5.3.29, php-5.5.16RC1, php-5.4.32RC1, php-5.3.29RC1, php-5.6.0RC3, php-5.5.15, php-5.4.31 |
|
| #
32e477c9 |
| 14-Jul-2014 |
Dmitry Stogov |
Merge branch 'master' into phpng
* master: (40 commits)
Bug #67609: TLS connections fail behind HTTP proxy
Updated NEWS for #67594
Updated NEWS for #67594
Fix #67594
Merge branch 'master' into phpng
* master: (40 commits)
Bug #67609: TLS connections fail behind HTTP proxy
Updated NEWS for #67594
Updated NEWS for #67594
Fix #67594 - invisible colon should be stripped off header name
Updated NEWS for 34407
Updated NEWS for 34407
Updated NEWS for 34407
Fix for bug #34407 - ucwords and title case
fixed broken merged code
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
fixed broken merged code
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
Test output relies on expose_php being on
1.2 is a problematic float to print out Lower the default display precision for this test
The test output is dependent on expose_php ini
fix makefile in phpize mode
fixe output_as_table() when no ext was enabled
fix end of stream exception when generating makefile
...
Conflicts:
ext/standard/http_fopen_wrapper.c
ext/standard/string.c
sapi/cli/php_cli_server.c
show more ...
|
|
Revision tags: php-5.4.31RC1, php-5.5.15RC1, php-5.6.0RC2, php-5.4.30, php-5.5.14, php-5.6.0RC1, php-5.5.14RC1, php-5.4.30RC1, php-5.6.0beta4, php-5.4.29, php-5.5.13, php-5.5.13RC1, php-5.6.0beta3, php-5.4.29RC1, php-5.6.0beta2, php-5.5.12, php-5.4.28, php-5.4.28RC1, php-5.5.12RC1, php-5.6.0beta1, php-5.4.27, php-5.5.11, php-5.5.11RC1, php-5.4.27RC1, php-5.5.10, php-5.4.26, php-5.6.0alpha3, php-5.4.26RC1, php-5.5.10RC1, php-5.6.0alpha2, php-5.5.9, php-5.4.25, php-5.5.9RC1, php-5.4.25RC1, php-5.6.0alpha1, php-5.5.8, php-5.4.24, php-5.4.24RC1, php-5.5.8RC1, php-5.5.7, php-5.4.23, php-5.3.28, php-5.5.7RC1, php-5.4.23RC1 |
|
| #
f0b7db6c |
| 26-Nov-2013 |
George Wang |
update to LSAPI 6.6
Conflicts:
sapi/litespeed/lsapi_main.c |
| #
dd29cfed |
| 10-Jul-2014 |
George Wang |
update year & copyright
Conflicts:
sapi/litespeed/lsapi_main.c |
| #
72e14bfb |
| 10-Jul-2014 |
George Wang |
update year & copyright |
| #
f9927a6c |
| 25-Apr-2014 |
Dmitry Stogov |
Merge mainstream 'master' branch into refactoring
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patch
Merge mainstream 'master' branch into refactoring
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
show more ...
|
| #
fd96831f |
| 22-Apr-2014 |
Felipe Pena |
Merge branch 'PHP-5.6'
* PHP-5.6:
sapi/litespeed/lsapi_main.c: Fix bug #63228
|
|
Revision tags: php-5.4.22, php-5.5.6, php-5.4.22RC1, php-5.5.6RC1, php-5.4.21, php-5.5.5, php-5.4.21RC1, php-5.5.5RC1, php-5.5.4, php-5.4.20, php-5.5.4RC1, php-5.4.20RC1, php-5.5.3, php-5.4.19, php-5.5.2, php-5.4.18, php-5.5.2RC1, php-5.4.18RC2, php-5.5.1, php-5.4.18RC1, php-5.3.27, php-5.4.17, php-5.5.0, php-5.3.27RC1, php-5.4.17RC1, php-5.5.0RC3, php-5.3.26, php-5.4.16, php-5.5.0RC2, php-5.3.26RC1, php-5.4.16RC1, php-5.5.0RC1, php-5.3.25, php-5.4.15, php-5.3.25RC1, php-5.5.0beta4, php-5.4.15RC1, php-5.4.14, php-5.3.24, php-5.5.0beta3, php-5.3.24RC1, php-5.4.14RC1, php-5.5.0beta2, php-5.5.0beta1, php-5.3.23, php-5.4.13, php-5.5.0alpha6, php-5.3.23RC1, php-5.4.13RC1, php-5.3.22, php-5.5.0alpha5, php-5.4.12, php-5.3.22RC2, php-5.4.12RC2, php-5.3.22RC1, php-5.4.12RC1, php-5.5.0alpha4, php-5.3.21, php-5.4.11, php-5.5.0alpha3, php-5.3.21RC1, php-5.4.11RC1, php-5.3.20, php-5.4.10, php-5.5.0alpha2, php-5.3.20RC1, php-5.4.10RC1, php-5.3.19, php-5.4.9, php-5.5.0alpha1, php-5.3.19RC1, php-5.4.9RC1, php-5.3.18, php-5.4.8 |
|
| #
742f4704 |
| 12-Oct-2012 |
George Wang |
sapi/litespeed/lsapi_main.c: Fix bug #63228
Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security] |
