summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* override index: clarify this doc's purposetrunk-override-indexJacob Champion2017-05-041-2/+9
| | | | | | Based on feedback by elukey. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-override-index@1793923 13f79535-47bb-0310-9956-ffa450edef68
* Add an Override Class IndexJacob Champion2017-05-048-6/+409
| | | | | | | | | | This page pulls in directives that declare an <override> element and groups them by class. The documentation for each class comes from overrides.xml. Any undocumented classes are flagged with a boilerplate fallback text (this situation is only likely to occur with a misspelling or otherwise invalid <override> somewhere else in the documentation). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-override-index@1793922 13f79535-47bb-0310-9956-ffa450edef68
* Feature branch for a new override index manual page.Jacob Champion2017-05-040-0/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-override-index@1793921 13f79535-47bb-0310-9956-ffa450edef68
* On the trunk:Stefan Eissing2017-05-022-5/+2
| | | | | | | | mod_proxy_http2: update after backport git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793533 13f79535-47bb-0310-9956-ffa450edef68
* On the trunk:Stefan Eissing2017-05-022-0/+29
| | | | | | | | mod_proxy_http2: adding support for Reverse Proxy Request headers. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793525 13f79535-47bb-0310-9956-ffa450edef68
* Remove a space to synch with 2.4.x.Christophe Jaillet2017-05-011-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793314 13f79535-47bb-0310-9956-ffa450edef68
* Synch with 2.4.x.Christophe Jaillet2017-05-011-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793291 13f79535-47bb-0310-9956-ffa450edef68
* Synch with trunk.Christophe Jaillet2017-05-011-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793290 13f79535-47bb-0310-9956-ffa450edef68
* Synch trunk and 2.4 branch (r1735954 in 2.4)Christophe Jaillet2017-05-011-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793288 13f79535-47bb-0310-9956-ffa450edef68
* Synch trunk and 2.4 branchChristophe Jaillet2017-05-011-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793287 13f79535-47bb-0310-9956-ffa450edef68
* Fix NULL pointer dereference in error logging messageChristophe Jaillet2017-05-011-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793286 13f79535-47bb-0310-9956-ffa450edef68
* Rebuild.Lucien Gentis2017-04-296-33/+60
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793199 13f79535-47bb-0310-9956-ffa450edef68
* XML updates.Lucien Gentis2017-04-292-31/+58
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793198 13f79535-47bb-0310-9956-ffa450edef68
* Fix typoChristophe Jaillet2017-04-281-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792983 13f79535-47bb-0310-9956-ffa450edef68
* Follow up to r1789220.Yann Ylavic2017-04-251-0/+21
| | | | | | | | | Document the implicit behaviour of ListenCoresBucketsRatio when multiple Listen-ers are configured on the same IP:port. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792675 13f79535-47bb-0310-9956-ffa450edef68
* git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792661 ↵Luis Gil2017-04-251-1/+1
| | | | 13f79535-47bb-0310-9956-ffa450edef68
* added mod rewrite section to the pageLuis Gil2017-04-252-46/+64
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792660 13f79535-47bb-0310-9956-ffa450edef68
* Evaluate nested If/ElseIf/Else config sectionsLuca Toscano2017-04-252-3/+21
| | | | | | | | | | | | | | | | | | | It has been reported multiple times that nested If/ElseIf/Else sections are not evaluated but silently ignored. This patch adds a simple recursion to the ap_if_walk logic in order to allow arbitrary nested configs. The overhead seems negligible compared to the actual version of the ap_if_walk, but more expert feedback is surely needed since this code gets called for every HTTP request. Tests are going to be added to t/apache/if_sections.t git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792589 13f79535-47bb-0310-9956-ffa450edef68
* despite trace, assign a APLOGNO, as done elsewhere in this modEric Covener2017-04-232-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792395 13f79535-47bb-0310-9956-ffa450edef68
* PR61012: log a trace message on tunnel shutdownEric Covener2017-04-231-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792394 13f79535-47bb-0310-9956-ffa450edef68
* Fix some compatibility notesChristophe Jaillet2017-04-231-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792336 13f79535-47bb-0310-9956-ffa450edef68
* Synch trunk doc with 2.4.x (add some " in order to improve syntax highlight)Christophe Jaillet2017-04-231-26/+26
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792335 13f79535-47bb-0310-9956-ffa450edef68
* Rebuild.Lucien Gentis2017-04-224-3/+22
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792297 13f79535-47bb-0310-9956-ffa450edef68
* XML updates.Lucien Gentis2017-04-222-3/+24
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792296 13f79535-47bb-0310-9956-ffa450edef68
* Fix pattern (.xml source filenames aren't charset tagged)William A. Rowe Jr2017-04-211-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792216 13f79535-47bb-0310-9956-ffa450edef68
* Still can find only one problem case alluded to by André.William A. Rowe Jr2017-04-211-4/+3
| | | | | | | | | Where Accept-Lanuage is da Q=1 and ru Q=1, leaving these out of the priority list results in English as the tie-breaker, which is incorrect. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792214 13f79535-47bb-0310-9956-ffa450edef68
* On the trunk:Stefan Eissing2017-04-212-6/+2
| | | | | | | | mod_http2: update after backport git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792212 13f79535-47bb-0310-9956-ffa450edef68
* On the trunk:Stefan Eissing2017-04-216-86/+110
| | | | | | | | | | mod_http2: fixed possible deadlock that could occur when connections were terminated early with ongoing streams. Fixed possible hanger with timeout on race when connection considers itself idle. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792195 13f79535-47bb-0310-9956-ffa450edef68
* Introduce request taint-checking concept.Nick Kew2017-04-217-1/+60
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792169 13f79535-47bb-0310-9956-ffa450edef68
* Add missing documentation for secret.Jean-Frederic Clere2017-04-211-1/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792168 13f79535-47bb-0310-9956-ffa450edef68
* Add upgrade parameter to mod_proxy_wstunnel.Jean-Frederic Clere2017-04-206-8/+41
| | | | | | | | | | | | That allows to upgrade to jboss-remoting for example or to run an HTTP/1.1 backend that needs to upgrade to WebSocket. See also: https://issues.jboss.org/browse/JBCS-254 https://issues.jboss.org/browse/JBCS-291 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792092 13f79535-47bb-0310-9956-ffa450edef68
* PR61009: be as helpful as possible during -V operationJacob Champion2017-04-191-4/+13
| | | | | | | | | | | A configtest isn't useful if you're just trying to get compile settings. Move the settings dump up to just after ap_read_config(), which has already done the minimum necessary to figure out which MPM is in use. Even if ap_read_config() failed, still print as many compile settings as we can. The user will see the error log entry on stderr. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791975 13f79535-47bb-0310-9956-ffa450edef68
* Merge fix branch for PR60947.Jacob Champion2017-04-193-39/+87
|\ | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791849 13f79535-47bb-0310-9956-ffa450edef68
| * ssl_util.c: add APLOGNOstrunk-openssl-threadidJacob Champion2017-04-192-5/+5
| | | | | | | | | | | | | | Start from 10027 to match the current trunk (r1791845), which will be merged into shortly. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791848 13f79535-47bb-0310-9956-ffa450edef68
| * ssl_util.c: log which threadid callback is in useJacob Champion2017-04-191-1/+11
| | | | | | | | | | | | | | This should help during testing and debugging. Use APLOG_NOTICE for now, until we fix PR60999, so that people can actually see the log message. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791847 13f79535-47bb-0310-9956-ffa450edef68
| * PR60947: try to warn affected users...Jacob Champion2017-04-181-0/+10
| | | | | | | | | | | | | | ...but at the moment, this won't actually get logged unless you're running in debug mode, due to an unrelated bug (PR60999). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791733 13f79535-47bb-0310-9956-ffa450edef68
| * PR60947: avoid CRYPTO_THREADID_set_callback() if possibleJacob Champion2017-04-182-23/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CRYPTO_THREADID_set_callback() is write-once, so if mod_ssl is unloaded and reloaded into a different address, we'll crash if OpenSSL wasn't also unloaded and reloaded at the same time. This can happen if another module or library is using OpenSSL as well. - OpenSSL 1.1.0 isn't affected. - Certain platforms (Windows, BeOS, and POSIX-compliant systems) can make use of the default THREADID callback in OpenSSL 1.0.x. - If the deprecated CRYPTO_set_id_callback() is available, we can use it instead of CRYPTO_THREADID_set_callback(). Otherwise, we have to fall back to CRYPTO_THREADID_set_callback(), but hopefully that applies to a small percentage of users at this point. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791732 13f79535-47bb-0310-9956-ffa450edef68
| * ssl_util.c: add a couple explanatory commentsJacob Champion2017-04-181-0/+5
| | | | | | | | | | | | Mark the things that are busted. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791731 13f79535-47bb-0310-9956-ffa450edef68
| * ssl_util.c: pull up duplicated code in ssl_util_thr_id()Jacob Champion2017-04-181-23/+18
| | | | | | | | | | | | Should make it easier to see what's going on in the next few changes. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791730 13f79535-47bb-0310-9956-ffa450edef68
| * configure: bump thread count for the &errno testJacob Champion2017-04-141-5/+9
| | | | | | | | | | | | Increase the number of threads from three to ten. Patch by rjung. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791309 13f79535-47bb-0310-9956-ffa450edef68
* | mod_ssl_ct: fix return values for custom extension callbackJacob Champion2017-04-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is most likely a follow-up to r1628833. At some point during the OpenSSL 1.0.2 beta, the contract for custom extension callbacks changed from "returning -1 skips the extension" to "returning -1 will issue a TLS fatal alert". This caused mod_ssl_ct to abort TLS connections that it intended to ignore. Zero is the correct return value for "do nothing" in 1.0.2. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791845 13f79535-47bb-0310-9956-ffa450edef68
* | KISS: RemoveType is a simpler fix for .tr; explain .da files; order ourWilliam A. Rowe Jr2017-04-181-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | LanguagePriority by a first-order comparison and drop negligable translations from our ordered priority preference list entirely. A better comparison would be total number of documents in-sync, or some convoluted weight ordering each document by which are more in sync than others. Leaving that puzzle to an interested hacker. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791807 13f79535-47bb-0310-9956-ffa450edef68
* | On the trunk:Stefan Eissing2017-04-182-15/+2
| | | | | | | | | | | | | | | | update after mod_http2 backport. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791790 13f79535-47bb-0310-9956-ffa450edef68
* | On the trunk:Stefan Eissing2017-04-181-0/+1
| | | | | | | | | | | | | | | | mod_http2: normalize zombie slot state before pushing it on the free list. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791773 13f79535-47bb-0310-9956-ffa450edef68
* | On the trunk:Stefan Eissing2017-04-173-6/+20
| | | | | | | | | | | | | | | | | | mod_http2: MaxKeepAliveRequests now limits the number of times a slave connection gets reused. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791669 13f79535-47bb-0310-9956-ffa450edef68
* | mod_substitute: use local/native LF for splittingEric Covener2017-04-142-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On platforms where the APR_ASCII_LF != '\n', like EBCDIC systems, strmatch or pcre patterns from the source or config will be in the native encoding, and this module will really only work on content in the native encoding. (mod_substitute runs before mod_charset_lite for a similar reason) I thought #if APR_CHARSET_EBCDIC or even #ifdef __MVS__ was overkill here. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791400 13f79535-47bb-0310-9956-ffa450edef68
* | On the trunk:Stefan Eissing2017-04-144-4/+18
| | | | | | | | | | | | | | | | | | mod_http2: client streams that lack the EOF flag get now forcefully closed with a RST_STREAM (NO_ERROR) when the request has been answered. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791388 13f79535-47bb-0310-9956-ffa450edef68
* | On the trunk:Stefan Eissing2017-04-148-91/+201
| | | | | | | | | | | | | | | | | | | | | | mod_http2: only when 'HttpProtocolOptions Unsafe' is configured, will control characters in response headers or trailers be forwarded to the client. Otherwise, in the default configuration, a request will eiher fail with status 500 or the stream will be reset by a RST_STREAM frame. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791377 13f79535-47bb-0310-9956-ffa450edef68
* | xformsJim Jagielski2017-04-1318-1601/+1599
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791238 13f79535-47bb-0310-9956-ffa450edef68
* | location of brotli libJim Jagielski2017-04-131-2/+3
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791234 13f79535-47bb-0310-9956-ffa450edef68