summaryrefslogtreecommitdiff
path: root/sapi/apache2handler
Commit message (Collapse)AuthorAgeFilesLines
* Trim trailing whitespaces in build filesPeter Kokot2018-07-291-4/+4
| | | | | | | | Some editors utilizing .editorconfig automatically trim whitespaces. For convenience this patch removes whitespaces in certain build files: - ext/*/config*.m4 - configure.ac - acinclude.m4
* Remove unused Git attributes identPeter Kokot2018-07-257-14/+1
| | | | | | | | | | | | | | | The $Id$ keywords were used in Subversion where they can be substituted with filename, last revision number change, last changed date, and last user who changed it. In Git this functionality is different and can be done with Git attribute ident. These need to be defined manually for each file in the .gitattributes file and are afterwards replaced with 40-character hexadecimal blob object name which is based only on the particular file contents. This patch simplifies handling of $Id$ keywords by removing them since they are not used anymore.
* Merge branch 'PHP-7.2'Anatol Belski2018-01-311-0/+18
|\ | | | | | | | | * PHP-7.2: Fix race conditions with Apache vhost vs. per dir config
| * Fix race conditions with Apache vhost vs. per dir configAnatol Belski2018-01-311-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.
| * year++Xinchen Hui2018-01-025-5/+5
| |
* | Use PHP_WIN32Kalle Sommer Nielsen2018-01-041-7/+7
| |
* | year++Xinchen Hui2018-01-025-5/+5
| |
* | Merge branch 'PHP-7.2'Anatol Belski2017-11-301-1/+0
|\ \ | |/ | | | | | | * PHP-7.2: Revert "Fix macro redefinition warnings"
| * Revert "Fix macro redefinition warnings"Anatol Belski2017-11-301-1/+0
| | | | | | | | This reverts commit 23d2bd374838897ec97f9994e70856686a89f132.
* | Merge branch 'PHP-7.2'Anatol Belski2017-11-301-0/+1
|\ \ | |/ | | | | | | * PHP-7.2: Fix macro redefinition warnings
| * Fix macro redefinition warningsAnatol Belski2017-11-301-0/+1
| | | | | | | | The corresponding implementations are available from APR.
* | Merge branch 'PHP-7.2'Nikita Popov2017-10-051-2/+2
|\ \ | |/
| * Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2017-10-051-2/+2
| |\
| | * Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-10-051-2/+2
| | |\
| | | * Fixed bug #75311Mathieu CARBONNEAUX2017-10-051-2/+2
| | | |
* | | | Removed support for BeOS, development for BeOS was supported 17 years ago.Kalle Sommer Nielsen2017-08-291-7/+0
|/ / / | | | | | | | | | | | | | | | This patch however does not drop support for the BeOS compatible variant, Haiku, see Github PR #2697 which is currently a WiP I intentionally left out some fragments for BeOS in the build system for that seems to be bundles
* | | Merge branch 'PHP-7.1'Anatol Belski2017-03-282-47/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-7.1: update NEWS update NEWS Revert "Fixed bug #61471"
| * | 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.1'Nikita Popov2017-02-082-1/+47
|\ \ \ | |/ /
| * | 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
| | |
* | | Revert "Merge branch 'bugfix_timeout_61471' of ↵Anatol Belski2017-01-151-44/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/axot/php-src into PHP-7.0" This reverts commit a8931df672bb173ef81c10e4fc2a5de23789c935, reversing changes made to f2f35a2b27d0074ab015b8a37d6563eec74147d5. (cherry picked from commit 57736cc937fc6dfdfb403293d7bf88b264e83e15) Something went wrong, so the revert didn't land in master. Cherry-picking extra therefore.
* | | Update copyright headers to 2017Sammy Kaye Powers2017-01-025-5/+5
| | |
* | | Merge branch 'PHP-7.1'Xinchen Hui2016-12-291-1/+44
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-7.1: 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
| * | 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
| | |
* | | Remove Netware supportKalle Sommer Nielsen2016-11-123-20/+5
|/ / | | | | | | If this does not break the Unix system somehow, I'll be amazed. This should get most of it out, apologies for any errors this may cause on non-Windows ends which I cannot test atm.
* | 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.
View Lorry Controller Status