]> granicus.if.org Git - apache/log
apache
9 years agoremove space after \
Gregg Lewis Smith [Mon, 10 Aug 2015 00:09:58 +0000 (00:09 +0000)]
remove space after \

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1694936 13f79535-47bb-0310-9956-ffa450edef68

9 years agoThird try, follows up 1694901 and 1694902
Gregg Lewis Smith [Sun, 9 Aug 2015 21:33:02 +0000 (21:33 +0000)]
Third try, follows up 1694901 and 1694902
MinGW32 and MSVC both define WIN32
MSVC and Netware do not use autoconf

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1694912 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAdd include path for NetWare build.
Gregg Lewis Smith [Sun, 9 Aug 2015 20:02:02 +0000 (20:02 +0000)]
Add include path for NetWare build.
Submitted by: normw gknw net.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1694903 13f79535-47bb-0310-9956-ffa450edef68

9 years agofollowup to r1694901, it was too greedy
Gregg Lewis Smith [Sun, 9 Aug 2015 19:47:55 +0000 (19:47 +0000)]
followup to r1694901, it was too greedy

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1694902 13f79535-47bb-0310-9956-ffa450edef68

9 years agoap_config_auto.h is not used/created in non-Autoconf compilers like MSVC
Gregg Lewis Smith [Sun, 9 Aug 2015 19:21:44 +0000 (19:21 +0000)]
ap_config_auto.h is not used/created in non-Autoconf compilers like MSVC

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1694901 13f79535-47bb-0310-9956-ffa450edef68

