]> granicus.if.org Git - apache/log
apache
9 years agoRebuild
Rich Bowen [Wed, 15 Apr 2015 15:53:23 +0000 (15:53 +0000)]
Rebuild

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

9 years agoconditional +1 for errorlogprovider
Eric Covener [Wed, 15 Apr 2015 15:50:51 +0000 (15:50 +0000)]
conditional +1 for errorlogprovider

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

9 years agoResolves bz56695 - %O can in fact be zero sometimes.
Rich Bowen [Wed, 15 Apr 2015 15:48:01 +0000 (15:48 +0000)]
Resolves bz56695 - %O can in fact be zero sometimes.

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

9 years agoJeff's ajp confusion
Jeff Trawick [Wed, 15 Apr 2015 15:29:45 +0000 (15:29 +0000)]
Jeff's ajp confusion

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

9 years agoApplies patch from bz57189, thanks go to Tom Fredrik Blenning. Adds
Rich Bowen [Wed, 15 Apr 2015 15:26:08 +0000 (15:26 +0000)]
Applies patch from bz57189, thanks go to Tom Fredrik Blenning. Adds
Norwegin translations of error pages

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

9 years agoRebuild core.html and translations
Rich Bowen [Wed, 15 Apr 2015 15:02:24 +0000 (15:02 +0000)]
Rebuild core.html and translations

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

9 years agoAs per bz53530, a brief explanation of when you may and must use quotes
Rich Bowen [Wed, 15 Apr 2015 15:00:36 +0000 (15:00 +0000)]
As per bz53530, a brief explanation of when you may and must use quotes
in directory paths.

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

9 years agohad to move on
Eric Covener [Wed, 15 Apr 2015 14:50:26 +0000 (14:50 +0000)]
had to move on

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

9 years agoNext conditional vote :p
Yann Ylavic [Wed, 15 Apr 2015 14:14:47 +0000 (14:14 +0000)]
Next conditional vote :p

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

9 years agoVote/Promote.
Yann Ylavic [Wed, 15 Apr 2015 14:13:25 +0000 (14:13 +0000)]
Vote/Promote.

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

9 years agoquid
Jeff Trawick [Wed, 15 Apr 2015 14:05:52 +0000 (14:05 +0000)]
quid

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

9 years agomerge
Eric Covener [Wed, 15 Apr 2015 14:03:44 +0000 (14:03 +0000)]
merge

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

9 years agoConditional vote :p
Yann Ylavic [Wed, 15 Apr 2015 13:04:31 +0000 (13:04 +0000)]
Conditional vote :p

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

9 years agoVote/Promote.
Yann Ylavic [Wed, 15 Apr 2015 12:55:18 +0000 (12:55 +0000)]
Vote/Promote.

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

9 years agopre-caffeine lowest-hanging-fruit
Jeff Trawick [Wed, 15 Apr 2015 12:09:35 +0000 (12:09 +0000)]
pre-caffeine lowest-hanging-fruit

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

9 years agosmattering of backports
Eric Covener [Wed, 15 Apr 2015 02:58:10 +0000 (02:58 +0000)]
smattering of backports

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

9 years agoapproved, not a showstopper!
Eric Covener [Wed, 15 Apr 2015 01:43:11 +0000 (01:43 +0000)]
approved, not a showstopper!

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

9 years agovote/promote
Eric Covener [Wed, 15 Apr 2015 01:40:14 +0000 (01:40 +0000)]
vote/promote

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

9 years agoBuild..
Ken Coar [Tue, 14 Apr 2015 22:19:49 +0000 (22:19 +0000)]
Build..

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

9 years agoRelated to httpd-doc bug 53530; uniform use of quotation marks.
Ken Coar [Tue, 14 Apr 2015 22:02:22 +0000 (22:02 +0000)]
Related to  httpd-doc bug 53530; uniform use of quotation marks.
Put quotation marks around most arbitrary-text or filesystem
strings for directives:
 * {Alias,Redirect,Proxy*}{,Match}
 * <{Directory,Files,Location}{,Match}>

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

9 years agoRebuild HTML docs
Rich Bowen [Tue, 14 Apr 2015 19:39:38 +0000 (19:39 +0000)]
Rebuild HTML docs

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

