]> granicus.if.org Git - apache/log
apache
7 years agocheck: search for MPM modules in the correct directory
Jacob Champion [Mon, 9 Jan 2017 19:01:58 +0000 (19:01 +0000)]
check: search for MPM modules in the correct directory

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

7 years agoKeep this branch alive; block r1777709 after reintegrate
Jacob Champion [Fri, 6 Jan 2017 20:15:23 +0000 (20:15 +0000)]
Keep this branch alive; block r1777709 after reintegrate

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

7 years agoReintegrate the --with-test-suite feature with trunk
Jacob Champion [Fri, 6 Jan 2017 20:01:27 +0000 (20:01 +0000)]
Reintegrate the --with-test-suite feature with trunk

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

7 years agosync merge with trunk
Jacob Champion [Fri, 6 Jan 2017 19:55:46 +0000 (19:55 +0000)]
sync merge with trunk

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

7 years ago--with-test-suite: error instead of warning if Makefile.PL doesn't exist
Jacob Champion [Fri, 6 Jan 2017 19:28:20 +0000 (19:28 +0000)]
--with-test-suite: error instead of warning if Makefile.PL doesn't exist

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

7 years agocheck: enable all (non-MPM) modules when testing
Jacob Champion [Fri, 6 Jan 2017 18:21:34 +0000 (18:21 +0000)]
check: enable all (non-MPM) modules when testing

We want to test everything the user builds, regardless of whether it's
enabled when first installed.

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

7 years agohttp: follow up to r1777460.
Yann Ylavic [Fri, 6 Jan 2017 18:04:31 +0000 (18:04 +0000)]
http: follow up to r1777460.
We MUST unfold outgoing HTTP headers in any case, "message/http" is for
inner content.

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

7 years agoEnable zero-install testing
Jacob Champion [Fri, 6 Jan 2017 17:45:25 +0000 (17:45 +0000)]
Enable zero-install testing

By pointing a local apxs script and corresponding config file into the
build tree, we can trick Apache::Test into testing a server that hasn't
actually been installed.

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

7 years agoRemove definition of ASCII_CRLF which is the same as CRLF_ASCII.
Christophe Jaillet [Fri, 6 Jan 2017 14:57:33 +0000 (14:57 +0000)]
Remove definition of ASCII_CRLF which is the same as CRLF_ASCII.
Remove definition of ASCII_ZERO which is the same as ZERO_ASCII.

Use ZERO_ASCII and CRLF_ASCII in chunk_filter

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

7 years agoMove definition of ASCII_ZERO to httpd.h and rename it ZERO_ASCII for consistancy...
Christophe Jaillet [Fri, 6 Jan 2017 13:58:03 +0000 (13:58 +0000)]
Move definition of ASCII_ZERO to httpd.h and rename it ZERO_ASCII for consistancy reason.
Remove definition of ASCII_CRLF which is the same as CRLF_ASCII.

Use ZERO_ASCII and CRLF_ASCII in mod_proxy_http

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

7 years agoFix some tiny style issues (missing space)
Christophe Jaillet [Fri, 6 Jan 2017 11:58:23 +0000 (11:58 +0000)]
Fix some tiny style issues (missing space)

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

7 years ago'repl' is already allocated in the request pool by 'construct_host_header()' the...
Christophe Jaillet [Fri, 6 Jan 2017 11:52:15 +0000 (11:52 +0000)]
'repl' is already allocated in the request pool by 'construct_host_header()' the line just before.
So this is safe to use the 'apr_table_setn' variant in order to save a few bytes of memory.

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

7 years agoRemove a useless break + tiny style fix (missing space)
Christophe Jaillet [Fri, 6 Jan 2017 09:59:32 +0000 (09:59 +0000)]
Remove a useless break + tiny style fix (missing space)

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

7 years agoUse apr_pstrmemdup instead of apr_pstrndup when applicable
Christophe Jaillet [Fri, 6 Jan 2017 09:56:53 +0000 (09:56 +0000)]
Use apr_pstrmemdup instead of apr_pstrndup when applicable

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

7 years agoupdate
Christophe Jaillet [Fri, 6 Jan 2017 07:19:20 +0000 (07:19 +0000)]
update

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

7 years agoproxy: don't force global module selection (most) and scope (shared/static),
Yann Ylavic [Thu, 5 Jan 2017 12:50:24 +0000 (12:50 +0000)]
proxy: don't force global module selection (most) and scope (shared/static),
since it breaks --enable-modules=none + exhaustive --enable-foo(s).

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

7 years agohttp: allow folding in check_headers(), still compliant with RFC 7230 (3.2.4).
Yann Ylavic [Thu, 5 Jan 2017 12:31:48 +0000 (12:31 +0000)]
http: allow folding in check_headers(), still compliant with RFC 7230 (3.2.4).

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

7 years agoSuggestion for STATUS
Daniel Ruggeri [Thu, 5 Jan 2017 00:25:31 +0000 (00:25 +0000)]
Suggestion for STATUS

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

7 years agoAdd a --with-test-suite option for "in-tree" testing
Jacob Champion [Wed, 4 Jan 2017 23:14:27 +0000 (23:14 +0000)]
Add a --with-test-suite option for "in-tree" testing

Step one. It's not actually "in-tree" yet, since it requires running
`make install` first, but at least it gives us a `make check`.

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

7 years agoold IBM EBCDIC fix that never got shared.
Eric Covener [Wed, 4 Jan 2017 18:04:26 +0000 (18:04 +0000)]
old IBM EBCDIC fix that never got shared.

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

7 years agoDocumentation rebuild
Luca Toscano [Wed, 4 Jan 2017 14:52:41 +0000 (14:52 +0000)]
Documentation rebuild

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

7 years agoRemoved unclear sentence in mod-http2 doc.
Luca Toscano [Wed, 4 Jan 2017 14:51:21 +0000 (14:51 +0000)]
Removed unclear sentence in mod-http2 doc.

Lajos Veres asked in docs@ to review the removed
sentence since it was unclear. Instead of reworking it,
I preferred to remove it since the Context is already
specified in the related section of the Directive.

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

7 years ago2 more for the wish list
Jim Jagielski [Wed, 4 Jan 2017 13:08:03 +0000 (13:08 +0000)]
2 more for the wish list

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

7 years agoAn experimental branch for integrating Apache::Test with httpd
Jacob Champion [Wed, 4 Jan 2017 00:29:44 +0000 (00:29 +0000)]
An experimental branch for integrating Apache::Test with httpd

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

7 years agoSome more ideas
Jacob Champion [Wed, 4 Jan 2017 00:18:15 +0000 (00:18 +0000)]
Some more ideas

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

7 years agoMore ideas
William A. Rowe Jr [Tue, 3 Jan 2017 20:32:07 +0000 (20:32 +0000)]
More ideas

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

7 years agopunctuation
Rich Bowen [Tue, 3 Jan 2017 16:59:35 +0000 (16:59 +0000)]
punctuation

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

7 years agoOn the trunk:
Stefan Eissing [Tue, 3 Jan 2017 16:42:45 +0000 (16:42 +0000)]
On the trunk:

  *) mod_http2: fix for possible page fault when stream is resumed during
     session shutdown. [sidney-j-r-m (github)]

  *) mod_http2: fix for h2 session ignoring new responses while already
     open streams continue to have data available. [Stefan Eissing]

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

7 years agorebuild
Rich Bowen [Tue, 3 Jan 2017 15:31:44 +0000 (15:31 +0000)]
rebuild

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

7 years agoAdd cross references
Rich Bowen [Tue, 3 Jan 2017 15:27:44 +0000 (15:27 +0000)]
Add cross references

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

7 years agoreminder
Eric Covener [Tue, 3 Jan 2017 13:24:06 +0000 (13:24 +0000)]
reminder

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

7 years agoFix a typo spotted in an old comment
Christophe Jaillet [Tue, 3 Jan 2017 04:30:14 +0000 (04:30 +0000)]
Fix a typo spotted in an old comment

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

7 years agoXforms.
Rainer Jung [Mon, 2 Jan 2017 17:57:35 +0000 (17:57 +0000)]
Xforms.

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

7 years agoRemove a superfluous \b after 'Proxy'
Christophe Jaillet [Mon, 2 Jan 2017 17:55:19 +0000 (17:55 +0000)]
Remove a superfluous \b after 'Proxy'

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