9 years agoxforms
Eric Covener [Mon, 3 Aug 2015 20:09:41 +0000 (20:09 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693964 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAllow cookies set by mod_rewrite to contain ':' by accepting
Eric Covener [Mon, 3 Aug 2015 20:09:34 +0000 (20:09 +0000)]
Allow cookies set by mod_rewrite to contain ':' by accepting
';' as an alternate separator.  PR47241.

Submitted By: <bugzilla schermesser com>, covener
Committed By: covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693963 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAdd HTTPD_VERSION and HTTPD_MMN to the variables available with apxs -q
Eric Covener [Mon, 3 Aug 2015 15:37:07 +0000 (15:37 +0000)]
Add HTTPD_VERSION and HTTPD_MMN to the variables available with apxs -q

PR58202.

Submitted By: Daniel Shahaf
Committed By: covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693919 13f79535-47bb-0310-9956-ffa450edef68

9 years agoc89
Eric Covener [Mon, 3 Aug 2015 15:29:42 +0000 (15:29 +0000)]
c89

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693918 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild
Rich Bowen [Sun, 2 Aug 2015 21:12:46 +0000 (21:12 +0000)]
Rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693829 13f79535-47bb-0310-9956-ffa450edef68

9 years agoDocument the syntax for invoking the check_forensic script, too.
Rich Bowen [Sun, 2 Aug 2015 21:09:47 +0000 (21:09 +0000)]
Document the syntax for invoking the check_forensic script, too.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693828 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild
Rich Bowen [Sun, 2 Aug 2015 20:54:23 +0000 (20:54 +0000)]
Rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693827 13f79535-47bb-0310-9956-ffa450edef68

9 years agoExample of how to invoke the forensic log
Rich Bowen [Sun, 2 Aug 2015 20:52:55 +0000 (20:52 +0000)]
Example of how to invoke the forensic log

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693826 13f79535-47bb-0310-9956-ffa450edef68

9 years agoupdate mod_ssl.html.en transformation
Kaspar Brand [Sun, 2 Aug 2015 07:32:46 +0000 (07:32 +0000)]
update mod_ssl.html.en transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693793 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAdd support for extracting the msUPN and dnsSRV forms
Kaspar Brand [Sun, 2 Aug 2015 07:30:45 +0000 (07:30 +0000)]
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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693792 13f79535-47bb-0310-9956-ffa450edef68

9 years agozap some recently backported items
Eric Covener [Thu, 30 Jul 2015 21:23:10 +0000 (21:23 +0000)]
zap some recently backported items

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693505 13f79535-47bb-0310-9956-ffa450edef68

9 years agoremoved accidental code
Stefan Eissing [Fri, 24 Jul 2015 13:46:08 +0000 (13:46 +0000)]
removed accidental code

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1692516 13f79535-47bb-0310-9956-ffa450edef68

9 years agonew Protocols directive and core API changes to enable protocol switching on HTTP...
Stefan Eissing [Fri, 24 Jul 2015 12:09:44 +0000 (12:09 +0000)]
new Protocols directive and core API changes to enable protocol switching on HTTP Upgrade or ALPN, implemented in mod_ssl and mod_h2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1692486 13f79535-47bb-0310-9956-ffa450edef68

9 years agoc89-ify http2
Edward Lu [Thu, 23 Jul 2015 19:20:09 +0000 (19:20 +0000)]
c89-ify http2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1692432 13f79535-47bb-0310-9956-ffa450edef68

9 years agorenamed H2InitialWindowSize to H2WindowSize, fixed post_read registration to be reall...
Stefan Eissing [Wed, 22 Jul 2015 14:44:06 +0000 (14:44 +0000)]
renamed H2InitialWindowSize to H2WindowSize, fixed post_read registration to be really first to install necessary response parsing filters

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1692285 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl: allow enabling of SSLProtocols even though they are disabled by OpenSSL
Jan Kaluža [Wed, 22 Jul 2015 12:08:01 +0000 (12:08 +0000)]
mod_ssl: allow enabling of SSLProtocols even though they are disabled by OpenSSL
by default. Show warning in that case.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1692258 13f79535-47bb-0310-9956-ffa450edef68

9 years agodo some property cleanup
André Malo [Mon, 20 Jul 2015 10:13:38 +0000 (10:13 +0000)]
do some property cleanup

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1691908 13f79535-47bb-0310-9956-ffa450edef68

9 years agoupdate transformation
André Malo [Sun, 19 Jul 2015 12:10:13 +0000 (12:10 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1691820 13f79535-47bb-0310-9956-ffa450edef68

9 years agofixup properties
André Malo [Sun, 19 Jul 2015 12:06:14 +0000 (12:06 +0000)]
fixup properties

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1691819 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sat, 18 Jul 2015 15:03:06 +0000 (15:03 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1691739 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML update.
Lucien Gentis [Sat, 18 Jul 2015 15:02:00 +0000 (15:02 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1691738 13f79535-47bb-0310-9956-ffa450edef68

9 years agoArrange the C++ declarations to make my compiler happy.
Jean-Frederic Clere [Fri, 17 Jul 2015 15:46:19 +0000 (15:46 +0000)]
Arrange the C++ declarations to make my compiler happy.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1691592 13f79535-47bb-0310-9956-ffa450edef68

9 years agofix for detecting direct mode on a TLS connections
Stefan Eissing [Fri, 17 Jul 2015 14:52:11 +0000 (14:52 +0000)]
fix for detecting direct mode on a TLS connections

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1691582 13f79535-47bb-0310-9956-ffa450edef68

9 years agofix for correct assert
Jim Jagielski [Thu, 16 Jul 2015 12:10:00 +0000 (12:10 +0000)]
fix for correct assert

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1691374 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sun, 12 Jul 2015 13:21:14 +0000 (13:21 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690456 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Sun, 12 Jul 2015 13:20:13 +0000 (13:20 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690455 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sat, 11 Jul 2015 15:55:05 +0000 (15:55 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690380 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Sat, 11 Jul 2015 15:54:00 +0000 (15:54 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690379 13f79535-47bb-0310-9956-ffa450edef68

9 years agorebuild
Christophe Jaillet [Sat, 11 Jul 2015 05:55:24 +0000 (05:55 +0000)]
rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690353 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAdd a link to perf-scaling.html
Christophe Jaillet [Sat, 11 Jul 2015 05:51:59 +0000 (05:51 +0000)]
Add a link to perf-scaling.html

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690352 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild
Christophe Jaillet [Sat, 11 Jul 2015 04:49:37 +0000 (04:49 +0000)]
Rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690344 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix doc as spotted by Matthew in online doc
Christophe Jaillet [Sat, 11 Jul 2015 04:39:42 +0000 (04:39 +0000)]
Fix doc as spotted by Matthew   in online doc

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690343 13f79535-47bb-0310-9956-ffa450edef68

9 years agoreworked mod_h2 donation checkin into build system, added documentation
Stefan Eissing [Fri, 10 Jul 2015 11:45:46 +0000 (11:45 +0000)]
reworked mod_h2 donation checkin into build system, added documentation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690248 13f79535-47bb-0310-9956-ffa450edef68

9 years agoupdate transformation
André Malo [Thu, 9 Jul 2015 20:59:23 +0000 (20:59 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690173 13f79535-47bb-0310-9956-ffa450edef68

9 years agos/\<\(\w\+\)\>\s\+\<\1\>/\1/g
Yann Ylavic [Thu, 9 Jul 2015 18:07:50 +0000 (18:07 +0000)]
s/\<\(\w\+\)\>\s\+\<\1\>/\1/g

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690137 13f79535-47bb-0310-9956-ffa450edef68

9 years agos/a a/a/g
Rich Bowen [Thu, 9 Jul 2015 16:07:25 +0000 (16:07 +0000)]
s/a a/a/g

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690122 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild html.
Rich Bowen [Thu, 9 Jul 2015 16:03:29 +0000 (16:03 +0000)]
Rebuild html.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690121 13f79535-47bb-0310-9956-ffa450edef68

9 years agos/the the/the/g
Rich Bowen [Thu, 9 Jul 2015 16:01:56 +0000 (16:01 +0000)]
s/the the/the/g

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690120 13f79535-47bb-0310-9956-ffa450edef68

9 years agoremove old static ldc->reason
Eric Covener [Tue, 7 Jul 2015 15:21:20 +0000 (15:21 +0000)]
remove old static ldc->reason

--This line, and those bdelow, will be ignored--

M    util_ldap.c

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1689698 13f79535-47bb-0310-9956-ffa450edef68

9 years agostuff unexpected LDAP errors into ldc->reason, not just in trace messages.
Eric Covener [Tue, 7 Jul 2015 14:43:31 +0000 (14:43 +0000)]
stuff unexpected LDAP errors into ldc->reason, not just in trace messages.
fix some enormously long lines introduced recently.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1689694 13f79535-47bb-0310-9956-ffa450edef68

9 years agotest commit
Stefan Eissing [Tue, 7 Jul 2015 08:54:33 +0000 (08:54 +0000)]
test commit

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1689605 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix typo spotted in comment in online doc. [comment #1683)
Christophe Jaillet [Mon, 6 Jul 2015 17:47:50 +0000 (17:47 +0000)]
Fix typo spotted in comment in online doc. [comment #1683)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1689468 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_reqtimeout: follow up to r1621453.
Yann Ylavic [Mon, 6 Jul 2015 07:13:57 +0000 (07:13 +0000)]
mod_reqtimeout: follow up to r1621453.
Don't let pipelining checks and keep-alive times interfere
with the timeouts computed for subsequent requests.  PR 56729.

With pipelined requests, the log_transaction hook is called when the request
is destroyed, which may happen after a subsequent request is to be handled on
the same connection.
Move the initialization of the "header" state into pre_read_request() instead,
and get rid of the racy log_trasaction hook.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1689325 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAdd missing <code> around a parameter
Christophe Jaillet [Mon, 6 Jul 2015 06:30:57 +0000 (06:30 +0000)]
Add missing <code> around a parameter

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1689317 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sat, 4 Jul 2015 14:21:37 +0000 (14:21 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1689164 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML update.
Lucien Gentis [Sat, 4 Jul 2015 14:20:40 +0000 (14:20 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1689163 13f79535-47bb-0310-9956-ffa450edef68

9 years agoGenerated doc changes
Mike Rumph [Wed, 1 Jul 2015 18:21:22 +0000 (18:21 +0000)]
Generated doc changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688700 13f79535-47bb-0310-9956-ffa450edef68

9 years agoGrammar, spelling, and other minor corrections
Mike Rumph [Wed, 1 Jul 2015 18:16:20 +0000 (18:16 +0000)]
Grammar, spelling, and other minor corrections

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688698 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_authz_dbd: Avoid a crash when lacking correct DB access permissions. PR 57868.
Yann Ylavic [Wed, 1 Jul 2015 14:37:00 +0000 (14:37 +0000)]
mod_authz_dbd: Avoid a crash when lacking correct DB access permissions. PR 57868.

Submitted by: Jose Kahan <jose w3.org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688660 13f79535-47bb-0310-9956-ffa450edef68

9 years agohttp: follow up to r1685345.
Yann Ylavic [Wed, 1 Jul 2015 00:19:59 +0000 (00:19 +0000)]
http: follow up to r1685345.
Be lenient up to 10 (room for 32bit decimals) Bad White Spaces (BWS)
between chunk-size and chunk-ext/CRLF.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688538 13f79535-47bb-0310-9956-ffa450edef68

9 years agohttp: follow up to r1685345, also needed in 2.4.x/2.2.x by r1686271/r1687339.
Yann Ylavic [Wed, 1 Jul 2015 00:08:44 +0000 (00:08 +0000)]
http: follow up to r1685345, also needed in 2.4.x/2.2.x by r1686271/r1687339.
Handle reentrance of state BODY_CHUNK_CR to avoid AH02901 when we eat BWS
from multiple reads.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688536 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFold in latest changes.
Jim Jagielski [Tue, 30 Jun 2015 15:52:41 +0000 (15:52 +0000)]
Fold in latest changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688475 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFold in git archive master of mod_h2 (latest commit 11905f474e)
Jim Jagielski [Tue, 30 Jun 2015 15:26:16 +0000 (15:26 +0000)]
Fold in git archive master of mod_h2 (latest commit 11905f474e)
from https://github.com/icing/mod_h2 as per software grant.

Since this is a git archive of master (for tracking and IP
provenance history), it includes files that will likely
be removed/renamed/etc...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688474 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_remoteip: Use r->useragent_addr as the root trusted address for verifying.
Jan Kaluža [Tue, 30 Jun 2015 08:40:17 +0000 (08:40 +0000)]
mod_remoteip: Use r->useragent_addr as the root trusted address for verifying.

This fixes issue resulting in setting of bad useragent_ip when internal
redirection has been generated as response to the request (typically as
result of "ErrorDocument 40x").

In this case, the original request has been handled by mod_remoteip and its
useragent_ip has been changed properly, but when internal redirection
to ErrorDocument has been generated later, the mod_remoteip's handler has been
executed again with *the same* c->client_addr as in the original request. If
c->client_addr IP is trusted, this results in bad useragent_ip being set.

When using r->useragent_addr as the root trusted address instead of
c->client_addr, the internal redirection uses the first non-trusted
IP in this particular case, so it won't change the r->useragent_ip during
the internal redirection to ErrorDocument.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688399 13f79535-47bb-0310-9956-ffa450edef68

9 years agoNet -8 LoC, my usual specialty.
William A. Rowe Jr [Tue, 30 Jun 2015 02:40:09 +0000 (02:40 +0000)]
Net -8 LoC, my usual specialty.

This didn't need to be reinvented; please use established helpers.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688343 13f79535-47bb-0310-9956-ffa450edef68

9 years agoIncrease legibility of the max_line_length behavior, and adjust for
William A. Rowe Jr [Tue, 30 Jun 2015 01:31:13 +0000 (01:31 +0000)]
Increase legibility of the max_line_length behavior, and adjust for
the requirement that all members are initialized explicitly due to
the previous patch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688341 13f79535-47bb-0310-9956-ffa450edef68

9 years agoOptimize in all cases that the members are all explicitly initialized.
William A. Rowe Jr [Tue, 30 Jun 2015 01:29:43 +0000 (01:29 +0000)]
Optimize in all cases that the members are all explicitly initialized.

Useful for 2.2 and 2.4, but trunk will require the subsequent patch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688340 13f79535-47bb-0310-9956-ffa450edef68

9 years agoVery difficult to read, and therefore was wrong.
William A. Rowe Jr [Tue, 30 Jun 2015 01:27:42 +0000 (01:27 +0000)]
Very difficult to read, and therefore was wrong.

Assert that the SubstituteInheritBefore option was explicitly toggled,
and do not default in 2.x to this legacy behavior.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688339 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_substitute: follow up to r1687680.
Yann Ylavic [Mon, 29 Jun 2015 23:44:28 +0000 (23:44 +0000)]
mod_substitute: follow up to r1687680.
Fix dir config merger 'over'-write, thanks Bill (again).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688331 13f79535-47bb-0310-9956-ffa450edef68

9 years agohttp: follow up to r1484852.
Yann Ylavic [Mon, 29 Jun 2015 17:52:00 +0000 (17:52 +0000)]
http: follow up to r1484852.
Don't check LimitRequestBody when there is no (more) body.

This fixes an uninitialized use of 'totalread' in ap_http_filter() when either
the remaining or requested number of body bytes is zero, leading to an invalid
computation of bytes received.

Reported by: Michael Kaufmann <mail michael-kaufmann.ch>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688274 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sun, 28 Jun 2015 13:41:05 +0000 (13:41 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688010 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML update.
Lucien Gentis [Sun, 28 Jun 2015 13:36:16 +0000 (13:36 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688009 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sun, 28 Jun 2015 13:33:28 +0000 (13:33 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688007 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML update.
Lucien Gentis [Sun, 28 Jun 2015 13:32:47 +0000 (13:32 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688006 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sun, 28 Jun 2015 13:28:16 +0000 (13:28 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688004 13f79535-47bb-0310-9956-ffa450edef68

9 years agoTypo and XML update.
Lucien Gentis [Sun, 28 Jun 2015 13:26:26 +0000 (13:26 +0000)]
Typo and XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688003 13f79535-47bb-0310-9956-ffa450edef68

9 years ago*) mod_ldap: In some case, LDAP_NO_SUCH_ATTRIBUTE could be returned instead of
Eric Covener [Sun, 28 Jun 2015 00:56:09 +0000 (00:56 +0000)]
*) mod_ldap: In some case, LDAP_NO_SUCH_ATTRIBUTE could be returned instead of
   an error during a compare operation. [Eric Covener]

+ accompanying trace.

Note: the if/else now matches (don't replace unknown compare errors with
LDAP_NO_SUCH_ATTRIBUTE) the logic just above when pulling comparisons
out of the cache.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1687980 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_proxy: follow up to r1678768.
Yann Ylavic [Fri, 26 Jun 2015 15:10:29 +0000 (15:10 +0000)]
mod_proxy: follow up to r1678768.
The resource is not dereferenceable if connection_destructor()
is called from reslist_destroy().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1687783 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_substitute: follow up to r1687539.
Yann Ylavic [Fri, 26 Jun 2015 07:08:16 +0000 (07:08 +0000)]
mod_substitute: follow up to r1687539.
Use tristate single inherit_before variable instead of two, according to
wrowe's advices.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1687680 13f79535-47bb-0310-9956-ffa450edef68

9 years agobe less weird in comment
Eric Covener [Thu, 25 Jun 2015 20:45:08 +0000 (20:45 +0000)]
be less weird in comment

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1687643 13f79535-47bb-0310-9956-ffa450edef68

9 years agoelaborate on a misleading comment
Eric Covener [Thu, 25 Jun 2015 20:44:42 +0000 (20:44 +0000)]
elaborate on a misleading comment

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1687642 13f79535-47bb-0310-9956-ffa450edef68

9 years agoDon't count your chickens before they are hatched.
Yann Ylavic [Thu, 25 Jun 2015 16:01:44 +0000 (16:01 +0000)]
Don't count your chickens before they are hatched.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1687567 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_substitute: follow up r1684900.
Yann Ylavic [Thu, 25 Jun 2015 14:50:55 +0000 (14:50 +0000)]
mod_substitute: follow up r1684900.
Introduce the SubstituteInheritBefore directive to configure the merge order.
This allows to preserve 2.4 and earlier behaviour.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1687539 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_session_dbd: follow up to r1687021.
Yann Ylavic [Tue, 23 Jun 2015 15:38:13 +0000 (15:38 +0000)]
mod_session_dbd: follow up to r1687021.
Move the new pool argument of dbd_load() first as the other functions in the
module (no functional change).
Suggested by: mrumph

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1687087 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_session_dbd: follow up to r1686122.
Yann Ylavic [Tue, 23 Jun 2015 10:54:15 +0000 (10:54 +0000)]
mod_session_dbd: follow up to r1686122.
DBD entries should also have request lifetime.
Proposed by: Jacob Champion <jacob.champion ni.com>
Reviewed by: ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1687021 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_alias: follow up to r1686853.
Yann Ylavic [Mon, 22 Jun 2015 13:02:49 +0000 (13:02 +0000)]
mod_alias: follow up to r1686853.
Factorize code (no functional change).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686856 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_alias: follow up to r1653941.
Yann Ylavic [Mon, 22 Jun 2015 12:48:02 +0000 (12:48 +0000)]
mod_alias: follow up to r1653941.
Limit Redirect expressions to directory (Location) context
and redirect statuses (implicit or explicit).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686853 13f79535-47bb-0310-9956-ffa450edef68

9 years agofix eol-style
André Malo [Mon, 22 Jun 2015 09:24:37 +0000 (09:24 +0000)]
fix eol-style

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686819 13f79535-47bb-0310-9956-ffa450edef68

9 years agoProblem adding mod_log_forensic.html.fr
Lucien Gentis [Sun, 21 Jun 2015 14:21:56 +0000 (14:21 +0000)]
Problem adding mod_log_forensic.html.fr

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686726 13f79535-47bb-0310-9956-ffa450edef68

9 years agoProblem with mod_log_forensic.xml.fr
Lucien Gentis [Sun, 21 Jun 2015 13:57:51 +0000 (13:57 +0000)]
Problem with mod_log_forensic.xml.fr

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686723 13f79535-47bb-0310-9956-ffa450edef68

9 years agoProblem with mod_log_forensic.xml.fr.
Lucien Gentis [Sun, 21 Jun 2015 13:55:33 +0000 (13:55 +0000)]
Problem with mod_log_forensic.xml.fr.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686722 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sun, 21 Jun 2015 13:49:41 +0000 (13:49 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686721 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML update and conflict resolution with mod_log_forensic.html.fr
Lucien Gentis [Sun, 21 Jun 2015 13:48:14 +0000 (13:48 +0000)]
XML update and conflict resolution with mod_log_forensic.html.fr

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686720 13f79535-47bb-0310-9956-ffa450edef68

9 years agoupdate
André Malo [Sun, 21 Jun 2015 13:13:05 +0000 (13:13 +0000)]
update

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686714 13f79535-47bb-0310-9956-ffa450edef68

9 years agofix keywords
André Malo [Sun, 21 Jun 2015 13:00:14 +0000 (13:00 +0000)]
fix keywords

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686712 13f79535-47bb-0310-9956-ffa450edef68

9 years agoset eol-style
André Malo [Sun, 21 Jun 2015 12:57:04 +0000 (12:57 +0000)]
set eol-style

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686710 13f79535-47bb-0310-9956-ffa450edef68

9 years agoupdate transformation
André Malo [Sun, 21 Jun 2015 12:55:44 +0000 (12:55 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686709 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRestore upgradind.xml after naming error.
Lucien Gentis [Sun, 21 Jun 2015 12:54:23 +0000 (12:54 +0000)]
Restore upgradind.xml after naming error.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686708 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sun, 21 Jun 2015 12:46:03 +0000 (12:46 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686707 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML update.
Lucien Gentis [Sun, 21 Jun 2015 12:43:59 +0000 (12:43 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686706 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_session_dbd: Request Notes should have request lifetime.
Nick Kew [Wed, 17 Jun 2015 23:09:36 +0000 (23:09 +0000)]
mod_session_dbd: Request Notes should have request lifetime.
Patch by Jacob Champion at ni.com

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686122 13f79535-47bb-0310-9956-ffa450edef68

9 years ago*) mod_ext_filter, mod_charset_lite: Avoid inadvertent filtering of protocol
Eric Covener [Wed, 17 Jun 2015 18:28:58 +0000 (18:28 +0000)]
*) mod_ext_filter, mod_charset_lite: Avoid inadvertent filtering of protocol
   data during read of chunked request bodies. PR 58049.
   [Edward Lu <Chaosed0 gmail.com>]

Submitted By: Edward Lu <Chaosed0 gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686085 13f79535-47bb-0310-9956-ffa450edef68

9 years agoCHANGES: remove backported entries.
Yann Ylavic [Tue, 16 Jun 2015 22:19:34 +0000 (22:19 +0000)]
CHANGES: remove backported entries.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685917 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl: Remove deprecated SSLCertificateChainFile warning.
Yann Ylavic [Tue, 16 Jun 2015 11:58:47 +0000 (11:58 +0000)]
mod_ssl: Remove deprecated SSLCertificateChainFile warning.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685779 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl: revert r1685052, r1685078 and r1685097.
Yann Ylavic [Tue, 16 Jun 2015 11:53:13 +0000 (11:53 +0000)]
mod_ssl: revert r1685052, r1685078 and r1685097.
Will remove the deprecation message in a follow up commit.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685777 13f79535-47bb-0310-9956-ffa450edef68