| #
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] |
| #
050d7e38 |
| 15-Apr-2014 |
Dmitry Stogov |
Cleanup (1-st round) |
| #
ed5a8d51 |
| 18-Dec-2013 |
Kalle Sommer Nielsen |
Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few TSRMLS_FETCH() calls in our various SAPIs |
| #
9960ecc5 |
| 26-Nov-2013 |
George Wang |
update to LSAPI 6.6 |
| #
01bc1321 |
| 05-Nov-2013 |
George Wang |
Update LiteSpeed SAPI code to V6.4 |
| #
a666285b |
| 01-Jan-2013 |
Xinchen Hui |
Happy New Year |
| #
1407b4a0 |
| 12-Oct-2012 |
George Wang |
Merge branch '5.4'
* 5.4:
sapi/litespeed/lsapi_main.c: Fix bug #63228
|
| #
22611b8d |
| 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] |
|
Revision tags: php-5.3.18RC1, php-5.4.8RC1, php-5.3.17, php-5.4.7 |
|
| #
63d9c1f4 |
| 05-Sep-2012 |
Xinchen Hui |
Merge branch 'PHP-5.4'
Conflicts:
sapi/litespeed/lsapi_main.c
|
| #
d64d9e33 |
| 05-Sep-2012 |
Xinchen Hui |
year++ |
|
Revision tags: php-5.4.7RC1, php-5.3.16, php-5.4.6, php-5.4.6RC1, php-5.4.5, php-5.3.15, php-5.3.15RC1, php-5.4.5RC1, php-5.3.14, php-5.4.4, php-5.3.14RC2, php-5.4.4RC2, php-5.3.14RC1, php-5.4.4RC1, php-5.3.13, php-5.4.3, php-5.4.2, php-5.3.12, php-5.3.11, php-5.4.1, php-5.3.11RC2, php-5.4.1RC2, php-5.3.11RC1, php-5.4.1RC1, PHP-5.4.1-RC1, php-5.4.0, php-5.4.0RC8, php-5.3.10, php-5.4.0RC7, php-5.4.0RC6, php-5.3.9, php-5.4.0RC5 |
|
| #
3c1df334 |
| 31-Dec-2011 |
George Wang |
fixed a crash in cli mode when apache_request_headers() is called |
|
Revision tags: php-5.3.9RC4, php-5.4.0RC4, php-5.3.9RC3, php-5.4.0RC3, php-5.3.9RC2, php-5.4.0RC2 |
|
| #
56728f11 |
| 16-Nov-2011 |
George Wang |
keep code to be compatible with PHP4 |
| #
badd6a91 |
| 16-Nov-2011 |
George Wang |
keep PHP_5_4 in sync with PHP_5_3 branch |
|
Revision tags: php-5.4.0RC1, php-5.3.9RC1, php-5.4.0beta2, php-5.4.0beta1, yaf-2.1.0, php-5.3.8, php-5.3.7, php-5.3.7RC5, php-5.4.0alpha3, php-5.3.7RC4, php-5.3.7RC3, php-5.4.0alpha2 |
|
| #
3f0abb30 |
| 12-Jul-2011 |
Stanislav Malyshev |
MF53 |
|
Revision tags: php-5.3.7RC2, php-5.4.0alpha1, php-5.3.7RC1 |
|
| #
cb7f656d |
| 31-May-2011 |
George Wang |
fix CLI mode timeout |
|
Revision tags: php-5.3.6, php-5.3.6RC3, php-5.3.6RC2, php-5.3.6RC1, php-5.2.17, php-5.3.5, php-5.2.16 |
|
| #
cccba0fa |
| 10-Dec-2010 |
George Wang |
fixed keyLen validation point |
|
Revision tags: php-5.2.15, php-5.3.4, php-5.2.15RC2, php-5.3.4RC2, php-5.3.4RC1, php-5.2.15RC1, PHP_5_2_15RC1 |
|
| #
34b631f6 |
| 18-Aug-2010 |
Kalle Sommer Nielsen |
Pass the TSRMS pointers to sapi_module_struct.log_message, this saves some TSRMLS_FETCH() calls in a few of our SAPI's |
|
Revision tags: oci8-1.4.3, php-5.2.14, php-5.3.3, php-5.3.3RC3, php-5.2.14RC3, php-5.3.3RC2, php-5.2.14RC2 |
|
| #
80926568 |
| 26-Jun-2010 |
Felipe Pena |
- Fixed bug #52183 (Reflectionfunction reports invalid number of arguments for function aliases) |
| #
e64734f9 |
| 26-Jun-2010 |
Felipe Pena |
- Fixed bug #52183 (Reflectionfunction reports invalid number of arguments for function aliases) |
|
Revision tags: php-5.3.3RC1, php-5.2.14RC1, php-5.3.2, php-5.2.13, php-5.3.2RC3, php-5.3.2RC2, php-5.2.13RC2, php-5.2.13RC1, php-5.3.2RC1, php-5.2.12, php-5.2.12RC4, php-5.2.12RC3, php-5.2.12RC2, php-5.3.1, php-5.3.1RC4, php-5.2.12RC1, php-5.3.1RC3, php-5.3.1RC2, oci8-1.4.0, php-5.2.11, php-5.2.11RC3, php-5.3.1RC1, php-5.2.11RC2, php-5.2.11RC1, php-5.3.0, php-5.3.0RC4, php-5.2.10, php-5.2.10RC2, php-5.3.0RC3, php-5.2.10RC1, php-5.3.0RC2, php-5.3.0RC1, RELEASE_1_3_5, php-5.2.9, php-5.2.9RC3, php-5.2.9RC2, php-5.2.9RC1, php-5.3.0beta1, NEWS, php-5.2.8, BEFORE_HEAD_NS_CHANGES_MERGE, php-5.3.0alpha3, php-5.3.0alpha2, php-5.2.7, php-5.2.7RC5, php-5.2.7RC4, BEFORE_HEAD_NS_CHANGE, BEFORE_NS_RULES_CHANGE, php-5.2.7RC3, php-5.2.7RC2, php-5.2.7RC1 |
|
| #
f091e745 |
| 26-Aug-2008 |
George Wang |
ignore signal SIGXFSZ |
|
Revision tags: php-4.4.9 |
|
| #
52604d28 |
| 05-Aug-2008 |
George Wang |
added litespeed SAPI |