7 years agoHappy New Year 2017
Rainer Jung [Mon, 2 Jan 2017 16:06:53 +0000 (16:06 +0000)]
Happy New Year 2017

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

7 years agoReinsert attribution to mod_remoteip.c for PROXY protocol
Daniel Ruggeri [Sat, 31 Dec 2016 13:40:23 +0000 (13:40 +0000)]
Reinsert attribution to mod_remoteip.c for PROXY protocol

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

7 years agoOn the trunk:
Stefan Eissing [Sat, 31 Dec 2016 13:26:05 +0000 (13:26 +0000)]
On the trunk:

mod_http2: update after backport to 2.4.x

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

7 years agoOn the trunk:
Stefan Eissing [Sat, 31 Dec 2016 13:11:59 +0000 (13:11 +0000)]
On the trunk:

mod_http2: adding support for MergeTrailers directive.

mod_http2: limiting DATA frame sizes by TLS record sizes in use on the
     connection. Flushing outgoing frames earlier.

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

7 years agoOn the trunk:
Stefan Eissing [Sat, 31 Dec 2016 13:11:28 +0000 (13:11 +0000)]
On the trunk:

* mod_remoteip: added cast to fix clang compiler error

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

7 years agoDocumentation rebuild
Luca Toscano [Sat, 31 Dec 2016 09:12:30 +0000 (09:12 +0000)]
Documentation rebuild

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

7 years agoUpdate httpd release version for LegacyPrefixDocRoot
Luca Toscano [Sat, 31 Dec 2016 09:11:06 +0000 (09:11 +0000)]
Update httpd release version for LegacyPrefixDocRoot

This is not ideal since the feature has not been backported yet,
but it a compromise to avoid confusion for users.

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

7 years agoCore doc page rebuild
Luca Toscano [Sat, 31 Dec 2016 09:08:51 +0000 (09:08 +0000)]
Core doc page rebuild

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

7 years agoRemoved mod_proxy_protocol references after r1776624
Luca Toscano [Sat, 31 Dec 2016 09:06:32 +0000 (09:06 +0000)]
Removed mod_proxy_protocol references after r1776624

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

7 years agoRemoved mod_proxy_protocol.xml after r1776624
Luca Toscano [Sat, 31 Dec 2016 09:04:15 +0000 (09:04 +0000)]
Removed mod_proxy_protocol.xml after r1776624

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

7 years agoFixed some doc typos detected by a user.
Luca Toscano [Sat, 31 Dec 2016 09:01:22 +0000 (09:01 +0000)]
Fixed some doc typos detected by a user.

Sébastien Santoro (dereckson AT espace-win.org)
sent a bug report about one typo in core.xml
and I executed the aspell tool on the whole file.

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

7 years agoMove attribution for mod_remoteip RemoteIPProxyProtocol from file to CHANGES
Daniel Ruggeri [Sat, 31 Dec 2016 02:27:29 +0000 (02:27 +0000)]
Move attribution for mod_remoteip RemoteIPProxyProtocol from file to CHANGES

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

7 years agoDocumentation rebuild for mod_remoteip
Luca Toscano [Fri, 30 Dec 2016 19:20:32 +0000 (19:20 +0000)]
Documentation rebuild for mod_remoteip

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

7 years agoShorten RemoteIPProxyProtocolEnable to RemoteIPProxyProtocol and correct references...
Daniel Ruggeri [Fri, 30 Dec 2016 19:06:55 +0000 (19:06 +0000)]
Shorten RemoteIPProxyProtocolEnable to RemoteIPProxyProtocol and correct references in docs

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

7 years agoDocumentation rebuild for mod_remoteip
Luca Toscano [Fri, 30 Dec 2016 18:20:04 +0000 (18:20 +0000)]
Documentation rebuild for mod_remoteip

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

7 years agoReviewed, and built the HTML.
Luis Gil [Fri, 30 Dec 2016 16:05:40 +0000 (16:05 +0000)]
Reviewed, and built the HTML.

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

7 years agoFix typo in mod_remoteip's doc
Luca Toscano [Fri, 30 Dec 2016 14:40:42 +0000 (14:40 +0000)]
Fix typo in mod_remoteip's doc

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