9 years agoClarify order of operations - some variables aren't accessible to If.
Rich Bowen [Tue, 14 Apr 2015 19:37:52 +0000 (19:37 +0000)]
Clarify order of operations - some variables aren't accessible to If.
See bz 53349 for context.

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

9 years agoRebuild HTML docs
Rich Bowen [Tue, 14 Apr 2015 19:23:36 +0000 (19:23 +0000)]
Rebuild HTML docs

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

9 years agoClarifies (I hope) what RewriteRule patterns are matched against. See
Rich Bowen [Tue, 14 Apr 2015 19:20:48 +0000 (19:20 +0000)]
Clarifies (I hope) what RewriteRule patterns are matched against. See
bz53153 for context.

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

9 years agoRebuild
Rich Bowen [Tue, 14 Apr 2015 19:08:04 +0000 (19:08 +0000)]
Rebuild

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

9 years agoClarifies FilesMatch and LocationMatch examples, as per bz53483
Rich Bowen [Tue, 14 Apr 2015 18:40:41 +0000 (18:40 +0000)]
Clarifies FilesMatch and LocationMatch examples, as per bz53483

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

9 years agoRebuild HTML docs
Rich Bowen [Tue, 14 Apr 2015 18:29:23 +0000 (18:29 +0000)]
Rebuild HTML docs

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

9 years agoClarify DirectoryMatch example. (bz 53483)
Rich Bowen [Tue, 14 Apr 2015 18:25:33 +0000 (18:25 +0000)]
Clarify DirectoryMatch example. (bz 53483)

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

9 years agoRebuild
Rich Bowen [Tue, 14 Apr 2015 17:20:30 +0000 (17:20 +0000)]
Rebuild

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

9 years agoAdd "pre-compressed content" reccipe, as per
Rich Bowen [Tue, 14 Apr 2015 17:18:59 +0000 (17:18 +0000)]
Add "pre-compressed content" reccipe, as per
https://bz.apache.org/bugzilla/show_bug.cgi?id=51336

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

9 years agoone patch is enough
Jeff Trawick [Tue, 14 Apr 2015 03:15:18 +0000 (03:15 +0000)]
one patch is enough

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

9 years agoRemove an empty line at the end of the file to synch with trunk.
Christophe Jaillet [Mon, 13 Apr 2015 19:58:36 +0000 (19:58 +0000)]
Remove an empty line at the end of the file to synch with trunk.

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

9 years agoOf course I trusted you in advance...
Rainer Jung [Mon, 13 Apr 2015 13:22:52 +0000 (13:22 +0000)]
Of course I trusted you in advance...

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

9 years agoupdated CGIPassAuth per current comments
Jeff Trawick [Mon, 13 Apr 2015 10:59:19 +0000 (10:59 +0000)]
updated CGIPassAuth per current comments

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

9 years agoMerge r1661486 from trunk:
Jeff Trawick [Mon, 13 Apr 2015 10:40:35 +0000 (10:40 +0000)]
Merge r1661486 from trunk:

core.c: Fix warnings about unused variables

Reviewed by: rjung, jailletc36

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

9 years agoVote + promote
Christophe Jaillet [Mon, 13 Apr 2015 05:03:31 +0000 (05:03 +0000)]
Vote + promote

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

9 years agoPropose
Christophe Jaillet [Sun, 12 Apr 2015 19:08:40 +0000 (19:08 +0000)]
Propose

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

9 years agoSome votes.
Rainer Jung [Sun, 12 Apr 2015 15:49:26 +0000 (15:49 +0000)]
Some votes.

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

9 years agoPropose.
Rainer Jung [Sun, 12 Apr 2015 15:21:08 +0000 (15:21 +0000)]
Propose.

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

9 years agoRebuild.
Lucien Gentis [Sat, 11 Apr 2015 16:53:26 +0000 (16:53 +0000)]
Rebuild.

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

9 years agoUpdate.
Lucien Gentis [Sat, 11 Apr 2015 16:52:14 +0000 (16:52 +0000)]
Update.

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

9 years agoRebuild.
Lucien Gentis [Sat, 11 Apr 2015 16:51:24 +0000 (16:51 +0000)]
Rebuild.

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

9 years agoXML Updates.
Lucien Gentis [Sat, 11 Apr 2015 16:46:01 +0000 (16:46 +0000)]
XML Updates.

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

