]>
granicus.if.org Git - apache/log
Jim Jagielski [Fri, 24 Mar 2017 13:44:50 +0000 (13:44 +0000)]
Merge r1780095 from trunk:
Fix %{DOCUMENT_URI} in SSI w/ default parser
*) core: %{DOCUMENT_URI} used in nested SSI expressions should point to the
URI originally requsted by the user, not the nested documents URI. This
restores the behavior of this variable to match the "legacy" SSI parser.
PR60624.
Submitted By [Hank Ibell <hwibell gmail.com>]
Submitted by: covener
Reviewed by: covener, wrowe, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788448 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 24 Mar 2017 13:43:57 +0000 (13:43 +0000)]
Merge r1777354 from trunk:
old IBM EBCDIC fix that never got shared.
Submitted by: covener
Reviewed by: covener, wrowe, ylavic (by inspection)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788447 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 24 Mar 2017 13:43:12 +0000 (13:43 +0000)]
Merge r1780328, r1780329, r1781329, r1782164, r1782166, r1782193, r1778350, r1781329, r1782194, r1782323, r1782418, r1782419, r1782482, r1782532, r1788040 from trunk:
Adjust as needed
debugging
add ProxyFCGISetEnvIf
Logging update
Follow up to r1782164: fix typo (closing double-quote).
Remove trailing whitespace : no functional change
PR60576: php-fpm broken w/ per-dir rewrites
Attempt to dig out of well-meaning fixes for generic fcgi backends
that negatively affected some FPM configs.
Adds ProxyFCGIBackendType
add ProxyFCGISetEnvIf
trailing whitespace
Allow final admin-level fine-tuning
mod_proxy_fcgi: fix spelling in APLOG_INFO message
mod_proxy_fcgi: allow setting empty variables in ProxyFCGISetEnvIf
support unsetting vars
ProxyFCGISetEnvIf: reject invalid invocations, streamline unsets
Neither of the following makes sense:
- ProxyFCGISetEnvIf cond !VARIABLE value
- ProxyFCGISetEnvIf cond !
Error out in these cases. Also, don't execute the (unused) replacement
expression when unsetting.
drop the longhand version
Submitted by: jim, covener, jim, ylavic, jim, covener, covener, jim, jim, jchampion, jchampion, covener, jchampion, covener
Reviewed by: jim, covener, jchampion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788445 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 24 Mar 2017 13:35:40 +0000 (13:35 +0000)]
addressed and promoted
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788444 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 24 Mar 2017 13:31:03 +0000 (13:31 +0000)]
Merge r1781187, r1781190, r1781312 from trunk:
mod_ssl: work around leaks on (graceful) restart.
Tested with valgrind and --with-ssl shared/static.
mod_ssl: follow up to r1781187.
The ssl_util_thread_*() functions are not necessary with openssl-1.1+
mod_ssl: follow up to r1781187.
Address SSL_CTX leak in (merged) proxy_ctx.
Reviewed by: ylavic, jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788442 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 24 Mar 2017 13:09:03 +0000 (13:09 +0000)]
Vote, promote, note.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788435 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Mar 2017 14:50:56 +0000 (14:50 +0000)]
I'm wrong. Reviewing SecurityPolicy (2.0.13 + 1.2.4) at
https://www.openssl.org/docs/fips/ - using FIPS_mode_set(1) for revalidation
was actually expressly called out in section 3. While mod_ssl is 'unloaded'
(unconfigured) the process is not operating in a fips validated manner, but
once the configuration resets FIPS_mode_set(1) it resumes validated behavior.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788258 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Mar 2017 14:39:13 +0000 (14:39 +0000)]
Multiple comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788257 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 22 Mar 2017 06:57:28 +0000 (06:57 +0000)]
Fix some typo and add a few comments about missing compatibility information
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788060 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Mar 2017 00:01:22 +0000 (00:01 +0000)]
add rev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788041 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 21 Mar 2017 23:54:43 +0000 (23:54 +0000)]
propose a few small patches
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788039 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Tue, 21 Mar 2017 17:42:30 +0000 (17:42 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788015 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 21 Mar 2017 11:49:58 +0000 (11:49 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787942 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 21 Mar 2017 11:49:03 +0000 (11:49 +0000)]
note this
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787941 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 21 Mar 2017 11:33:11 +0000 (11:33 +0000)]
Merge r1787053 from trunk:
donating lua server-status script, enjoy!
Submitted by: humbedooh
Reviewed by: humbedooh
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787940 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 20 Mar 2017 12:16:52 +0000 (12:16 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787737 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 20 Mar 2017 12:15:38 +0000 (12:15 +0000)]
Merge r1787510 from trunk:
Add a warning in the docs about nested <If> blocks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787736 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Mar 2017 12:01:16 +0000 (12:01 +0000)]
Merge ^/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat:
Support OpenSSL 1.1.0
Proposed by: rjung
Reviewed by: wrowe, jorton, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787728 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Mar 2017 15:06:03 +0000 (15:06 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787567 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Mar 2017 15:05:27 +0000 (15:05 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787566 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 18 Mar 2017 03:25:37 +0000 (03:25 +0000)]
vote for openssl 1.1.0 patch
nowhere to go but forward. Passes regression on 1.1.0 and on earlier openssl.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787527 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 17 Mar 2017 08:37:00 +0000 (08:37 +0000)]
Formatting fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787303 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 17 Mar 2017 08:33:50 +0000 (08:33 +0000)]
Backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787302 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 17 Mar 2017 08:30:16 +0000 (08:30 +0000)]
Merge r1777923 from trunk:
avoid SO_REUSEPORT w/o ListenCoresBucketsRatio
Can lead to unintended/confusing sharing between
multiple servers started by the same ID.
Submitted by: covener
Reviewed by: jorton, covener, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787301 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 16 Mar 2017 21:15:20 +0000 (21:15 +0000)]
Still need to respond on-list, several concerns satisifed, some remain
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787249 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 16 Mar 2017 21:12:33 +0000 (21:12 +0000)]
One for immediate backport. No commits towards 0.6 brotoli since the 10th
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787248 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Mar 2017 22:30:23 +0000 (22:30 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787104 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Mar 2017 22:28:52 +0000 (22:28 +0000)]
meant to backport this
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787103 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 15 Mar 2017 09:25:58 +0000 (09:25 +0000)]
SO_REUSEPORT on by default is a regression.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787005 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 15 Mar 2017 08:06:44 +0000 (08:06 +0000)]
Tested with 1.1.0e and 1.0.2k.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1786993 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 14 Mar 2017 12:39:04 +0000 (12:39 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1786896 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 14 Mar 2017 12:36:55 +0000 (12:36 +0000)]
Merge r1786709 from trunk:
Add a note in the docs about evaluation of Location sections
The sections.html doc was missing, in my opinion, a direct
reference to the fact multiple Location blocks matching
a HTTP request will be evaluated in the order in which they
appear in the configuration files (same as Ifs, etc..).
Reworked a bit a single block of text to be a bit more readable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1786895 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 14 Mar 2017 02:24:54 +0000 (02:24 +0000)]
remove h2_bucket_eoc per r1779742
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1786831 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 13 Mar 2017 13:40:24 +0000 (13:40 +0000)]
Rebuild 2.4 howtos directory. Cross-link to Rewrite section
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1786687 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 13 Mar 2017 13:35:11 +0000 (13:35 +0000)]
Phrasing update from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1786684 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 12 Mar 2017 15:47:54 +0000 (15:47 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1786601 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 12 Mar 2017 15:47:14 +0000 (15:47 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1786600 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sun, 12 Mar 2017 14:20:29 +0000 (14:20 +0000)]
On the 2.4.x branch:
Merged /httpd/httpd/trunk:r1784571,
1785672 ,
1785683 ,
1786512 ,
1786575 -
1786576
mod_http2/mod_proxy_http2 backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1786582 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Fri, 10 Mar 2017 17:41:39 +0000 (17:41 +0000)]
Fix some spelling errors in comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1786397 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 8 Mar 2017 16:49:46 +0000 (16:49 +0000)]
convenience patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1786022 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 8 Mar 2017 16:31:59 +0000 (16:31 +0000)]
and final touch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1786010 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 8 Mar 2017 15:27:49 +0000 (15:27 +0000)]
add
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1785987 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 8 Mar 2017 12:31:31 +0000 (12:31 +0000)]
Propose for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1785953 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 8 Mar 2017 00:41:46 +0000 (00:41 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1785910 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 8 Mar 2017 00:41:04 +0000 (00:41 +0000)]
Merge r1785907 from trunk:
compat inline for no-proxy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1785909 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Tue, 7 Mar 2017 19:28:53 +0000 (19:28 +0000)]
Merge r1785752, r1785753 from trunk:
configure: remove mod_lua code duplication
Pull identical code into the CHECK_LUA_PATH macro.
configure: check for luaL_register in liblua
This is a temporary workaround for a missing compatibility API on
Debian-like systems (and anyone else who doesn't compile with
LUA_COMPAT_MODULE). Ignore any such libraries so we don't fail
confusingly later.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1785875 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Mar 2017 15:04:30 +0000 (15:04 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1785499 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Mar 2017 15:03:51 +0000 (15:03 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1785498 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 2 Mar 2017 12:27:23 +0000 (12:27 +0000)]
Merge r1785115 from trunk:
Look for specific versioned installs of Lua 5.3
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1785116 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 1 Mar 2017 16:54:35 +0000 (16:54 +0000)]
Backport of Lua exhancements from trunk, mostly to support 5.3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1784990 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 1 Mar 2017 11:43:10 +0000 (11:43 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1784915 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 1 Mar 2017 11:42:01 +0000 (11:42 +0000)]
Merge r1784912 from trunk:
Fix upgrading documentation for PR 60794
Require 127.0.0.1 is not a valid syntax,
fixing it with Require local
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1784914 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Feb 2017 14:16:15 +0000 (14:16 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1784569 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 25 Feb 2017 16:05:22 +0000 (16:05 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1784396 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 25 Feb 2017 16:04:47 +0000 (16:04 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1784395 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 25 Feb 2017 12:30:28 +0000 (12:30 +0000)]
On the 2.4.x branch:
Merged /httpd/httpd/trunk:r1784002,
1784366 ,
1784372
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1784374 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 24 Feb 2017 20:54:30 +0000 (20:54 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1784328 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 24 Feb 2017 20:52:51 +0000 (20:52 +0000)]
Link to the directives quickreference, which has the context listed
inline, as per user-submitted comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1784326 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 24 Feb 2017 13:05:36 +0000 (13:05 +0000)]
add't entry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1784276 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 24 Feb 2017 04:51:46 +0000 (04:51 +0000)]
Use single watchdog instance and threadpool
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1784229 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 23 Feb 2017 22:08:06 +0000 (22:08 +0000)]
backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1784213 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 22 Feb 2017 10:07:46 +0000 (10:07 +0000)]
On the 2.4.x branch:
merge of r1783683,
1783693 ,
1783756 ,
1783759 -
1783760 ,
1783762 ,
1783912 ,
1783996 from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1784001 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 21 Feb 2017 08:28:36 +0000 (08:28 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1783843 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 20 Feb 2017 08:46:34 +0000 (08:46 +0000)]
Merge r1783722, r1783723 from trunk:
Fix ProxyPassReverse schemes in mod_proxy_http2's doc (examples).
build doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1783726 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Sun, 19 Feb 2017 16:26:19 +0000 (16:26 +0000)]
propose fix for PR 46037.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1783668 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 17 Feb 2017 15:37:19 +0000 (15:37 +0000)]
Merge r1775858 from trunk:
Return HTTP 504 rather than 503 when a proxy timeout is hit.
Part of the review for PR: 56188
Submitted by: elukey
Reviewed by: elukey, jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1783414 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 17 Feb 2017 15:36:02 +0000 (15:36 +0000)]
Merge r1774541 from trunk:
event: close a race condition where we might re-enable listeners while they
are already or about to be closed.
Submitted by: ylavic
Reviewed by: ylavic, jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1783413 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 17 Feb 2017 15:35:24 +0000 (15:35 +0000)]
vote promote change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1783412 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 16 Feb 2017 19:34:07 +0000 (19:34 +0000)]
ACK very low hanging fruit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1783276 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 16 Feb 2017 19:09:37 +0000 (19:09 +0000)]
i
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1783274 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 16 Feb 2017 18:43:27 +0000 (18:43 +0000)]
Wondering why the obstruction?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1783271 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 16 Feb 2017 17:48:28 +0000 (17:48 +0000)]
Slow two still-wobbly horses
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1783256 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 15 Feb 2017 16:40:28 +0000 (16:40 +0000)]
Update... one show stopper was fixed, the other has 2 votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1783123 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 14 Feb 2017 15:53:50 +0000 (15:53 +0000)]
On the 2.4.x branch:
merge of r1780598,
1781304 ,
1782875 ,
1782944 ,
1782958 ,
1782975 from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782980 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 13 Feb 2017 11:41:08 +0000 (11:41 +0000)]
Stable enuff for backport prop.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782753 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 12 Feb 2017 15:50:44 +0000 (15:50 +0000)]
Update... back to showstopper until the work on trunk
stabilizes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782678 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Feb 2017 16:39:13 +0000 (16:39 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782619 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Feb 2017 16:38:27 +0000 (16:38 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782618 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 9 Feb 2017 14:00:27 +0000 (14:00 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782335 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 9 Feb 2017 13:56:11 +0000 (13:56 +0000)]
Merge r1781324, r1781328 from trunk:
revert r1780909 and r1773397 ProxyPass ! perdir
r1773397 had a regression and the whole thing is fishy
to shoehorn the current ProxyPass ! syntax into.
add no-proxy envvar for mod_proxy
replacement for ProxyPass /path ! when ProxyPass is in
location context.
Submitted by: covener
Reviewed by: covener, jim, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782332 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 9 Feb 2017 13:49:24 +0000 (13:49 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782331 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 9 Feb 2017 13:06:06 +0000 (13:06 +0000)]
New proposed patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782326 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 9 Feb 2017 12:37:12 +0000 (12:37 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782317 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 8 Feb 2017 15:28:56 +0000 (15:28 +0000)]
danger?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782209 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 8 Feb 2017 15:06:19 +0000 (15:06 +0000)]
Vote and patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782200 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 8 Feb 2017 14:51:27 +0000 (14:51 +0000)]
propose proxy regression fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782192 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 8 Feb 2017 14:46:07 +0000 (14:46 +0000)]
remove trailing whitespace: no functional change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782191 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 8 Feb 2017 14:20:03 +0000 (14:20 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782181 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 8 Feb 2017 14:19:45 +0000 (14:19 +0000)]
Merge r1782140 from trunk:
Add debugging info to the HttpProtocolOption directive doc
In bugzilla and users@ we keep receiving questions about
how to test the new restrictions imposed by HttpProtocolOptions.
Added some info about how to use openssl s_client properly
and the mod_dumpio's directives to debug (thanks to
Daniel Ferradal for this suggestion).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782180 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 8 Feb 2017 14:10:50 +0000 (14:10 +0000)]
Merged.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782176 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 8 Feb 2017 14:10:30 +0000 (14:10 +0000)]
Merge r1684636 from trunk:
* mod_auth_digest: Use anonymous shm by default, fall back on name-based.
Submitted by: jkaluza
Reviewed by: jorton, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782175 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 8 Feb 2017 12:53:42 +0000 (12:53 +0000)]
Votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1782157 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 5 Feb 2017 15:44:49 +0000 (15:44 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1781775 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 5 Feb 2017 15:43:51 +0000 (15:43 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1781774 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 5 Feb 2017 15:41:41 +0000 (15:41 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1781773 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 5 Feb 2017 15:40:09 +0000 (15:40 +0000)]
XML update - UTF-8 conversion.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1781772 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 5 Feb 2017 08:12:01 +0000 (08:12 +0000)]
Add a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1781722 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 4 Feb 2017 20:29:17 +0000 (20:29 +0000)]
Update backport proposal with latest trunk work
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1781703 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Feb 2017 17:24:04 +0000 (17:24 +0000)]
UTF-8 conversion.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1781690 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Feb 2017 16:59:59 +0000 (16:59 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1781689 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log