Revision tags: POST_PHP7_REMOVALS, PRE_PHP7_REMOVALS, php-5.6.6RC1, php-5.5.22RC1, php-5.5.21, php-5.6.5, php-5.4.37, php-5.5.21RC1, php-5.6.5RC1, POST_NATIVE_TLS_MERGE, PRE_NATIVE_TLS_MERGE, php-5.5.20, php-5.4.36, php-5.6.4, php-5.6.4RC1, php-5.5.20RC1, php-5.6.3, php-5.5.19, php-5.4.35, php-5.6.3RC1, php-5.5.19RC1, php-5.5.18, php-5.4.34, php-5.5.18RC1, php-5.6.1, php-5.6.2, php-5.4.33, php-5.5.17, php-5.6.1RC1, php-5.5.17RC1, php-5.4.33RC1, php-5.6.0, POST_AST_MERGE, PRE_AST_MERGE, POST_64BIT_BRANCH_MERGE, PRE_64BIT_BRANCH_MERGE, php-5.5.16, php-5.4.32, 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, php-5.4.28RC1, php-5.5.12RC1 |
|
#
fc444fbc |
| 11-Apr-2014 |
Bob Weinand |
Shut up, my lovely compiler; I do not like your warnings Conflicts: Zend/zend_object_handlers.c |
#
fc33f52d |
| 15-Jan-2015 |
Xinchen Hui |
bump year |
#
73c1be26 |
| 15-Jan-2015 |
Xinchen Hui |
Bump year |
#
a85eb75c |
| 16-Dec-2014 |
Anatol Belski |
Merge remote-tracking branch 'origin/master' into native-tls * origin/master: fix perm again... cleanup uneeded cast fix bad pointer cast in ext/phar, fix segfault and fail
Merge remote-tracking branch 'origin/master' into native-tls * origin/master: fix perm again... cleanup uneeded cast fix bad pointer cast in ext/phar, fix segfault and failed tests (bigendian) Conflicts: ext/phar/func_interceptors.c ext/phar/phar_object.c sapi/apache2handler/sapi_apache2.c
show more ...
|
#
61cb019e |
| 16-Dec-2014 |
Remi Collet |
cleanup uneeded cast |
#
bdeb220f |
| 13-Dec-2014 |
Anatol Belski |
first shot remove TSRMLS_* things |
#
aff66a94 |
| 15-Oct-2014 |
Anatol Belski |
don't define tsrm ls in SAPIs under linux as it's compiled statically with the core |
#
8aeffdd7 |
| 15-Oct-2014 |
Anatol Belski |
moved most of the core to use static tsrm ls cache pointer plus apache2handler, cli and cgi |
#
1fc8220b |
| 15-Oct-2014 |
Anatol Belski |
TSRMLS_FETCH() is a spent force |
#
c00424e4 |
| 15-Oct-2014 |
Anatol Belski |
bring back all the TSRMLS_FETCH() stuff for better comparability with the mainstream |
#
21b6d155 |
| 26-Sep-2014 |
krakjoe |
remove unused fetch |
#
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 ...
|
#
6bb530d1 |
| 22-Sep-2014 |
Anatol Belski |
Merge remote-tracking branch 'origin/master' into native-tls * origin/master: (24 commits) added a comment fix the REPARSE_DATA_BUFFER struct def simplify the condition
Merge remote-tracking branch 'origin/master' into native-tls * origin/master: (24 commits) added a comment fix the REPARSE_DATA_BUFFER struct def simplify the condition Fix two memory errors by interning earlier Add smart_str_append for appending zend_strings Rename smart_str_append to smart_str_append_smart_str Use smart_str for exception stack traces Use smart_str in get_function_declaration Move smart_str implementation into Zend/ UPGRADING for Integer Semantics Fixed bug #66242 (don't assume char is signed) Fixed bug #67633 Fixed if/else if ordering Use SIZEOF_ZEND_LONG instead of SIZEOF_LONG Use zend_ polyfilled nan/finite, check finite Updated 32-bit << test Updated << 64-bit tests Prevent bit shift count wrapping quirkiness on some CPUs for left shift Cast NaN and Infinity to zero Updated >> 64-bit tests ...
show more ...
|
#
e33f3d3b |
| 20-Sep-2014 |
Nikita Popov |
Move smart_str implementation into Zend/ 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 m
Move smart_str implementation into Zend/ 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.
show more ...
|
#
b3aebda9 |
| 20-Sep-2014 |
krakjoe |
native tls initial patch |
#
b0064fc2 |
| 18-Sep-2014 |
jfha73 |
Update sapi_apache2.c Change of php5 for php7 |
#
341ff0de |
| 17-Sep-2014 |
Anatol Belski |
fix macro usage |
#
b5406ed3 |
| 17-Sep-2014 |
Anatol Belski |
fix atol usage |
#
4d997f63 |
| 25-Aug-2014 |
Anatol Belski |
master renames phase 3 |
#
fdbbe5fa |
| 20-Aug-2014 |
Anatol Belski |
fixed some incompatible types |
#
61c8af6a |
| 19-Aug-2014 |
Anatol Belski |
ported apache handler |
#
9d21bef3 |
| 06-May-2014 |
Dmitry Stogov |
Added support for apache and apache2handler SAPIs (They seem slower than FastCGI) |
#
9fb92eed |
| 13-Apr-2014 |
Stanislav Malyshev |
Merge branch 'PHP-5.6' * PHP-5.6: fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce Fixed bug #67024 - getimagesize should recognize BMP files with neg
Merge branch 'PHP-5.6' * PHP-5.6: fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce Fixed bug #67024 - getimagesize should recognize BMP files with negative height
show more ...
|
#
1be29a40 |
| 13-Apr-2014 |
Stanislav Malyshev |
Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
|
#
442264ff |
| 13-Apr-2014 |
Jeff Trawick |
fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce |