summaryrefslogtreecommitdiff
path: root/sapi/apache2handler
Commit message (Collapse)AuthorAgeFilesLines
* Fixed bug #61471Zheng SHAO2017-02-082-1/+47
|
* Revert "Merge branch 'bugfix_timeout_61471' of ↵Anatol Belski2017-01-051-44/+1
| | | | | | | https://github.com/axot/php-src into PHP-7.0" This reverts commit a8931df672bb173ef81c10e4fc2a5de23789c935, reversing changes made to f2f35a2b27d0074ab015b8a37d6563eec74147d5.
* Update copyright headers to 2017Sammy Kaye Powers2017-01-045-5/+5
|
* define php_ap_map_http_request_error function for older httpd onlyZheng SHAO2016-12-291-31/+24
|
* add old versions of httpd supportZheng SHAO2016-12-291-0/+34
|
* typo fixedZheng SHAO2016-12-171-1/+1
|
* bug fixed #61471 in apache2handlerZheng SHAO2016-12-171-1/+17
|
* Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-032-2/+2
| | | | Also re bug #71575.
* Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-01-111-9/+9
|\ | | | | | | | | | | | | * PHP-5.6: Simplify code per Anatol. Insert bug number. Use strtoll() when apr_off_t is 64 bits.
| * Simplify code per Anatol.Adam Harvey2016-01-112-41/+8
| |
| * Insert bug number.Adam Harvey2016-01-111-1/+1
| |
| * Use strtoll() when apr_off_t is 64 bits.Adam Harvey2016-01-112-9/+42
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-015-5/+5
|\ \ | |/ | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-015-5/+5
| |
* | Fixed memleaks in apache2handlerXinchen Hui2015-09-231-5/+16
| |
* | 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-155-5/+5
| | |
* | | 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-162-4/+4
| | | | | | | | | | | | 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
| | |
* | | Use new ZEND_HASH_FOREACH_... API.Dmitry Stogov2015-02-101-21/+0
| | |
* | | bump yearXinchen Hui2015-01-155-5/+5
| | |
* | | trailing whitespace removalStanislav Malyshev2015-01-102-30/+30
| | |
* | | Drop duplicate arg from hash_get_current_key_exNikita Popov2014-12-261-2/+2
| | |
* | | 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
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-152-6/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: made the apache ini holders to be zend_bool Removed useless local variable Use simpler functions Fixed test small fixes to UPGRADING Reorder to save alignment size (of course, only for common used structs)
| * | | made the apache ini holders to be zend_boolAnatol Belski2014-12-152-6/+6
| | | | | | | | | | | | | | | | since they're documented to be so and we spare 16 byte
* | | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-132-51/+50
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-061-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (35 commits) Fixed bug #68398 msooxml matches too many archives Fix zpp call in apache_getenv() Drop unnecessary zval containers fixed test C89 compat add include for missing localeconv_r proto updated NEWS Fixed bug #65230 setting locale randomly broken Fix compilation error (ref #68424) Removed useless handlers Move checks for references into slow paths of operator functions. Remove duplicate opcode handlers. Revert unintentional docblock change Restored zip/oci8 PHP 4 code, add PHP 7 checks Note macro removal in UPGRADING.INTERNALS Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!) Zend Engine 3 Updated NEWS Updated NEWS Updated NEWS Start adding new attribute to control multi statements ...
| * | | Fix zpp call in apache_getenv()Nikita Popov2014-12-061-2/+2
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-181-2/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | fix unsigned checkAnatol Belski2014-11-181-2/+6
| | | |
* | | | 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-154-5/+12
| | | | | | | | | | | | | | | | 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
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-011-146/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (26 commits) Micro optimization Drop unused INIT_STRING opcode Drop unused RAISE_ABSTRACT_ERROR opcode CT substitute unqualified true/false/null in namespaces Fix a couple compile warnings fix test filename one more test to illustrate transfer of an arbitrary data amount throug pipes fix tests on linux better test cleanup Use more readable inline functions increase the polling period to not to break existing behaviours updated NEWS Fixed bug #51800 proc_open on Windows hangs forever Fixed segfault Set an LDAP error code when failing ldap_bind due to null bytes Fix segmentation fault in debug_backtrace() Drop support for GMP 4.1 Make gmp_setbit and gmp_clrbit return values consistent removed *.dsw and *.dsp files Opcache compatibility for coalesce operator ...
| * | | removed *.dsw and *.dsp filesAnatol Belski2014-09-281-146/+0
| | | |
* | | | remove unused fetchkrakjoe2014-09-261-1/+0
| | | |
* | | | reworked the patch, less new stuff but workyAnatol Belski2014-09-253-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | basic windows fixAnatol Belski2014-09-222-2/+2
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-09-222-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
View Lorry Controller Status