]> granicus.if.org Git - apache/log
apache
8 years agoMerge r1757662 from trunk:
Jim Jagielski [Tue, 30 Aug 2016 12:14:37 +0000 (12:14 +0000)]
Merge r1757662 from trunk:

* Add missing copy of hcuri and hcexpr ftom the worker to the health check worker.

PR: 60038
Submitted by: zdeno <zdeno@scnet.sk>

Submitted by: rpluem
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1758373 13f79535-47bb-0310-9956-ffa450edef68

8 years agogit-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1758314 13f79...
William A. Rowe Jr [Tue, 30 Aug 2016 01:10:51 +0000 (01:10 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1758314 13f79535-47bb-0310-9956-ffa450edef68

8 years agoPropose.
Jacob Champion [Tue, 30 Aug 2016 00:19:25 +0000 (00:19 +0000)]
Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1758312 13f79535-47bb-0310-9956-ffa450edef68

8 years agovote/promote
Eric Covener [Mon, 29 Aug 2016 21:08:46 +0000 (21:08 +0000)]
vote/promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1758302 13f79535-47bb-0310-9956-ffa450edef68

8 years agoadd cgid conn_id thing
Eric Covener [Mon, 29 Aug 2016 13:05:22 +0000 (13:05 +0000)]
add cgid conn_id thing

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1758216 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRebuild.
Lucien Gentis [Sun, 28 Aug 2016 14:00:49 +0000 (14:00 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1758117 13f79535-47bb-0310-9956-ffa450edef68

8 years agoXML update.
Lucien Gentis [Sun, 28 Aug 2016 14:00:09 +0000 (14:00 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1758116 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge of r1757985,r1758003 from trunk
Stefan Eissing [Sat, 27 Aug 2016 12:23:35 +0000 (12:23 +0000)]
Merge of r1757985,r1758003 from trunk

mod_http2: fixed bug in stream shutdown, support for nghttp2 invalid header callback from 1.14.0 and onwards.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1758011 13f79535-47bb-0310-9956-ffa450edef68

8 years agoUpdated backport proposal with the latest discussion on dev@
Luca Toscano [Sat, 27 Aug 2016 10:12:23 +0000 (10:12 +0000)]
Updated backport proposal with the latest discussion on dev@
about Last-Modified header handling.
I removed jchampion's vote since it was related to a completely
different solution.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757982 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1757838 from trunk:
Eric Covener [Fri, 26 Aug 2016 13:00:47 +0000 (13:00 +0000)]
Merge r1757838 from trunk:

add [flags] to syntax

per http://httpd.apache.org/docs/2.4/mod/mod_rewrite.html#comment_5728

split list of flags out of the massive CondPattern list.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757839 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1754391, r1754399 from trunk:
Jim Jagielski [Thu, 25 Aug 2016 12:54:06 +0000 (12:54 +0000)]
Merge r1754391, r1754399 from trunk:

mod_reqtimeout: Fix body timeout disabling for CONNECT requests to avoid
triggering mod_proxy_connect's AH01018 once the tunnel is established.
https://bugzilla.mozilla.org/show_bug.cgi?id=1279483#c9

mod_reqtimeout: follow up to r1754391: fix missing "else".
Submitted by: ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757675 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1750854, r1750855, r1750947, r1750955, r1750960 from trunk:
Jim Jagielski [Thu, 25 Aug 2016 12:53:03 +0000 (12:53 +0000)]
Merge r1750854, r1750855, r1750947, r1750955, r1750960 from trunk:

ab: add SNI support when available.

ab: follow up to r1750854: put the -I at the right place for apr_getopt().

ab: follow up to r1750854.
Use SNI when available by default, and invert -I logic to now disable it.

ab: follow up to r1750854: some comments and better naming.

ab: follow up to r1750854: still better naming, and a C89 fix.
Submitted by: ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757674 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1756611, r1748155 from trunk:
Jim Jagielski [Thu, 25 Aug 2016 12:51:05 +0000 (12:51 +0000)]
Merge r1756611, r1748155 from trunk:

mod_dav: follow up to r1746207:  fix typo (missing '/') for closing tag.

mod_dav: making mod_dav.h compile with clang again
Submitted by: ylavic, icing
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757673 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1753257 from trunk:
Jim Jagielski [Thu, 25 Aug 2016 12:50:42 +0000 (12:50 +0000)]
Merge r1753257 from trunk:

Restore 'HEAD' method as a special case of GET with the common ID
Submitted by: wrowe
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757672 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1753167 from trunk:
Jim Jagielski [Thu, 25 Aug 2016 12:50:22 +0000 (12:50 +0000)]
Merge r1753167 from trunk:

mod_proxy_fcgi: avoid loops serving proxied error documents

This commit should solve the issue indicated in PR 55415.
Httpd loops while serving a error document if:
1) The error document's content is proxied.
2) ProxyErrorOverride is set.
The solution proposed is to limit the use of ap_die only
to the initial request. I tested the change with very basic
scenarios but I am not sure if I got all the use cases,
feedback is really welcome.

Submitted by: elukey
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757671 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1752347 from trunk:
Jim Jagielski [Thu, 25 Aug 2016 12:49:32 +0000 (12:49 +0000)]
Merge r1752347 from trunk:

Force mod_proxy_fcgi to read the whole FCGI response
even when the content has not been modified (HTTP 304).

The problem is described in PR 59838. This patch should
avoid bogus reads causing the following issues with
HTTP 304 responses:
- AH01068: Got bogus version X, expected 1
- AH01069: Got bogus rid X, expected 1
- AH01075: Error dispatching request to :
- HTTP 503 logged instead of 304 (even if the external
  client gets correctly a 304)

As discussed on IRC the HTTP_PRECONDITION_FAILED use case
should be handled like the HTTP_NOT_MODIFIED one but it will
be done in a separate commit.

Submitted by: elukey
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757670 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1756038 from trunk:
Jim Jagielski [Thu, 25 Aug 2016 12:48:18 +0000 (12:48 +0000)]
Merge r1756038 from trunk:

Fix spelling in comments and text files.
No functional change.
PR 59990

Submitted by: rjung
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757669 13f79535-47bb-0310-9956-ffa450edef68

8 years agopromotes
Jim Jagielski [Thu, 25 Aug 2016 12:46:58 +0000 (12:46 +0000)]
promotes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757668 13f79535-47bb-0310-9956-ffa450edef68

8 years agosome votes
Jim Jagielski [Thu, 25 Aug 2016 12:46:13 +0000 (12:46 +0000)]
some votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757667 13f79535-47bb-0310-9956-ffa450edef68

8 years ago* Add proposal
Ruediger Pluem [Thu, 25 Aug 2016 11:47:20 +0000 (11:47 +0000)]
* Add proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757664 13f79535-47bb-0310-9956-ffa450edef68

8 years ago* Vote and promote
Ruediger Pluem [Thu, 25 Aug 2016 11:28:50 +0000 (11:28 +0000)]
* Vote and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757661 13f79535-47bb-0310-9956-ffa450edef68

8 years ago* Revert errornous r1757659
Ruediger Pluem [Thu, 25 Aug 2016 11:27:51 +0000 (11:27 +0000)]
* Revert errornous r1757659

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757660 13f79535-47bb-0310-9956-ffa450edef68

8 years ago* Vote and promote
Ruediger Pluem [Thu, 25 Aug 2016 11:26:46 +0000 (11:26 +0000)]
* Vote and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757659 13f79535-47bb-0310-9956-ffa450edef68

8 years agoxforms fr
Christophe Jaillet [Thu, 25 Aug 2016 04:58:07 +0000 (04:58 +0000)]
xforms fr

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757602 13f79535-47bb-0310-9956-ffa450edef68

8 years agoFix some French translations in order explanations to match examples (r1757599 in...
Christophe Jaillet [Thu, 25 Aug 2016 04:56:22 +0000 (04:56 +0000)]
Fix some French translations in order explanations to match examples (r1757599 in trunk)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757601 13f79535-47bb-0310-9956-ffa450edef68

8 years agoPropose fix for https://bugzilla.mozilla.org/show_bug.cgi?id=1279483
Yann Ylavic [Wed, 24 Aug 2016 22:33:32 +0000 (22:33 +0000)]
Propose fix for https://bugzilla.mozilla.org/show_bug.cgi?id=1279483

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757580 13f79535-47bb-0310-9956-ffa450edef68

8 years agomerge of 1752145,1753498,1753541,1754129,1754414,1754534,1755323,1756844,1757524...
Stefan Eissing [Wed, 24 Aug 2016 15:23:12 +0000 (15:23 +0000)]
merge of 1752145,1753498,1753541,1754129,1754414,1754534,1755323,1756844,1757524,1757534,1757540 from trunk

mod_http2: backport of latest changes
 - intermediate responses
 - graceful shutdown of connections
 - ht debug draft update

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757542 13f79535-47bb-0310-9956-ffa450edef68

8 years agosynch with trunk minus RewriteMapOptions.
Eric Covener [Tue, 23 Aug 2016 00:24:23 +0000 (00:24 +0000)]
synch with trunk minus RewriteMapOptions.

PR60024 cleanups around per-dir processing/redundancy/terminology.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757291 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRebuild.
Lucien Gentis [Sun, 21 Aug 2016 11:45:52 +0000 (11:45 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757052 13f79535-47bb-0310-9956-ffa450edef68

8 years agoXML update.
Lucien Gentis [Sun, 21 Aug 2016 11:45:06 +0000 (11:45 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757051 13f79535-47bb-0310-9956-ffa450edef68

8 years agoFix a typo (r1756991 in trunk)
Christophe Jaillet [Sat, 20 Aug 2016 18:42:14 +0000 (18:42 +0000)]
Fix a typo (r1756991 in trunk)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757021 13f79535-47bb-0310-9956-ffa450edef68

8 years agovote + promote
Stefan Fritsch [Fri, 19 Aug 2016 16:32:24 +0000 (16:32 +0000)]
vote + promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756935 13f79535-47bb-0310-9956-ffa450edef68

8 years agoOne more follow up to r1756560.
Yann Ylavic [Thu, 18 Aug 2016 12:01:52 +0000 (12:01 +0000)]
One more follow up to r1756560.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756763 13f79535-47bb-0310-9956-ffa450edef68

8 years agoxforms
Christophe Jaillet [Thu, 18 Aug 2016 04:56:56 +0000 (04:56 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756709 13f79535-47bb-0310-9956-ffa450edef68

8 years agoImprove highlight and formatting. (r1756706 in trunk)
Christophe Jaillet [Thu, 18 Aug 2016 04:55:45 +0000 (04:55 +0000)]
Improve highlight and formatting. (r1756706 in trunk)
Remove some trailing spaces to synch with trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756708 13f79535-47bb-0310-9956-ffa450edef68

8 years agoComment, promote.
Jacob Champion [Wed, 17 Aug 2016 19:18:46 +0000 (19:18 +0000)]
Comment, promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756677 13f79535-47bb-0310-9956-ffa450edef68

8 years agoAdd a 2.4.x backport patch to my proposal
Jacob Champion [Wed, 17 Aug 2016 18:39:33 +0000 (18:39 +0000)]
Add a 2.4.x backport patch to my proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756674 13f79535-47bb-0310-9956-ffa450edef68

8 years agoAdd better logging (debug) to PR 21935 proposal.
Yann Ylavic [Wed, 17 Aug 2016 13:25:11 +0000 (13:25 +0000)]
Add better logging (debug) to PR 21935 proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756632 13f79535-47bb-0310-9956-ffa450edef68

8 years agoPropose follow up to r1756560.
Yann Ylavic [Wed, 17 Aug 2016 11:12:03 +0000 (11:12 +0000)]
Propose follow up to r1756560.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756613 13f79535-47bb-0310-9956-ffa450edef68

8 years agoPropose.
Yann Ylavic [Wed, 17 Aug 2016 01:22:21 +0000 (01:22 +0000)]
Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756571 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1753594 from trunk:
Yann Ylavic [Tue, 16 Aug 2016 23:27:47 +0000 (23:27 +0000)]
Merge r1753594 from trunk:

* Prevent redirect loops between workers within a balancer by limiting the
  number of redirects to the number balancer members.

PR: 59864

Submitted by: rpluem
Reviewed by: rpluem, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756563 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1753592 from trunk:
Yann Ylavic [Tue, 16 Aug 2016 23:25:44 +0000 (23:25 +0000)]
Merge r1753592 from trunk:

* Do not overwrite r->status with access_status if access_status is OK or DONE
  as in this case r->status might contain the true response code.

PR: 59869

Submitted by: rpluem
Reviewed by: rpluem, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756562 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1748047 from trunk:
Yann Ylavic [Tue, 16 Aug 2016 23:22:39 +0000 (23:22 +0000)]
Merge r1748047 from trunk:

mod_dav: Add dav_begin_multistatus, dav_send_one_response,
dav_finish_multistatus, dav_send_multistatus, dav_handle_err,
dav_failed_proppatch, dav_success_proppatch to mod_dav.h.

Submitted by: minfrin
Reviewed by: minfrin, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756561 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1746207 from trunk:
Yann Ylavic [Tue, 16 Aug 2016 23:17:46 +0000 (23:17 +0000)]
Merge r1746207 from trunk:

mod_dav: Add support for childtags to dav_error.

Submitted by: minfrin
Reviewed by: minfrin, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756560 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1753228, r1753229 from trunk:
Yann Ylavic [Tue, 16 Aug 2016 23:12:07 +0000 (23:12 +0000)]
Merge r1753228, r1753229 from trunk:

httpoxy workarounds, first draft patch as published for all 2.2.x+ sources

Optimization to httpoxy workaround, for 2.4.23+ only.

Submitted by: Dominic Scheirlinck <dominic vendhq.com>, ylavic
Reviewed/backported by: wrowe, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756559 13f79535-47bb-0310-9956-ffa450edef68

8 years agoPromote.
Yann Ylavic [Tue, 16 Aug 2016 22:44:05 +0000 (22:44 +0000)]
Promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756557 13f79535-47bb-0310-9956-ffa450edef68

8 years agoVote, promote.
Yann Ylavic [Tue, 16 Aug 2016 22:29:56 +0000 (22:29 +0000)]
Vote, promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756556 13f79535-47bb-0310-9956-ffa450edef68

8 years agoPropose.
Yann Ylavic [Tue, 16 Aug 2016 22:00:47 +0000 (22:00 +0000)]
Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756554 13f79535-47bb-0310-9956-ffa450edef68

8 years agoupdate transformations.
Nilgun Belma Buguner [Sun, 14 Aug 2016 14:29:02 +0000 (14:29 +0000)]
update transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756326 13f79535-47bb-0310-9956-ffa450edef68

8 years agoupdate for sync with English docs.
Nilgun Belma Buguner [Sun, 14 Aug 2016 14:28:31 +0000 (14:28 +0000)]
update for sync with English docs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756325 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRebuild.
Lucien Gentis [Sat, 13 Aug 2016 15:24:27 +0000 (15:24 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756276 13f79535-47bb-0310-9956-ffa450edef68

8 years agoXML updates.
Lucien Gentis [Sat, 13 Aug 2016 15:23:44 +0000 (15:23 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756275 13f79535-47bb-0310-9956-ffa450edef68

8 years agoPropose.
Rainer Jung [Thu, 11 Aug 2016 20:16:39 +0000 (20:16 +0000)]
Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756043 13f79535-47bb-0310-9956-ffa450edef68

8 years agomod_rewrite is a <module> not a <directive>
Rich Bowen [Thu, 11 Aug 2016 14:04:16 +0000 (14:04 +0000)]
mod_rewrite is a <module> not a <directive>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1755988 13f79535-47bb-0310-9956-ffa450edef68

8 years agoCorrect link for Trawick\'s whatkilledus website
Rich Bowen [Thu, 11 Aug 2016 13:59:58 +0000 (13:59 +0000)]
Correct link for Trawick\'s whatkilledus website

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1755987 13f79535-47bb-0310-9956-ffa450edef68

8 years agorebuild transforms
Rich Bowen [Thu, 11 Aug 2016 13:36:19 +0000 (13:36 +0000)]
rebuild transforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1755980 13f79535-47bb-0310-9956-ffa450edef68

8 years agotypo
Rich Bowen [Thu, 11 Aug 2016 13:34:59 +0000 (13:34 +0000)]
typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1755978 13f79535-47bb-0310-9956-ffa450edef68

8 years agoupdate transformations.
Nilgun Belma Buguner [Sat, 6 Aug 2016 18:52:11 +0000 (18:52 +0000)]
update transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1755408 13f79535-47bb-0310-9956-ffa450edef68

8 years agoupdate for sync with English docs.
Nilgun Belma Buguner [Sat, 6 Aug 2016 18:51:06 +0000 (18:51 +0000)]
update for sync with English docs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1755407 13f79535-47bb-0310-9956-ffa450edef68

8 years agorebuild
Rich Bowen [Fri, 5 Aug 2016 16:23:00 +0000 (16:23 +0000)]
rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1755364 13f79535-47bb-0310-9956-ffa450edef68

8 years agoClarify phrasing, as per bz53152
Rich Bowen [Fri, 5 Aug 2016 16:20:45 +0000 (16:20 +0000)]
Clarify phrasing, as per bz53152

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1755363 13f79535-47bb-0310-9956-ffa450edef68

8 years agoHardly CHANGES-worthy
William A. Rowe Jr [Thu, 4 Aug 2016 17:03:22 +0000 (17:03 +0000)]
Hardly CHANGES-worthy

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1755217 13f79535-47bb-0310-9956-ffa450edef68

8 years agoNot strictly necessary, but may save someone from bumping their head against it
William A. Rowe Jr [Thu, 4 Aug 2016 14:59:27 +0000 (14:59 +0000)]
Not strictly necessary, but may save someone from bumping their head against it

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1755196 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1753224 from trunk:
Jim Jagielski [Wed, 3 Aug 2016 11:50:07 +0000 (11:50 +0000)]
Merge r1753224 from trunk:

Unclear whether fdpass is common enough to justify a 'most' configuration,
but for the time being, assign it -something- for a build priority.

Submitted by: wrowe
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1755078 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1751970 from trunk:
Jim Jagielski [Wed, 3 Aug 2016 11:49:43 +0000 (11:49 +0000)]
Merge r1751970 from trunk:

PR59815: rewrite per-directory + fcgi broken in 2.4.23

remove the query string from r->filename before calculating environment
(SCRIPT_FILENAME) in mod_proxy_fcgi.  Before PR59618, php-fpm would
see proxy:fcgi:// and do some of this same stripping.

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1755077 13f79535-47bb-0310-9956-ffa450edef68

8 years agopromote
Jim Jagielski [Wed, 3 Aug 2016 11:48:07 +0000 (11:48 +0000)]
promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1755076 13f79535-47bb-0310-9956-ffa450edef68

8 years agotested votes
Jim Jagielski [Wed, 3 Aug 2016 11:46:43 +0000 (11:46 +0000)]
tested votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1755074 13f79535-47bb-0310-9956-ffa450edef68

8 years agovote
Jim Jagielski [Wed, 3 Aug 2016 11:45:48 +0000 (11:45 +0000)]
vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1755073 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1753777 from trunk:
Jim Jagielski [Wed, 3 Aug 2016 11:44:41 +0000 (11:44 +0000)]
Merge r1753777 from trunk:

Permit mod_proxy_hcheck.c to compile on Win32 32-bit architectures.
This decoration is required for all apr_thread fn() entry points,
at least on some platforms.

Submitted by: wrowe
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1755072 13f79535-47bb-0310-9956-ffa450edef68

8 years agoPromote.
Jacob Champion [Tue, 2 Aug 2016 18:35:19 +0000 (18:35 +0000)]
Promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1754986 13f79535-47bb-0310-9956-ffa450edef68

8 years agonon-merge sync with r1752884 of mime.types from trunk.
Eric Covener [Thu, 28 Jul 2016 13:15:26 +0000 (13:15 +0000)]
non-merge sync with r1752884 of mime.types from trunk.

The only uncommented change is application/x-woff -> application/woff
which was added for PR55293 by r1506674 in mid 2013.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1754408 13f79535-47bb-0310-9956-ffa450edef68

8 years agoupdate transformation
André Malo [Thu, 28 Jul 2016 09:23:15 +0000 (09:23 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1754376 13f79535-47bb-0310-9956-ffa450edef68

8 years agofix encoding in commit mails for spanish translations
André Malo [Thu, 28 Jul 2016 09:19:35 +0000 (09:19 +0000)]
fix encoding in commit mails for spanish translations

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1754374 13f79535-47bb-0310-9956-ffa450edef68

8 years agoVote for r1751970
Luca Toscano [Wed, 27 Jul 2016 13:48:25 +0000 (13:48 +0000)]
Vote for r1751970

Tested manually and verified httpd's mod_proxy_fcgi logs with various request types
(with/without query string, long query strings, etc..).
My only doubt was related to the '\0' terminator placed in the middle of the char array,
but after a chat with Eric on IRC I got a clear view of what happens (only the chars up
to the \0 terminator are placed in FCGI headers later on).
Last but not the least, in the bugzilla ticket the original requestor tested the change
and stated that solved his problem. Looks good to me for backport!

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1754272 13f79535-47bb-0310-9956-ffa450edef68

8 years agoPropose showstopper fix for httpoxy mitigation
William A. Rowe Jr [Tue, 26 Jul 2016 16:50:18 +0000 (16:50 +0000)]
Propose showstopper fix for httpoxy mitigation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1754158 13f79535-47bb-0310-9956-ffa450edef68

8 years ago* Add proposals
Ruediger Pluem [Tue, 26 Jul 2016 07:19:55 +0000 (07:19 +0000)]
* Add proposals

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1754075 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRebuild.
Lucien Gentis [Sat, 23 Jul 2016 15:23:49 +0000 (15:23 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1753880 13f79535-47bb-0310-9956-ffa450edef68

8 years agoXML updates.
Lucien Gentis [Sat, 23 Jul 2016 15:22:59 +0000 (15:22 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1753879 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1753872 from trunk:
Eric Covener [Sat, 23 Jul 2016 14:11:48 +0000 (14:11 +0000)]
Merge r1753872 from trunk:

Since this is beginner doc, split the -S invocation into two
versions more likely to work verbatim.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1753873 13f79535-47bb-0310-9956-ffa450edef68

8 years agocommitted
Eric Covener [Fri, 22 Jul 2016 12:47:57 +0000 (12:47 +0000)]
committed

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1753784 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1752415 from trunk:
Eric Covener [Fri, 22 Jul 2016 12:47:42 +0000 (12:47 +0000)]
Merge r1752415 from trunk:

PR59844: stack-allocated ap_expr_info_t returned from mod_include

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1753782 13f79535-47bb-0310-9956-ffa450edef68

8 years agovote
Eric Covener [Fri, 22 Jul 2016 12:45:44 +0000 (12:45 +0000)]
vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1753780 13f79535-47bb-0310-9956-ffa450edef68

8 years agoPropose
William A. Rowe Jr [Fri, 22 Jul 2016 12:42:36 +0000 (12:42 +0000)]
Propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1753779 13f79535-47bb-0310-9956-ffa450edef68

8 years agoVote.
Jacob Champion [Thu, 21 Jul 2016 22:26:12 +0000 (22:26 +0000)]
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1753738 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1753712 from trunk:
Eric Covener [Thu, 21 Jul 2016 16:43:41 +0000 (16:43 +0000)]
Merge r1753712 from trunk:

add basic h2: and h2c: backend proxy examples

Submitted by: Hank Ibell <hwibell gmail.com>
Committed by: covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1753713 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge of 1752087,1752096,1752145,1753498,1753541 from trunk:
Stefan Eissing [Wed, 20 Jul 2016 16:09:06 +0000 (16:09 +0000)]
Merge of 1752087,1752096,1752145,1753498,1753541 from trunk:

mod_http2: removed timeouts on master connection while reuqest are being processsed
mod_http2: new H2CopyFiles directive

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1753542 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackport proposal for r1753167
Luca Toscano [Tue, 19 Jul 2016 06:38:50 +0000 (06:38 +0000)]
Backport proposal for r1753167

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1753337 13f79535-47bb-0310-9956-ffa450edef68

8 years agoVote (minor autoconf cleanup)
Jacob Champion [Mon, 18 Jul 2016 20:47:01 +0000 (20:47 +0000)]
Vote (minor autoconf cleanup)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1753317 13f79535-47bb-0310-9956-ffa450edef68

8 years agoPropose fix to fdpass --enable defaults
William A. Rowe Jr [Mon, 18 Jul 2016 13:49:24 +0000 (13:49 +0000)]
Propose fix to fdpass --enable defaults

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1753225 13f79535-47bb-0310-9956-ffa450edef68

8 years agoDoc rebuild
Luca Toscano [Sun, 17 Jul 2016 13:29:09 +0000 (13:29 +0000)]
Doc rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1753075 13f79535-47bb-0310-9956-ffa450edef68

8 years agoAdded a reference to how ListenCoresBucketsRatio influences the Min|MaxSpareThreads...
Luca Toscano [Sun, 17 Jul 2016 13:28:39 +0000 (13:28 +0000)]
Added a reference to how ListenCoresBucketsRatio influences the Min|MaxSpareThreads lower bounds calculation in the docs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1753074 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRebuild.
Lucien Gentis [Sat, 16 Jul 2016 16:03:42 +0000 (16:03 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1752983 13f79535-47bb-0310-9956-ffa450edef68

8 years agoXML update.
Lucien Gentis [Sat, 16 Jul 2016 16:02:24 +0000 (16:02 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1752982 13f79535-47bb-0310-9956-ffa450edef68

8 years agoAdded missing trunk patches and final view to proposal
Luca Toscano [Fri, 15 Jul 2016 08:12:52 +0000 (08:12 +0000)]
Added missing trunk patches and final view to proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1752794 13f79535-47bb-0310-9956-ffa450edef68

8 years agoxforms
Christophe Jaillet [Thu, 14 Jul 2016 21:06:56 +0000 (21:06 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1752750 13f79535-47bb-0310-9956-ffa450edef68

8 years agoFix PR 59856.
Christophe Jaillet [Thu, 14 Jul 2016 21:05:46 +0000 (21:05 +0000)]
Fix PR 59856.
Fix directive name. (ProxyRequest vs ProxyRequests)
Improve highlight.

(r1752747 in trunk)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1752749 13f79535-47bb-0310-9956-ffa450edef68

8 years agoVote/promote.
Jacob Champion [Wed, 13 Jul 2016 19:57:58 +0000 (19:57 +0000)]
Vote/promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1752535 13f79535-47bb-0310-9956-ffa450edef68

8 years ago* Vote
Ruediger Pluem [Wed, 13 Jul 2016 18:57:45 +0000 (18:57 +0000)]
* Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1752515 13f79535-47bb-0310-9956-ffa450edef68

8 years agoPR59844 fix
Eric Covener [Wed, 13 Jul 2016 12:49:24 +0000 (12:49 +0000)]
PR59844 fix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1752417 13f79535-47bb-0310-9956-ffa450edef68

8 years agoFix typo in proposal
Luca Toscano [Wed, 13 Jul 2016 11:35:15 +0000 (11:35 +0000)]
Fix typo in proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1752396 13f79535-47bb-0310-9956-ffa450edef68