summaryrefslogtreecommitdiff
path: root/sapi/apache2handler/sapi_apache2.c
Commit message (Collapse)AuthorAgeFilesLines
* fix zend signal and tsrm compatzend-signal-ztsJoe Watkins2015-09-011-0/+5
|
* Merge branch 'PHP-5.6'Stanislav Malyshev2015-04-141-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: (27 commits) fix non-standard C update NEWS 5.4.41 next fix CVE num update NEWS Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode) fix test fix type in fix for #69085 fix memory leak & add test Fix tests fix CVE num Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability) Fix test Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) ... Conflicts: Zend/zend_exceptions.c ext/curl/interface.c ext/dom/document.c ext/fileinfo/libmagic/softmagic.c ext/gd/gd.c ext/hash/hash.c ext/pgsql/pgsql.c ext/phar/phar.c ext/phar/phar_internal.h ext/standard/http_fopen_wrapper.c ext/standard/link.c ext/standard/streamsfuncs.c ext/xmlwriter/php_xmlwriter.c ext/zlib/zlib.c
| * Merge branch 'PHP-5.4.40' into PHP-5.5.24Stanislav Malyshev2015-04-111-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4.40: Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) Fixed bug #68901 (use after free) Fixed bug #68740 (NULL Pointer Dereference) Fix bug #66550 (SQLite prepared statement use-after-free) Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467 Fix bug #68601 buffer read overflow in gd_gif_in.c Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4" Fixed bug #69293 Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
| | * Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)Stanislav Malyshev2015-04-111-0/+1
| | |
| * | Shut up, my lovely compiler; I do not like your warningsBob Weinand2015-02-091-2/+2
| | | | | | | | | | | | | | | Conflicts: Zend/zend_object_handlers.c
| * | Bump yearXinchen Hui2015-01-151-1/+1
| |/
* | Drop VC6 support in sapi/apache2handlerKalle Sommer Nielsen2015-03-291-6/+0
| |
* | Revive Zend Signals handler (and fixed bug #61083)Xinchen Hui2015-03-051-0/+3
| |
* | made ZEND_TSRMLS_CACHE_* macros look like function callsAnatol Belski2015-02-161-3/+3
| | | | | | | | which also comply with the current semantics for such macros
* | fix values for gid and uidAnatol Belski2015-02-111-0/+5
| | | | | | | | As stated by MSDN, these fields are always set to zero
* | silence unused variable warningAnatol Belski2015-02-111-1/+1
| |
* | bump yearXinchen Hui2015-01-151-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-161-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | cleanup uneeded castRemi Collet2014-12-161-2/+2
| | |
* | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-36/+35
| | |
* | | don't define tsrm ls in SAPIs under linuxAnatol Belski2014-10-151-1/+1
| | | | | | | | | | | | as it's compiled statically with the core
* | | moved most of the core to use static tsrm ls cache pointerAnatol Belski2014-10-151-0/+6
| | | | | | | | | | | | plus apache2handler, cli and cgi
* | | TSRMLS_FETCH() is a spent forceAnatol Belski2014-10-151-1/+4
| | |
* | | bring back all the TSRMLS_FETCH() stuffAnatol Belski2014-10-151-0/+1
| | | | | | | | | | | | for better comparability with the mainstream
* | | remove unused fetchkrakjoe2014-09-261-1/+0
| | |
* | | reworked the patch, less new stuff but workyAnatol Belski2014-09-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-09-221-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | Move smart_str implementation into Zend/Nikita Popov2014-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | native tls initial patchkrakjoe2014-09-201-1/+2
|/ /
* | Update sapi_apache2.cjfha732014-09-181-4/+4
| | | | | | Change of php5 for php7
* | fix macro usageAnatol Belski2014-09-171-1/+5
| |
* | fix atol usageAnatol Belski2014-09-171-1/+1
| |
* | master renames phase 3Anatol Belski2014-08-251-7/+7
| |
* | fixed some incompatible typesAnatol Belski2014-08-201-2/+2
| |
* | ported apache handlerAnatol Belski2014-08-191-6/+6
| |
* | Added support for apache and apache2handler SAPIs (They seem slower than ↵Dmitry Stogov2014-05-061-8/+4
| | | | | | | | FastCGI)
* | Merge branch 'PHP-5.6'Stanislav Malyshev2014-04-131-1/+1
|\ \ | | | | | | | | | | | | | | | * PHP-5.6: fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce Fixed bug #67024 - getimagesize should recognize BMP files with negative height
| * \ Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-131-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.5: fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
| | * fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cceJeff Trawick2014-04-131-1/+1
| | |
| | * Bump yearXinchen Hui2014-01-031-1/+1
| | |
| | * Merge branch 'pull-request/341'Stanislav Malyshev2013-06-101-1/+1
| | | | | | | | | | | | | | | * pull-request/341: (23 commits) typofixes
| | * Happy New YearXinchen Hui2013-01-011-1/+1
| | |
| | * - Year++Felipe Pena2012-01-011-1/+1
| | |
| | * Fixed bug #60206 (possible integer overflow in content_length)Xinchen Hui2011-11-031-1/+1
| | |
| | * Fixed a bug with calculation of REQUEST_TIME in apache2Ilia Alshanetsky2011-06-231-1/+1
| | |
| | * Fix a couple of warnings. Use %zu to printf a time_t and get_request_timeRasmus Lerdorf2011-05-161-1/+1
| | | | | | | | | | | | | | | actually returns a double, not a time_t.
* | | Merge branch 'PHP-5.6'Bob Weinand2014-04-111-2/+2
|\ \ \ | |/ /
| * | Shut up, my lovely compiler; I do not like your warningsBob Weinand2014-04-111-2/+2
| | |
* | | Merge branch 'PHP-5.6'Xinchen Hui2014-01-031-1/+1
|\ \ \ | |/ /
| * | Bump yearXinchen Hui2014-01-031-1/+1
| | |
* | | Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few ↵Kalle Sommer Nielsen2013-12-181-2/+1
|/ / | | | | | | TSRMLS_FETCH() calls in our various SAPIs
* | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-101-1/+1
| | | | | | | | | | * pull-request/341: (23 commits) typofixes
* | Happy New YearXinchen Hui2013-01-011-1/+1
| |
* | - Year++Felipe Pena2012-01-011-1/+1
| |
* | Fixed bug #60206 (possible integer overflow in content_length)Xinchen Hui2011-11-031-1/+1
| |
View Lorry Controller Status