7 years agoMerge new PROXY protocol code into mod_remoteip
Daniel Ruggeri [Fri, 30 Dec 2016 14:20:48 +0000 (14:20 +0000)]
Merge new PROXY protocol code into mod_remoteip

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

7 years agoReviewed, and built the HTML.
Luis Gil [Fri, 30 Dec 2016 14:10:10 +0000 (14:10 +0000)]
Reviewed, and built the HTML.

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

7 years agogit-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776571 13f79535-47bb...
Luis Gil [Fri, 30 Dec 2016 14:09:21 +0000 (14:09 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776571 13f79535-47bb-0310-9956-ffa450edef68

7 years agoReviewd the diffs from last version and updated
Luis Gil [Fri, 30 Dec 2016 14:09:05 +0000 (14:09 +0000)]
Reviewd the diffs from last version and updated

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

7 years agoRebuilt the html file
Luis Gil [Fri, 30 Dec 2016 13:35:46 +0000 (13:35 +0000)]
Rebuilt the html file

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

7 years agoPR60009: RewriteRule local prefix checking update
Eric Covener [Thu, 29 Dec 2016 18:39:24 +0000 (18:39 +0000)]
PR60009: RewriteRule local prefix checking update

  *) mod_rewrite: When a substitution is a fully qualified URL, and the
     scheme/host/port matches the current virtual host, stop interpreting the
     path component as a local path just because the first component of the
     path exists in the filesystem.  Adds RewriteOption "LegacyPrefixDocRoot"
     to revert to previous behavior. PR60009.

Submitted By: Hank Ibell <hwibell gmail.com>

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

7 years agoPR59938: add %{REMOTE_PORT} to the expression parser
Eric Covener [Thu, 29 Dec 2016 18:31:13 +0000 (18:31 +0000)]
PR59938: add %{REMOTE_PORT} to the expression parser

Submitted By: Hank Ibell <hwibell gmail.com>

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

7 years agomod_remoteip: Set useragent port to zero PR59931
Eric Covener [Thu, 29 Dec 2016 18:27:12 +0000 (18:27 +0000)]
mod_remoteip: Set useragent port to zero PR59931

When overriding the useragent address from X-Forwarded-For,
zero out what had been initialized as the connection-level port.

Submitted By: Hank Ibell <hwibell gmail.com>

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

7 years agolet wstunnel run first
Eric Covener [Wed, 28 Dec 2016 14:54:37 +0000 (14:54 +0000)]
let wstunnel run first

Since wstunnel can step aside based on the Upgrade: header.

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

7 years agoimprove a debug message
Eric Covener [Wed, 28 Dec 2016 14:40:54 +0000 (14:40 +0000)]
improve a debug message

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

7 years agoxforms
Christophe Jaillet [Tue, 27 Dec 2016 13:16:25 +0000 (13:16 +0000)]
xforms

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

7 years agoFix translation.
Christophe Jaillet [Tue, 27 Dec 2016 13:13:49 +0000 (13:13 +0000)]
Fix translation.

Because of the missing upper case, "La documentation de cette directive n'a pas encore t traduite. Veuillez vous reporter la version en langue anglaise." is displayed.

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

7 years agoxforms
Christophe Jaillet [Tue, 27 Dec 2016 08:41:40 +0000 (08:41 +0000)]
xforms

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

7 years agoFix old comment from Martijn
Christophe Jaillet [Tue, 27 Dec 2016 08:38:43 +0000 (08:38 +0000)]
Fix old comment from Martijn

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

7 years agorevert back... no conflict w/ name
Jim Jagielski [Mon, 26 Dec 2016 21:42:26 +0000 (21:42 +0000)]
revert back... no conflict w/ name

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

7 years agoand xforms
Jim Jagielski [Mon, 26 Dec 2016 21:35:36 +0000 (21:35 +0000)]
and xforms

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

7 years agorestore
Jim Jagielski [Mon, 26 Dec 2016 21:35:08 +0000 (21:35 +0000)]
restore

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

7 years agoxfoms
Jim Jagielski [Mon, 26 Dec 2016 21:34:12 +0000 (21:34 +0000)]
xfoms

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

7 years agofor the time being, rename as ProxyProtocolFilter to avoid
Jim Jagielski [Mon, 26 Dec 2016 20:03:29 +0000 (20:03 +0000)]
for the time being, rename as ProxyProtocolFilter to avoid
mod_ssl conflict

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

7 years agoDonation of mod_proxy_protocol from https://github.com/roadrunner2/mod-proxy-protocol
Jim Jagielski [Mon, 26 Dec 2016 19:59:33 +0000 (19:59 +0000)]
Donation of mod_proxy_protocol from https://github.com/roadrunner2/mod-proxy-protocol
as per https://github.com/roadrunner2/mod-proxy-protocol/issues/1#issuecomment-269064906

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

7 years agoadding my cents
Stefan Eissing [Sun, 25 Dec 2016 16:19:47 +0000 (16:19 +0000)]
adding my cents

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

7 years agoUnlock mutex in error path.
Christophe Jaillet [Sun, 25 Dec 2016 11:11:30 +0000 (11:11 +0000)]
Unlock mutex in error path.

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

7 years agoStuff I've been playing with.
Jim Jagielski [Sat, 24 Dec 2016 15:38:42 +0000 (15:38 +0000)]
Stuff I've been playing with.

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

7 years agosome extemporaenous things for dot-next
Eric Covener [Sat, 24 Dec 2016 13:57:45 +0000 (13:57 +0000)]
some extemporaenous things for dot-next

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

7 years agoOn the trunk:
Stefan Eissing [Sat, 24 Dec 2016 10:06:04 +0000 (10:06 +0000)]
On the trunk:

mod_htt2: version bump after backport

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

7 years agoOn the trunk:
Stefan Eissing [Sat, 24 Dec 2016 09:57:52 +0000 (09:57 +0000)]
On the trunk:

mod_http2: removing debug logs leftover in previous commit

* modules/http2/h2_bucket_beam.c
  removed log warnings from debug session

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

7 years agoNote some 3.0 potential stuff
William A. Rowe Jr [Fri, 23 Dec 2016 20:07:14 +0000 (20:07 +0000)]
Note some 3.0 potential stuff

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

7 years agoReturn HTTP 504 rather than 503 when a proxy timeout is hit.
Luca Toscano [Fri, 23 Dec 2016 17:34:11 +0000 (17:34 +0000)]
Return HTTP 504 rather than 503 when a proxy timeout is hit.

Part of the review for PR: 56188

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

7 years agoOn the trunk: update after backport
Stefan Eissing [Fri, 23 Dec 2016 12:47:27 +0000 (12:47 +0000)]
On the trunk: update after backport

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

7 years agoOn the trunk:
Stefan Eissing [Fri, 23 Dec 2016 12:42:35 +0000 (12:42 +0000)]
On the trunk:

Cleanup mod_http2 beamer registry on server reload. Fixes PR60510.

 * modules/http2/h2_bucket_beam.c
   register cleanup function on installation that NULLs the beamer
   registry on pool cleanup.

Patch by: Pavel Mateja <pavel@verotel.cz
          me

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

7 years agoOn the trunk:
Stefan Eissing [Fri, 23 Dec 2016 12:13:07 +0000 (12:13 +0000)]
On the trunk:

Updates after mod_http2 backport

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

7 years agoOn the trunk:
Stefan Eissing [Fri, 23 Dec 2016 11:34:32 +0000 (11:34 +0000)]
On the trunk:

Fix mod_h2/github issue #126: correct lifetime of data sent on temp pools

* modules/http2/h2_bucket_beam.c
  - ignore send pools that are sub-pools of the existing one
  - added h2_beam_send_from() to allow explicit registering of the
    correct pool for the sending

* modules/http2/h2_bucket_beam.h
  - add prototype for h2_beam_send_from()

* modules/http2/h2_mplx.c
  - adding logging of output beam state

* modules/http2/h2_stream.c
  - register stream pool for sending data on input beam

* modules/http2/h2_task.c
  - register task pool on output beam on creation
  - adding trace logging

* modules/http2/h2_proxy_session.c
  - fixing a type in a comment while we're at it

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

7 years agomod_proxy_{ajp,fcgi}: Fix a possible crash when reusing an established
Yann Ylavic [Thu, 22 Dec 2016 23:30:05 +0000 (23:30 +0000)]
mod_proxy_{ajp,fcgi}: Fix a possible crash when reusing an established
backend connection, happening with LogLevel trace2 or higher configured,
or at any log level with compilers not detected as C99 compliant (e.g.
MSVC on Windows).

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

7 years agopass along error buckets
Eric Covener [Thu, 22 Dec 2016 23:04:44 +0000 (23:04 +0000)]
pass along error buckets

In 2.4, they are generated by LimitRequestBody failures. trunk no
longer uses error buckets in this path, but someone else could.

PR60375

Submitted By: Eric Covener,Lubos Uhliarik <luhliari  redhat.com>
Committed By: covener

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

7 years agoremove initial isascii check entirely
Eric Covener [Thu, 22 Dec 2016 14:22:22 +0000 (14:22 +0000)]
remove initial isascii check entirely

We are already checking an even narrower set of characters
just below.

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

7 years agofix indent
Eric Covener [Wed, 21 Dec 2016 16:24:04 +0000 (16:24 +0000)]
fix indent

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

7 years agomuch backport
Eric Covener [Wed, 21 Dec 2016 16:23:52 +0000 (16:23 +0000)]
much backport

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

7 years agofix crash in util_fcgi.c
Eric Covener [Wed, 21 Dec 2016 16:19:26 +0000 (16:19 +0000)]
fix crash in util_fcgi.c

 *) mod_proxy_fcgi, mod_fcgid: Fix crashes in ap_fcgi_encoded_env_len() when
    modules add empty environment variables to the request. PR60275.
    [<alex2grad AT gmail.com>]

Submitted By: <alex2grad AT gmail.com>]
Committed By: covener

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

7 years agoFix strict Host: header checking on EBCDIC
Eric Covener [Tue, 20 Dec 2016 03:38:59 +0000 (03:38 +0000)]
Fix strict Host: header checking on EBCDIC

on zOS, isascii() really means 7 bit ascii, but our strings
are in ebcdic for 99.95% of the lifetime of the server.

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

7 years agoassign a logno
Eric Covener [Tue, 20 Dec 2016 01:32:44 +0000 (01:32 +0000)]
assign a logno

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

7 years agohttp_header_filter: on check_headers() failure, use AP_FILTER_ERROR and EOC
Yann Ylavic [Tue, 20 Dec 2016 00:58:52 +0000 (00:58 +0000)]
http_header_filter: on check_headers() failure, use AP_FILTER_ERROR and EOC
semantics to respectively warn the caller and cleanly terminate the connection
afterwards.

Suggested by: rpluem

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

7 years agoSilence compiler warning:
Rainer Jung [Mon, 19 Dec 2016 20:36:58 +0000 (20:36 +0000)]
Silence compiler warning:
"686: warning: 'ok' may be used uninitialized in
this function"
This is a false positive, because the value of "ok"
will only be used if stapling_get_cached_response()
sets "rsp" to non-NULL in which case it will always
have set "ok".

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

7 years agoRebuild.
Lucien Gentis [Sun, 18 Dec 2016 15:01:09 +0000 (15:01 +0000)]
Rebuild.

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

7 years agoXML update.
Lucien Gentis [Sun, 18 Dec 2016 15:00:08 +0000 (15:00 +0000)]
XML update.

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

7 years agoFollow up to r1768070, wire mod_socache_redis into windows build schemes
William A. Rowe Jr [Fri, 16 Dec 2016 19:58:03 +0000 (19:58 +0000)]
Follow up to r1768070, wire mod_socache_redis into windows build schemes

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

7 years agomod_socache_redis also uses mod_status hooks
William A. Rowe Jr [Fri, 16 Dec 2016 19:43:16 +0000 (19:43 +0000)]
mod_socache_redis also uses mod_status hooks

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

7 years agoupdate transformation
André Malo [Fri, 16 Dec 2016 15:20:08 +0000 (15:20 +0000)]
update transformation

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

7 years agosvn:eol-style = native
André Malo [Fri, 16 Dec 2016 15:13:42 +0000 (15:13 +0000)]
svn:eol-style = native

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

7 years agorelated to http://svn.apache.org/viewvc?view=revision&revision=1774602
Jim Jagielski [Fri, 16 Dec 2016 15:04:21 +0000 (15:04 +0000)]
related to http://svn.apache.org/viewvc?view=revision&revision=1774602

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