]>
granicus.if.org Git - apache/log
Yann Ylavic [Thu, 1 Oct 2015 15:21:08 +0000 (15:21 +0000)]
Add r1688341 to mod_substitute proposal, as noticed by wrowe.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1706272 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 30 Sep 2015 13:31:44 +0000 (13:31 +0000)]
r1706028
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1706029 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 30 Sep 2015 13:31:29 +0000 (13:31 +0000)]
Merge r1703902 from trunk:
mod_proxy: Fix ProxySourceAddress binding failure with AH00938. PR 56687.
Proposed by: Arne de Bruijn <apache arbruijn.dds.nl>
Reviewed by: ylavic
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1706028 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 30 Sep 2015 13:30:10 +0000 (13:30 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1706026 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 30 Sep 2015 13:29:52 +0000 (13:29 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1706025 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 30 Sep 2015 11:59:57 +0000 (11:59 +0000)]
mod_ssl backports merged
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1706013 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 30 Sep 2015 11:56:58 +0000 (11:56 +0000)]
update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1706012 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 30 Sep 2015 11:54:16 +0000 (11:54 +0000)]
remove svn:mergeinfo property from docs/manual/rewrite/advanced.xml
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1706010 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 30 Sep 2015 11:50:30 +0000 (11:50 +0000)]
merge r1703952 from trunk
Support compilation against libssl built with OPENSSL_NO_SSL3,
and change the compiled-in default for SSL[Proxy]Protocol to "all -SSLv3",
in accordance with RFC 7568. PR 58349, PR 57120.
Proposed by: kbrand
Reviewed by: ylavic, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1706008 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 30 Sep 2015 11:42:54 +0000 (11:42 +0000)]
merge r1702643 from trunk
Append :!aNULL:!eNULL:!EXP to the cipher string settings,
instead of prepending !aNULL:!eNULL:!EXP: (as was the case in 2.4.7
and later). Enables support for configuring the SUITEB* cipher
strings introduced in OpenSSL 1.0.2. PR 58213.
Apply the same treatment to the "SSLOpenSSLConfCmd CipherString ..." directive.
Proposed by: kbrand
Reviewed by: ylavic, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1706007 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 30 Sep 2015 11:38:34 +0000 (11:38 +0000)]
merge r1693792 from trunk
Add support for extracting the msUPN and dnsSRV forms
of subjectAltName entries of type "otherName" into
SSL_{CLIENT,SERVER}_SAN_OTHER_{msUPN,dnsSRV}_n environment
variables. Addresses PR 58020.
* docs/manual/mod/mod_ssl.xml: add SSL_*_SAN_OTHER_*_n entries to the
environment variables table
* modules/ssl/ssl_engine_vars.c: add support for retrieving the
SSL_{CLIENT,SERVER}_SAN_OTHER_{msUPN,dnsSRV}_n variables
* modules/ssl/ssl_util_ssl.c: add parse_otherName_value, which
currently recognizes the "msUPN" (1.3.6.1.4.1.311.20.2.3) and
"id-on-dnsSRV" (1.3.6.1.5.5.7.8.7) otherName forms, and
adapt modssl_X509_getSAN to take an optional otherName form
argument for the GEN_OTHERNAME case
* modules/ssl/ssl_util_ssl.h: adapt modssl_X509_getSAN prototype
* modules/ssl/mod_ssl.c: register the id-on-dnsSRV otherName form
OID (1.3.6.1.5.5.7.8.7) in OpenSSL's objects table
Proposed by: kbrand
Reviewed by: ylavic, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1706006 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 30 Sep 2015 11:31:43 +0000 (11:31 +0000)]
merge r1674538, r1677143, r1677144, r1677145, r1677146, r1677149, r1677151,
r1677153, r1677154, r1677155, r1677156, r1677159, r1677830, r1677832,
r1677834, r1677835 from trunk
mod_ssl namespacing
Proposed by: kbrand
Reviewed by: ylavic, jorton
mod_ssl namespacing: Rename ssl_util_ssl.h macros from SSL_foo to MODSSL_foo.
For related discussion, see the dev@ thread starting at:
http://mail-archives.apache.org/mod_mbox/httpd-dev/201504.mbox/%
3C20150415163613 .GC15209%40fintan.stsp.name%3E
mod_ssl namespacing: Rename SSL_init_app_data2_idx, SSL_get_app_data2,
and SSL_set_app_data2 from SSL_* to modssl_*. Update references in
README.dsov.* files. Rename static variable SSL_app_data2_idx to just
app_data2_idx since the symbol is internal to ssl_util_ssl.c.
mod_ssl namespacing: SSL_read_PrivateKey -> modssl_read_privatekey
mod_ssl namespacing: SSL_smart_shutdown -> modssl_smart_shutdown
mod_ssl namespacing: SSL_X509_getBC -> modssl_X509_getBC
mod_ssl namespacing: Make SSL_ASN1_STRING_to_utf8 a static function inside
ssl_util_ssl.c (no callers outside this file). The new static function name
chosen is convert_asn1_to_utf8, based on the assumption that neither SSL_
nor ASN1_ are safe prefixes to use without potential future overlap.
mod_ssl namespacing: Rename SSL_X509_NAME_ENTRY_to_string to
modssl_X509_NAME_ENTRY_to_string.
mod_ssl namespacing: SSL_X509_NAME_to_string -> modssl_X509_NAME_to_string
mod_ssl namespacing: SSL_X509_getSAN -> modssl_X509_getSAN
mod_ssl namespacing: Make SSL_X509_getIDs a static function inside the
file ssl_util_ssl.c (no outside callers). Rename to just getIDs().
mod_ssl namespacing: SSL_X509_match_name -> modssl_X509_match_name
mod_ssl namespacing: SSL_X509_INFO_load_file -> modssl_X509_INFO_load_file
mod_ssl namespacing: Merge SSL_X509_INFO_load_path() into its only caller
ssl_init_proxy_certs() in ssl_engine_init.c. No functional change.
Review by: kbrand
mod_ssl namespacing: Move modssl_X509_INFO_load_file() into ssl_engine_init.c
and make it a static function called load_x509_info().
mod_ssl namespacing: Move SSL_CTX_use_certificate_chain() into ssl_engine_init.c
and make it a static function called use_certificate_chain().
mod_ssl namespacing: Rename SSL_SESSION_id2sz() to modssl_SSL_SESSION_id2sz().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1706002 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 30 Sep 2015 10:16:19 +0000 (10:16 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705996 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 30 Sep 2015 08:48:00 +0000 (08:48 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705984 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 Sep 2015 11:15:00 +0000 (11:15 +0000)]
mod_http2: config.m4: merge r1705257 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705839 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 Sep 2015 10:48:42 +0000 (10:48 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705836 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 Sep 2015 10:17:39 +0000 (10:17 +0000)]
Vote for OPENSSL_NO_SSL3 (including default), looks acceptable on dev@.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705831 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 Sep 2015 10:09:41 +0000 (10:09 +0000)]
Vote (for Jim too who proposed the backport :).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705829 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Mon, 28 Sep 2015 23:34:58 +0000 (23:34 +0000)]
Follow up to r1705751 to pick up a few strays
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705790 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 28 Sep 2015 22:00:12 +0000 (22:00 +0000)]
Follow up to r1705672.
Backport changes that somehow missed the backport process.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705784 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Sep 2015 21:07:54 +0000 (21:07 +0000)]
Backport item
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705777 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 28 Sep 2015 20:03:05 +0000 (20:03 +0000)]
Follow up to r1705492: fix MMN versions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705759 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Sep 2015 19:56:48 +0000 (19:56 +0000)]
http2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705757 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Sep 2015 19:38:26 +0000 (19:38 +0000)]
doccos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705753 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Sep 2015 19:30:00 +0000 (19:30 +0000)]
Merge r1705749 from trunk:
bye bye mod_h2, hello mod_http2
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705751 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 28 Sep 2015 19:26:41 +0000 (19:26 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705750 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Sep 2015 19:25:27 +0000 (19:25 +0000)]
note note to t&r
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705747 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 28 Sep 2015 19:21:53 +0000 (19:21 +0000)]
fix validation error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705746 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Sep 2015 13:18:52 +0000 (13:18 +0000)]
Use r->hostname
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705687 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Sep 2015 13:13:48 +0000 (13:13 +0000)]
oops2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705685 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Sep 2015 13:12:17 +0000 (13:12 +0000)]
oops
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705684 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Sep 2015 13:06:31 +0000 (13:06 +0000)]
mod_h2
Via: svn merge -r10:HEAD https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705682 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Sep 2015 13:00:59 +0000 (13:00 +0000)]
Sync
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@
1705681 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Sep 2015 12:31:37 +0000 (12:31 +0000)]
Merge r1697855, r1697339, r1696428, r1696266, r1696264, r1695874, r1695727, r1692516, r1692486, r1610674, r1685069, r1693918, r1698116, r1698133, r1694950, r1700968, r1701005, r1701145, r1701178 from trunk:
adding ap_get_protocol(c) which safeguards against NULL returns, for use instead of direct calling ap_run_protocol_get
changed Protocols to let vhosts override servers, removed old H2Engine example from readme
creating ap_array_index in util, forwarding scheme into request processing, enabling SSL vars only when scheme is not http:, delayed connection creation until task worker assignment
removed unnecessary lingering_close and sbh update on end of protocol upgrade handling
introducing ap_array_index in util, used in protocol and mod_h2
fixes existing protocol missing in selection if not explicitly proposed
new directive ProtocolsHonorOrder, added documentation for Protocols feature, changed preference selection and config merging
removed accidental code
new Protocols directive and core API changes to enable protocol switching on HTTP Upgrade or ALPN, implemented in mod_ssl and mod_h2
SECURITY (CVE-2014-0117): Fix a crash in mod_proxy. In a reverse
proxy configuration, a remote attacker could send a carefully crafted
request which could crash a server process, resulting in denial of
service.
Thanks to Marek Kroemeke working with HP's Zero Day Initiative for
reporting this issue.
* server/util.c (ap_parse_token_list_strict): New function.
* modules/proxy/proxy_util.c (find_conn_headers): Use it here.
* modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response):
Send a 400 for a malformed Connection header.
Submitted by: Edward Lu, breser, covener
http, mod_ssl: Introduce and return the 421 (Misdirected Request) status code
for clients requesting a hostname on a reused connection whose SNI (from the
TLS handshake) does not match.
PR 5802.
This allows HTTP/2 clients to fall back to a new connection as per:
https://tools.ietf.org/html/rfc7540#section-9.1.2
Proposed by: Stefan Eissing <stefan eissing.org>
Reviewed by: ylavic
c89
Allowing protocol_propose hooks to be called with offers=NULL, clarifying semantics as proposed by chaosed0@gmail.com
giving ap_array_index a start parameter, adding ap_array_contains
ap_process_request needs exportation for use in mod_h2 on Windows
final final change to the new ap_array_str_* functions after review
changed Protocols default to http/1.1 only, updated documentation, changed ap_select_protocol() to return NULL when no protocol could be agreed upon
mod_ssl: fix compiler warning (bad cast).
improvements in ap_select_protocol(), supplied by yann ylavic
Submitted by: icing, jorton, ylavic, covener, icing, icing, gsmith, icing, icing, ylavic, icing
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705672 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Sep 2015 12:27:50 +0000 (12:27 +0000)]
Note mod_h2 is RTC exception
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705669 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Sep 2015 12:26:10 +0000 (12:26 +0000)]
Merge r1705099, r1705134 from trunk:
Don't count initial handshake I/O when determining the first byte.
PR58454
Submitted By: Konstantin J. Chernov
Committed By: covener
Avoid storing request stuff in r->connection->conn_config to
avoid problems with e.g. write completion.
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705666 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Sep 2015 12:25:04 +0000 (12:25 +0000)]
Merge r1704099 from trunk:
Fix a spurious test where a condition is always true:
if ((cfg->skipto != NULL) && (ctx->flags | ENC_SKIPTO)) {
^^^^^^^^^^^^^^^^^^^^^^^
This is apparently harmless because, in 'xml2enc_filter_init', the ENC_SKIPTO bit of 'flags' is set to ENC_SKIPTO if 'skipto' is non-NULL.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705665 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 28 Sep 2015 10:53:07 +0000 (10:53 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705655 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 28 Sep 2015 10:25:10 +0000 (10:25 +0000)]
Vote/promote mod_h2, what about "experimental" bits?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705649 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 28 Sep 2015 09:32:29 +0000 (09:32 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705633 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 28 Sep 2015 09:20:59 +0000 (09:20 +0000)]
propose update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705629 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 28 Sep 2015 09:17:49 +0000 (09:17 +0000)]
merged current 2.4.x and ap_mmn.h update by minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@
1705628 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 28 Sep 2015 08:50:46 +0000 (08:50 +0000)]
Compatibility issue?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705618 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 28 Sep 2015 08:45:41 +0000 (08:45 +0000)]
Fix typo in proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705615 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 28 Sep 2015 08:44:20 +0000 (08:44 +0000)]
Propose follow up to r1705492.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705614 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 28 Sep 2015 08:32:00 +0000 (08:32 +0000)]
Fix availability version for 'ListenCoresBucketsRatio'.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705612 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 27 Sep 2015 20:36:10 +0000 (20:36 +0000)]
OK
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705571 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 27 Sep 2015 12:21:10 +0000 (12:21 +0000)]
Add a comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705531 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 27 Sep 2015 11:33:27 +0000 (11:33 +0000)]
mod_cache: r->err_headers_out is not merged into
r->headers when mod_cache is enabled and the response
is cached for the first time.
Submitted by: elu
Reviewed by: ylavic, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705528 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 27 Sep 2015 11:31:49 +0000 (11:31 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705527 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 23:36:30 +0000 (23:36 +0000)]
Propose MMN bump.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705501 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 22:55:56 +0000 (22:55 +0000)]
mod_slotmem_shm: Fix slots/SHM files names on restart for systems that
can't create new (clear) slots while previous children gracefully stopping
still use the old ones (e.g. Windows, OS2). PR 58024.
Submitted by: ylavic
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705499 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 22:54:42 +0000 (22:54 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705498 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 22:44:23 +0000 (22:44 +0000)]
util_script: Make REDIRECT_URL a complete URL (where set).
PR 57785
Submitted by: niq
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705496 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 22:42:44 +0000 (22:42 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705495 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 22:31:37 +0000 (22:31 +0000)]
We need docs...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705494 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 22:22:31 +0000 (22:22 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705493 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 22:20:14 +0000 (22:20 +0000)]
MPMs: Support SO_REUSEPORT to create multiple duplicated listener
records for scalability.
Submitted by: Yingqi Lu <yingqi.lu@intel.com>, Jeff Trawick,
Jim Jagielski, Yann Ylavic
Reviewed by: ylavic, jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705492 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 22:16:18 +0000 (22:16 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705491 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 21:59:39 +0000 (21:59 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705490 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 21:50:23 +0000 (21:50 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705488 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 21:39:42 +0000 (21:39 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705486 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 21:36:34 +0000 (21:36 +0000)]
Proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705485 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sat, 26 Sep 2015 08:08:16 +0000 (08:08 +0000)]
propose a few PR-related mod_ssl backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705398 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 25 Sep 2015 20:08:43 +0000 (20:08 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705346 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 25 Sep 2015 19:46:55 +0000 (19:46 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705344 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 25 Sep 2015 19:10:51 +0000 (19:10 +0000)]
Fix typo in comment
(r1380525 on trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705340 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 24 Sep 2015 20:24:19 +0000 (20:24 +0000)]
add fix for abuse of per-connection module config
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705135 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 24 Sep 2015 16:30:29 +0000 (16:30 +0000)]
propose logio PR
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705100 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 23 Sep 2015 14:09:47 +0000 (14:09 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1704860 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 23 Sep 2015 12:35:57 +0000 (12:35 +0000)]
Merge r1664709, r1697323 from trunk:
* Do not reset the retry timeout if the worker is in error at this stage even
if the connection to the backend was successful. It was likely set into
error by a different thread / process in parallel e.g. for a timeout or
bad status. We should respect this and should not continue with a connection
via this worker even if we got one.
* Do a more complete cleanup here. At this point we cannot end up with something useful with the data we created so far.
Submitted by: rpluem
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1704835 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 23 Sep 2015 12:33:57 +0000 (12:33 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1704834 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 23 Sep 2015 12:33:31 +0000 (12:33 +0000)]
vote and demote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1704833 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 23 Sep 2015 12:16:05 +0000 (12:16 +0000)]
latest changes from branches/2.4.x, merged --enable-http2 from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@
1704828 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 23 Sep 2015 09:59:45 +0000 (09:59 +0000)]
merged race condition fix and versoin bump from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@
1704801 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 22 Sep 2015 20:20:12 +0000 (20:20 +0000)]
remove unused var 'np'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@
1704714 13f79535 -47bb-0310-9956-
ffa450edef68
Edward Lu [Mon, 21 Sep 2015 19:28:11 +0000 (19:28 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1704402 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 21 Sep 2015 11:12:19 +0000 (11:12 +0000)]
merged latest session shutdown changes from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@
1704265 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 19 Sep 2015 16:08:16 +0000 (16:08 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1704058 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 19 Sep 2015 16:07:29 +0000 (16:07 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1704057 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 19 Sep 2015 11:52:56 +0000 (11:52 +0000)]
merged
1703871 by Yann for SNI misdirect handling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@
1703994 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 18 Sep 2015 16:57:33 +0000 (16:57 +0000)]
Propose mod_proxy fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703903 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 18 Sep 2015 13:19:33 +0000 (13:19 +0000)]
merged latest branches/2.4.x changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@
1703838 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 18 Sep 2015 12:50:24 +0000 (12:50 +0000)]
merged yann's patch to fix MISDIRECTED_REQUEST handling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@
1703826 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 17 Sep 2015 16:56:01 +0000 (16:56 +0000)]
Merge r1703417, r1703642 from trunk:
Add in finding LUA installed via Macports and others
accept both 5.1 and 5.2, so make messages clear
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703650 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 17 Sep 2015 15:02:43 +0000 (15:02 +0000)]
Backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703643 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Sep 2015 14:44:49 +0000 (14:44 +0000)]
Backport req
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703418 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Sep 2015 13:34:30 +0000 (13:34 +0000)]
Merge r1700851 from trunk:
mod_negotiation: simplify type-map body tag lookup, and be safe
should it contain a NUL byte.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703406 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Sep 2015 13:34:11 +0000 (13:34 +0000)]
Merge r1602978, r1683044, r1683884, r1673368, r1701717, r1683047 from trunk:
Core filters do not need mod_proxy.h
Small speed optimization when parsing <Limit>, <LimitExcept> and environment variables
Save a few bytes in conf pool
Remove some spaces between some return statements and ';' + fix a strange formating in a 'for' loop
In order to save a few cycles, delay a hash table lookup which is not necessary needed
Constify + save a few bytes in conf pool
Submitted by: ylavic, jailletc36, jailletc36, jailletc36, jailletc36, jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703405 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Sep 2015 13:33:12 +0000 (13:33 +0000)]
Merge r1701436 from trunk:
allow autoindex w/o mod_dir/mod_mime setting the DIR_MAGIC_TYPE.
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703404 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Sep 2015 13:32:21 +0000 (13:32 +0000)]
Merge r1701545 from trunk:
Improve macro definition in order to avoid potential precedence issues.
For example, sparse spotted that the following line was spurious:
newcond->flags &= ~CONDFLAG_NOCASE;
It this particular case, 2 bits were resetted (instead of only 1). This was harmless because the first bit (i.e. CONDFLAG_NONE) is never tested as-is.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703403 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Sep 2015 13:31:45 +0000 (13:31 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703402 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Sep 2015 13:31:17 +0000 (13:31 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703401 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 15 Sep 2015 18:21:04 +0000 (18:21 +0000)]
remove unwanted/needed merge remnants
change base address
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@
1703270 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 15 Sep 2015 18:17:25 +0000 (18:17 +0000)]
fix a missed C&P error in comment
add a missing piece needed for command line build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@
1703269 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 15 Sep 2015 14:44:41 +0000 (14:44 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703215 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 15 Sep 2015 14:36:14 +0000 (14:36 +0000)]
Propose mod_slotmem_shm/mpm_winnt fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703205 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 15 Sep 2015 11:51:26 +0000 (11:51 +0000)]
adding
1703152 to fix ProtocolsHonorOrder description
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@
1703159 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 14 Sep 2015 21:14:21 +0000 (21:14 +0000)]
Update easy proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703060 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 14 Sep 2015 20:26:16 +0000 (20:26 +0000)]
Easy proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703053 13f79535 -47bb-0310-9956-
ffa450edef68