9 years agomake docs
Jeff Trawick [Fri, 10 Apr 2015 20:38:34 +0000 (20:38 +0000)]
make docs

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

9 years agoMerge r1672757 from trunk:
Jeff Trawick [Fri, 10 Apr 2015 20:37:35 +0000 (20:37 +0000)]
Merge r1672757 from trunk:

mod_proxy_wstunnel isn't limited to Unix

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

9 years agoCGIPassAuth just tested with 2.4.x's mod_proxy_scgi
Jeff Trawick [Thu, 9 Apr 2015 21:52:51 +0000 (21:52 +0000)]
CGIPassAuth just tested with 2.4.x's mod_proxy_scgi

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

9 years agowarnings are distracting :)
Jeff Trawick [Thu, 9 Apr 2015 21:22:25 +0000 (21:22 +0000)]
warnings are distracting :)

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

9 years agomake docs
Jeff Trawick [Thu, 9 Apr 2015 20:51:11 +0000 (20:51 +0000)]
make docs

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

9 years agoMerge r1672480,1672483 from trunk:
Jeff Trawick [Thu, 9 Apr 2015 20:48:42 +0000 (20:48 +0000)]
Merge r1672480,1672483 from trunk:

SetEnv doesn't work for proxy-scgi-pathinfo
Further tweak: omit the period after the example lest it get copied

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

9 years agoCredit to guy who stumbled into bug and hid possible untested fix in dark corner...
Joe Orton [Tue, 7 Apr 2015 10:06:23 +0000 (10:06 +0000)]
Credit to guy who stumbled into bug and hid possible untested fix in dark corner of bugzilla: 0%
Credit to guy who rediscovered, fixed, committed & merged: 100%

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

