summaryrefslogtreecommitdiff
path: root/sapi/apache2handler
Commit message (Collapse)AuthorAgeFilesLines
* Sync leading and final newlines in source code filesPeter Kokot2018-10-142-2/+0
| | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
* Trim trailing whitespace in source code filesPeter Kokot2018-10-132-15/+15
|
* Fixed bug #75479Nikita Popov2018-09-301-1/+8
| | | | Wrap the zend_signal_init() call, so the hook arguments line up.
* Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2018-09-091-0/+1
|\ | | | | | | | | | | * PHP-7.0: Update NEWS Fix for bug #76582
| * Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2018-09-091-0/+1
| |\ | | | | | | | | | | | | | | | * PHP-5.6: Update NEWS Fix for bug #76582
| | * Fix for bug #76582Stanislav Malyshev2018-09-091-0/+1
| | | | | | | | | | | | | | | The brigade seems to end up in a messed up state if something fails in shutdown, so we clean it up.
* | | Fix race conditions with Apache vhost vs. per dir configAnatol Belski2018-02-011-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the same php_value/php_flag is present in httpd.conf and .htaccess, the key is potentially shared between threads. Unfortunately we can't intern these keys using the current mechanism, because the MPM is setup before the SAPI module setup is even started. A more elegant way were to implement a kind of string pool for the thread safe Apache SAPI config directives with the mechanism similar to what is done for the SAPI setup now, but doing a separate management. (cherry picked from commit 73eb5a78b9caa18d35624765f9b972c1ba48855d)
* | | year++Xinchen Hui2018-01-025-5/+5
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-10-051-2/+2
|\ \ \ | |/ /
| * | Fixed bug #75311Mathieu CARBONNEAUX2017-10-051-2/+2
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-03-282-47/+1
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-7.0: update NEWS Revert "Fixed bug #61471"
| * | Revert "Fixed bug #61471"Anatol Belski2017-03-282-47/+1
| | | | | | | | | | | | This reverts commit 80c8d84af303d2fddc9ba9f181c7117b9040811d.
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-02-082-1/+47
|\ \ \ | |/ /
| * | Fixed bug #61471Zheng SHAO2017-02-082-1/+47
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-051-44/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"
| * | 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
| | |
* | | Update copyright headers to 2017Sammy Kaye Powers2017-01-045-5/+5
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-12-291-1/+44
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-7.0: define php_ap_map_http_request_error function for older httpd only add old versions of httpd support typo fixed bug fixed #61471 in apache2handler
| * | 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
| | |
* | | fix build with mod_winntAnatol Belski2016-07-111-0/+8
| | |
* | | Pass error severity to SAPI modules and raise corresponding error level in ↵Martin Vobruba2016-07-111-3/+31
| | | | | | | | | | | | Apache
* | | Cleanup zend_signal APIDmitry Stogov2016-06-201-2/+0
| | |
* | | Enable per-module logging in Apache 2.4+Martin Vobruba2016-06-031-0/+6
|/ /
* | 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
| | |
View Lorry Controller Status