#
c6bad96f |
| 18-Nov-2014 |
Anatol Belski |
Merge remote-tracking branch 'origin/master' into native-tls * origin/master: (398 commits) NEWS add test for bug #68381 Fixed bug #68381 Set FPM log level earlier during i
Merge remote-tracking branch 'origin/master' into native-tls * origin/master: (398 commits) NEWS add test for bug #68381 Fixed bug #68381 Set FPM log level earlier during init proper dllexport move to size_t where zend_string is used internally fix some datatype mismatches return after the warning, to fix uninitialized salt usage fix datatype mismatches add missing type specifier fix datatype mismatches fix unsigned check "extern" shouldn't be used for definitions joined identical conditional blocks simplify fpm tests SEND_VAR_NO_REF optimization Add test for bug #68442 Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments. Add new FPM test for IPv4/IPv6 ... Conflicts: win32/build/config.w32
show more ...
|
#
b9f1daa9 |
| 06-Nov-2014 |
Anatol Belski |
basic clang compatibility on windows |
#
d77ce317 |
| 29-Oct-2014 |
Anatol Belski |
Merge branch 'PHP-5.6' * PHP-5.6: fix output globals importing export output globals use portable strndup implementation unix sockets aren't available on windows
Merge branch 'PHP-5.6' * PHP-5.6: fix output globals importing export output globals use portable strndup implementation unix sockets aren't available on windows dll export APIs needed by phpdbg fix sapi/phpdbg/config.w32 Don't treat warnings as failures in the junit output
show more ...
|
#
fdbfcc0b |
| 29-Oct-2014 |
Anatol Belski |
dll export APIs needed by phpdbg |
#
c51a4207 |
| 24-Oct-2014 |
Anatol Belski |
Merge remote-tracking branch 'origin/master' into native-tls * origin/master: (214 commits) fix datatype mismatch warnings fix datatype mismatches fix datatype mismatches
Merge remote-tracking branch 'origin/master' into native-tls * origin/master: (214 commits) fix datatype mismatch warnings fix datatype mismatches fix datatype mismatches fix datatype mismatches fix datatype mismatch warnings fix datatype mismatch warnings fix datatype mismatch warnings fix datatype mismatch warning fix datatype mismatches fix datatype mismatch warnings Re-add phpdbg to travis Added some NEWS Make xml valid (missing space between attrs) Fix info classes file name in xml Add note about <eval> tag for errors in xml.md Name the tag <eval> if the error id during ev cmd Do not print out xml as PHP print... Fix output to wrong function Fixed parameter order on %.*s Too much copypaste... ...
show more ...
|
#
53560ca0 |
| 23-Oct-2014 |
Anatol Belski |
rework the previous fix for var names with size_t, no ugly casts anymore |
#
a5e4f1f5 |
| 22-Oct-2014 |
Anatol Belski |
fix several datatype mismatches |
#
b9463489 |
| 05-Oct-2014 |
Anatol Belski |
enable static tsrm ls cache in ext/standard |
#
d11734b4 |
| 25-Sep-2014 |
Anatol Belski |
reworked the patch, less new stuff but worky TLS is already used in TSRM, the way exporting the tsrm cache through a thread local variable is not portable. Additionally, the current
reworked the patch, less new stuff but worky TLS is already used in TSRM, the way exporting the tsrm cache through a thread local variable is not portable. Additionally, the current patch suffers from bugs which are hard to find, but prevent it to be worky with apache. What is done here is mainly uses the idea from the RFC patch, but - __thread variable is removed - offset math and declarations are removed - extra macros and definitions are removed What is done merely is - use an inline function to access the tsrm cache. The function uses the portable tsrm_tls_get macro which is cheap - all the TSRM_* macros are set to placebo. Thus this opens the way remove them later Except that, the logic is old. TSRMLS_FETCH will have to be done once per thread, then tsrm_get_ls_cache() can be used. Things seeming to be worky are cli, cli server and apache. I also tried to enable bz2 shared and it has worked out of the box. The change is yet minimal diffing to the current master bus is a worky start, IMHO. Though will have to recheck the other previously done SAPIs - embed and cgi. The offsets can be added to the tsrm_resource_type struct, then it'll not be needed to declare them in the userspace. Even the "done" member type can be changed to int16 or smaller, then adding the offset as int16 will not change the struct size. As well on the todo might be removing the hashed storage, thread_id != thread_id and linked list logic in favour of the explicit TLS operations.
show more ...
|
#
7099736d |
| 22-Sep-2014 |
Anatol Belski |
Merge remote-tracking branch 'origin/master' into native-tls * origin/master: Fix tests/serialize/bug64146.phpt Remove zend_dynamic_array Remove static allocator Fixe
Merge remote-tracking branch 'origin/master' into native-tls * origin/master: Fix tests/serialize/bug64146.phpt Remove zend_dynamic_array Remove static allocator Fixed typo Fix list() destructuring to special variables Remove php_varname_check Avoid useless reference counting Specialization (only IS_VAR ad IS_CV operands may be references) Optimized unset() Make error paths to be UNEXPECTED Replace IS_OP?_TMP_FREE() with more clear (OP?_TYPE == IS_TMP_VAR)
show more ...
|
#
8be73f26 |
| 21-Sep-2014 |
Nikita Popov |
Fix tests/serialize/bug64146.phpt The var hash now retains a reference to its elements, to ensure that addresses are not reused. Furthermore the var hash now only stores objects
Fix tests/serialize/bug64146.phpt The var hash now retains a reference to its elements, to ensure that addresses are not reused. Furthermore the var hash now only stores objects and references and directly uses their pointer as key, thus making serialization about two times faster.
show more ...
|
#
b3aebda9 |
| 20-Sep-2014 |
krakjoe |
native tls initial patch |
#
d0cb7153 |
| 19-Sep-2014 |
Johannes Schlüter |
s/PHP 5/PHP 7/ |
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 |
|
#
b7e7a895 |
| 16-Aug-2014 |
Anatol Belski |
several fixes - - param parsing Z_PARAM_STR vs Z_PARAM_STRING - some functions for new params - etc |
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, 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 |
|
#
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 ...
|
Revision tags: php-5.4.28RC1, php-5.5.12RC1, php-5.6.0beta1 |
|
#
91aa9fbb |
| 05-Apr-2014 |
Kalle Sommer Nielsen |
Remove call_user_method() and call_user_method_array() from master, long time deprecated in favour of call_user_func*(). |
Revision tags: 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 |
|
#
00244bab |
| 10-Feb-2014 |
Dmitry Stogov |
Use better data structures (incomplete) |
Revision tags: 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 |
|
#
c081ce62 |
| 03-Jan-2014 |
Xinchen Hui |
Bump year |
Revision tags: 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, 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 |
|
#
a666285b |
| 01-Jan-2013 |
Xinchen Hui |
Happy New Year |
Revision tags: 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, php-5.3.18RC1, php-5.4.8RC1, php-5.3.17, php-5.4.7, 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 |
|
#
8775a375 |
| 01-Jan-2012 |
Felipe Pena |
- Year++ |
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 |
|
#
8b6a2d25 |
| 11-Nov-2011 |
Arpad Ray |
Fix hash key length in register/remove_user_shutdown_function |
Revision tags: php-5.4.0RC1, php-5.3.9RC1, php-5.4.0beta2 |
|
#
849e7ae7 |
| 19-Oct-2011 |
Michael Wallner |
Fix Bug #55801 Behavior of unserialize has changed: (un)serialize in __wakeup/__sleep now use clean var_hashes |
Revision tags: php-5.4.0beta1 |
|
#
45a96e0d |
| 13-Sep-2011 |
Arpad Ray |
fix zts break in r316688 |
#
5bc97c6c |
| 13-Sep-2011 |
Arpad Ray |
Implement object-oriented session handlers (https://wiki.php.net/rfc/session-oo) |