9 years agoCredit where credit is due (wasn't aware of PR 53253).
Yann Ylavic [Sun, 5 Apr 2015 19:14:41 +0000 (19:14 +0000)]
Credit where credit is due (wasn't aware of PR 53253).

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

9 years agoMerge r1671364 from trunk:
Jeff Trawick [Sun, 5 Apr 2015 01:12:50 +0000 (01:12 +0000)]
Merge r1671364 from trunk:

Mention the cmake/OpenSSL compatibility issue.

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

9 years agoNot that hard to explain...
William A. Rowe Jr [Thu, 2 Apr 2015 01:50:45 +0000 (01:50 +0000)]
Not that hard to explain...

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

9 years agoMerge r1669289, r1669292 from trunk:
Jim Jagielski [Tue, 31 Mar 2015 12:58:59 +0000 (12:58 +0000)]
Merge r1669289, r1669292 from trunk:

core_filters: restore/disable TCP_NOPUSH option after non-blocking sendfile.

CHANGES: follow up to r1669289.
Submitted by: ylavic
Reviewed/backported by: jim

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

9 years agoMerge r1664071, r1664299 from trunk:
Jim Jagielski [Tue, 31 Mar 2015 12:57:46 +0000 (12:57 +0000)]
Merge r1664071, r1664299 from trunk:

core: If explicitly configured, use the KeepaliveTimeout value of the
virtual host which handled the latest request on the connection, or by
default the one of the first virtual host bound to the same IP:port.

For non-async MPMs, use either r->server's or c->base_server's value in
ap_process_http_sync_connection() depending on a new server_rec's flag
called keep_alive_timeout_set and determined at config time.

For event MPM, use a queue per timeout value, chaining the queues per
type (keepalive wrt KeepAliveTimeout, write completion wrt to Timeout)
so that maintenance can be done on all the queues from the head, and such
that insertions/maintenance remain in O(1).
A server config is created and pointing to the queue of each vhost at
post_config time, hence the config can be associated to the connection
state (cs) at post_read_request time (keep_alive_timeout_set is used to
determine r->server vs c->base_server here), and we can simply insert
with TO_QUEUE_INSERT(cs->sc->q, cs).  PR56226.

While at it, since each queue now embeds it own timeout and hence the
expiration_time of the cs has changed to a queue_timestamp (the time it
was queued), we can detect clock skews and expire entries immediatly if
the system is set (eg. far) in the past during runtime and we want to
avoid waiting for (eg.) centuries before the current logic kills them.
Any entry which is registered above now + q->timeout is concerned, and
is now cleaned from the queue when encountered.  PR57374.

core: Follow up to r1664071: comments on new keep_alive_timeout_set flag.
Submitted by: ylavic
Reviewed/backported by: jim

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

9 years agoMerge r1668532, r1668535, r1668553 from trunk:
Jim Jagielski [Tue, 31 Mar 2015 12:54:40 +0000 (12:54 +0000)]
Merge r1668532, r1668535, r1668553 from trunk:

core: Initialize scoreboard's used optional functions on graceful restarts to
avoid a crash when relocation occurs.  PR 57177.

core: follow up to r1668532: CHANGES entry.

core: follow up to r1668532: always initialize optional_fn pointers in ap_create_scoreboard().
Submitted by: ylavic
Reviewed/backported by: jim

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

9 years agoMerge r1657636, r1657638, r1669130 from trunk:
Jim Jagielski [Tue, 31 Mar 2015 12:53:00 +0000 (12:53 +0000)]
Merge r1657636, r1657638, r1669130 from trunk:

mod_proxy_connect/wstunnel: If both client and backend sides get readable
at the same time, don't lose errors occuring while forwarding on the first
side when none occurs next on the other side, and abort.

CHANGES: Follow up to r1657636, clarify message.

mod_proxy_{connect,wstunnel}: follow up to r1657636.
Since rv is not used as an apr_status_t in the loop (it's logging is done by
proxy_{connect,wstunnel}_transfer() when necessary/relevent), use a boolean
instead to avoid the ugly ORs between APR error codes.

Submitted by: ylavic
Reviewed/backported by: jim

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

9 years agopromote
Jim Jagielski [Tue, 31 Mar 2015 12:52:06 +0000 (12:52 +0000)]
promote

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

9 years agovote
Jim Jagielski [Tue, 31 Mar 2015 12:51:04 +0000 (12:51 +0000)]
vote

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

9 years agoMerge r1661448 from trunk:
Jim Jagielski [Tue, 31 Mar 2015 12:49:45 +0000 (12:49 +0000)]
Merge r1661448 from trunk:

core: Add expression support to ErrorDocument. Switch from a fixed
sized 664 byte array per merge to a hash table.

Submitted by: minfrin
Reviewed/backported by: jim

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

9 years agoMerge r1666361 from trunk:
Jim Jagielski [Tue, 31 Mar 2015 12:48:27 +0000 (12:48 +0000)]
Merge r1666361 from trunk:

Avoid a potential integer underflow in the lock timeout value sent back to a client. The answer to a LOCK request could be an extremly large integer if the time needed to lock the resource was longer that the requested timeout given in the LOCK request. In such a case, we now answer "Second-0".  PR55420
Submitted by: jailletc36
Reviewed/backported by: jim

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

9 years agoRemove proposal, it has already been applied in r1669920
Christophe Jaillet [Mon, 30 Mar 2015 18:41:29 +0000 (18:41 +0000)]
Remove proposal, it has already been applied in r1669920

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

9 years agotwo more
Eric Covener [Mon, 30 Mar 2015 17:57:23 +0000 (17:57 +0000)]
two more

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

9 years agovote/promote
Eric Covener [Mon, 30 Mar 2015 17:14:21 +0000 (17:14 +0000)]
vote/promote

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

9 years agoupdate transformation
André Malo [Sun, 29 Mar 2015 15:22:16 +0000 (15:22 +0000)]
update transformation

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

9 years agobackport "directive" placement option
André Malo [Sun, 29 Mar 2015 15:17:17 +0000 (15:17 +0000)]
backport "directive" placement option

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

9 years agoRebuild.
Lucien Gentis [Sat, 28 Mar 2015 15:18:51 +0000 (15:18 +0000)]
Rebuild.

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

9 years agoXML updates.
Lucien Gentis [Sat, 28 Mar 2015 15:17:36 +0000 (15:17 +0000)]
XML updates.

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

9 years agoFix ap_proxy_define_match_worker() proposal.
Yann Ylavic [Sat, 28 Mar 2015 12:31:35 +0000 (12:31 +0000)]
Fix ap_proxy_define_match_worker() proposal.

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

9 years agoupdate transformations.
Nilgun Belma Buguner [Sat, 28 Mar 2015 01:47:56 +0000 (01:47 +0000)]
update transformations.

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

9 years agoupdate for sync with English docs.
Nilgun Belma Buguner [Sat, 28 Mar 2015 01:47:22 +0000 (01:47 +0000)]
update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by:  Orhan Berent <berent belgeler.gen.tr>

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

9 years agoCorrect MS-DOS check-in crap on text files
William A. Rowe Jr [Fri, 27 Mar 2015 20:44:55 +0000 (20:44 +0000)]
Correct MS-DOS check-in crap on text files

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

9 years agoMerge r1667385 from trunk:
Jim Jagielski [Fri, 27 Mar 2015 12:24:02 +0000 (12:24 +0000)]
Merge r1667385 from trunk:

Retry ENOENT like ECONNREFUSED, but only near a server restart.

PR57685

Submitted By: Edward Lu
Committed By: covener

Submitted by: covener
Reviewed/backported by: jim

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

9 years agoMerge r1658760 from trunk:
Jim Jagielski [Fri, 27 Mar 2015 12:22:32 +0000 (12:22 +0000)]
Merge r1658760 from trunk:

mod_proxy_http: Don't expect the backend to ack the "Connection: close" to
finally close those not meant to be kept alive by SetEnv proxy-nokeepalive
or force-proxy-request-1.0, and respond with 502 instead of 400 if its
Connection header is invalid.

Submitted by: ylavic
Reviewed/backported by: jim

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

9 years agoMerge r1665215, r1665218 from trunk:
Jim Jagielski [Fri, 27 Mar 2015 12:21:56 +0000 (12:21 +0000)]
Merge r1665215, r1665218 from trunk:

mod_proxy: use the original (non absolute) form of the request-line's URI
for requests embedded in CONNECT payloads used to connect SSL backends via
a ProxyRemote forward-proxy. PR 55892.

Submitted by: Hendrik Harms <hendrik.harms gmail com>
Reviewed  by: wrowe, ylavic
Committed by: ylavic

mod_proxy: follow up to r1665215: CHANGES entry.
Submitted by: ylavic
Reviewed/backported by: jim

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

9 years agoMerge r1619383, r1619444, r1662245, r1662246 from trunk:
Jim Jagielski [Fri, 27 Mar 2015 12:20:26 +0000 (12:20 +0000)]
Merge r1619383, r1619444, r1662245, r1662246 from trunk:

A misplaced check for inflation limits prevented limiting relatively
small inputs.  PR56872

Submitted By: Edward Lu
Committed By: covener

mod_deflate: follow up to r1619383.

deflate_in_filter():
- use inflated bytes per inflate() call to compute the total output bytes,
- check zlib errors before limits,
- add missing check_ratio() when asked to flush.

deflate_out_filter():
- check ratio after each inflate() call.

mod_deflate: follow up to r1619383 and r1619444: CHANGES entry.

CHANGES: follow up to r1662245: Add PR number.
Submitted by: covener, ylavic, ylavic, ylavic
Reviewed/backported by: jim

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

9 years agoimistakenly
Jim Jagielski [Fri, 27 Mar 2015 12:18:34 +0000 (12:18 +0000)]
imistakenly

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

9 years agopromote
Jim Jagielski [Fri, 27 Mar 2015 12:17:12 +0000 (12:17 +0000)]
promote

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

9 years agovotes
Jim Jagielski [Fri, 27 Mar 2015 12:15:34 +0000 (12:15 +0000)]
votes

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

9 years agoProposal
Christophe Jaillet [Thu, 26 Mar 2015 22:53:44 +0000 (22:53 +0000)]
Proposal

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

9 years agoVotes.
Yann Ylavic [Thu, 26 Mar 2015 08:34:58 +0000 (08:34 +0000)]
Votes.

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

9 years agoPropose TCP_NOPUSH fix.
Yann Ylavic [Thu, 26 Mar 2015 08:32:10 +0000 (08:32 +0000)]
Propose TCP_NOPUSH fix.

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

9 years agoRebuild
Rich Bowen [Wed, 25 Mar 2015 18:45:16 +0000 (18:45 +0000)]
Rebuild

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

9 years agohttp://httpd.apache.org/docs/2.2/mod/mod_ext_filter.html#comment_3822
Rich Bowen [Wed, 25 Mar 2015 18:44:05 +0000 (18:44 +0000)]
http://httpd.apache.org/docs/2.2/mod/mod_ext_filter.html#comment_3822

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

9 years agoUpdate mod_proxy-transfer patch to v3 (v2 was missing APR_EBADF case).
Yann Ylavic [Wed, 25 Mar 2015 16:04:11 +0000 (16:04 +0000)]
Update mod_proxy-transfer patch to v3 (v2 was missing APR_EBADF case).

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

9 years agoUpdate mod_proxy-transfer patch to address Eric's concerns.
Yann Ylavic [Wed, 25 Mar 2015 15:28:27 +0000 (15:28 +0000)]
Update mod_proxy-transfer patch to address Eric's concerns.

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

9 years agoUpdate mod_proxy_http proposal (missing ap_proxy_connection_reusable() in 2.4.x)...
Yann Ylavic [Wed, 25 Mar 2015 12:29:03 +0000 (12:29 +0000)]
Update mod_proxy_http proposal (missing ap_proxy_connection_reusable() in 2.4.x), and remove Eric's vote.

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

9 years agoremove typo and reflow
Eric Covener [Tue, 24 Mar 2015 13:11:05 +0000 (13:11 +0000)]
remove typo and reflow

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

9 years agoMerge r1664205 from trunk:
Eric Covener [Tue, 24 Mar 2015 13:08:44 +0000 (13:08 +0000)]
Merge r1664205 from trunk:

  *) SECURITY: CVE-2015-0253 (cve.mitre.org)
     core: Fix a crash introduced in with ErrorDocument 400 pointing
     to a local URL-path with the INCLUDES filter active, introduced
     in 2.4.11. PR 57531. [Yann Ylavic]

Submitted By: ylavic
Committed By: covener

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

9 years agoxforms
Eric Covener [Tue, 24 Mar 2015 13:07:30 +0000 (13:07 +0000)]
xforms

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

9 years agoxforms
Eric Covener [Tue, 24 Mar 2015 13:06:47 +0000 (13:06 +0000)]
xforms

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

9 years agotweak version # (doc got backported prematurely) and fix typos.
Eric Covener [Tue, 24 Mar 2015 13:05:25 +0000 (13:05 +0000)]
tweak version # (doc got backported prematurely) and fix typos.

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

9 years agoMerge r1642484 from trunk:
Eric Covener [Tue, 24 Mar 2015 13:01:49 +0000 (13:01 +0000)]
Merge r1642484 from trunk:

Remove some instances where a RewriteBase must be specified

Previously, any time you used a relative substitution in
per-directory/htaccess context, you needed to specify
a RewriteBase. But in case where the context document root
and context prefix are known via e.g. mod_userdir
or mod_alias, and the substitution is under the context
document root, we can determine the replacement automatically.

This makes htaccess files or config snippets a bit more
portable.

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

9 years agopropose CGID intermittent startup problem
Eric Covener [Tue, 24 Mar 2015 12:54:04 +0000 (12:54 +0000)]
propose CGID intermittent startup problem

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

9 years ago* mod_lua: fix compilation with lua-5.3 (r1668827)
Jan Kaluža [Tue, 24 Mar 2015 09:46:42 +0000 (09:46 +0000)]
* mod_lua: fix compilation with lua-5.3 (r1668827)

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

9 years agoWithdraw timers duplicates for now, still being tested.
Yann Ylavic [Mon, 23 Mar 2015 11:24:01 +0000 (11:24 +0000)]
Withdraw timers duplicates for now, still being tested.

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

9 years agoFollow up to fix for PR 57177.
Yann Ylavic [Mon, 23 Mar 2015 08:54:01 +0000 (08:54 +0000)]
Follow up to fix for PR 57177.

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

9 years agoPropose.
Yann Ylavic [Mon, 23 Mar 2015 08:44:42 +0000 (08:44 +0000)]
Propose.

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

9 years agoPropose
Christophe Jaillet [Sun, 22 Mar 2015 19:18:12 +0000 (19:18 +0000)]
Propose

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

9 years agoRebuild.
Lucien Gentis [Sun, 22 Mar 2015 14:13:26 +0000 (14:13 +0000)]
Rebuild.

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