]>
granicus.if.org Git - apache/log
Jeff Trawick [Thu, 17 Apr 2014 11:30:36 +0000 (11:30 +0000)]
merge r1588213 from trunk:
Add hint about RequestHeader
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1588220 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 17 Apr 2014 09:04:12 +0000 (09:04 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1588179 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 17 Apr 2014 09:00:58 +0000 (09:00 +0000)]
Merged.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1588176 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 17 Apr 2014 09:00:36 +0000 (09:00 +0000)]
Merge r1587255 from trunk:
* support/rotatelogs.c (main): Prevent creation of zombies from
post-rotate programs.
Reviewed by: druggeri, ylavic, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1588175 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 17 Apr 2014 05:38:49 +0000 (05:38 +0000)]
s/two/three/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1588135 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 16 Apr 2014 21:00:23 +0000 (21:00 +0000)]
merge r1588065 from trunk
add change to makefile.win missing from r1588054
which was merged to 2.4 in r1588064
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1588076 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 16 Apr 2014 20:44:14 +0000 (20:44 +0000)]
Merged /httpd/httpd/trunk:r1515403,
1515411 ,
1515420 ,
1517175 ,
1521909 ,
1526647 ,
1541181 ,
1578762 ,
1585054 ,
1585072 ,
1588054
mod_authnz_fcgi: New module to enable FastCGI authorizer
applications to authenticate and/or authorize clients.
Submitted by: trawick, jailletc36, gsmith
Approved by: trawick, jim, gsmith
(Thanks gsmith for the Windows build bits!)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1588064 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 16 Apr 2014 20:17:33 +0000 (20:17 +0000)]
votes and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1588057 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Wed, 16 Apr 2014 11:58:12 +0000 (11:58 +0000)]
Revert r1587881, I have committed it to 2.4.x by a mistake. sorry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587884 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Wed, 16 Apr 2014 11:51:42 +0000 (11:51 +0000)]
core.xml: document Warning directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587881 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 16 Apr 2014 01:35:00 +0000 (01:35 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587770 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 16 Apr 2014 01:31:30 +0000 (01:31 +0000)]
withdraw -0 and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587768 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 16 Apr 2014 01:30:16 +0000 (01:30 +0000)]
propose a small mod_headers feature from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587767 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 15 Apr 2014 23:58:58 +0000 (23:58 +0000)]
Remove -1 on UDS proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587758 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 15 Apr 2014 19:17:56 +0000 (19:17 +0000)]
Merge r1564437 from trunk:
* Do not parse URL in case of regular expression as they likely do not follow
the URL syntax.
PR: 56074
Submitted by: rpluem
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587699 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 15 Apr 2014 19:17:12 +0000 (19:17 +0000)]
Merge r1580568 from trunk:
mod_reqtimeout: Resolve unexpected timeouts on keepalive requests
under the Event MPM. PR56216.
Submitted By: Frank Meier <frank meier ergon ch>
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@
1587697 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 15 Apr 2014 19:15:02 +0000 (19:15 +0000)]
Merge r1546759, r1546760 from trunk:
Add suspend_connection and resume_connection hooks to notify modules
when the thread/connection relationship changes. (Currently implemented
only for the Event MPM; should be implemented for all async MPMs.)
follow-up to r1546759: remove an inadvertently committed testcase
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587695 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 15 Apr 2014 19:13:30 +0000 (19:13 +0000)]
Merge r1585824 from trunk:
mod_proxy_fcgi: Fix sending of response without some HTTP headers
that might be set by filters.
The problem occurs when no body bytes were read while reading the
response headers, resulting in an empty brigade being sent down
the filter stack. One particualr filter that mishandles the empty
initial brigade is mod_deflate. It neglects to add to the response
header fields.
PR: 55558
Submitted by: Jim Riggs <jim riggs.me>
Reviewed by: trawick
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587694 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 15 Apr 2014 19:12:47 +0000 (19:12 +0000)]
Merge r1584878 from trunk:
Do not delete the wrong data from HTML code when a "http-equiv" meta tag specifies a Content-Type behind any other "http-equiv" meta tag.
PR 56287 [Micha Lenk <micha lenk info>]
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587693 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 15 Apr 2014 19:11:57 +0000 (19:11 +0000)]
Merge r1584884 from trunk:
Do not scan past the end of the buffer.
If no terminating delimiter is found, just leave things as it is
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587692 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 15 Apr 2014 19:11:31 +0000 (19:11 +0000)]
Merge r1584896 from trunk:
Do not perform a p+= 7 that could go past the end of the buffer in case we find a 'content' without a corresponding '='.
Should we need to deal with this case, a new search should be performed to find the real starting position of another potential 'content=' pattern.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587690 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 15 Apr 2014 19:10:36 +0000 (19:10 +0000)]
A question...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587688 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 15 Apr 2014 18:57:54 +0000 (18:57 +0000)]
propose some recent wstunnel fixes together in a small bundle
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587687 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 15 Apr 2014 17:51:28 +0000 (17:51 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587650 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 15 Apr 2014 17:32:14 +0000 (17:32 +0000)]
Add FLUSH fix to mod_deflate bundle.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587642 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 15 Apr 2014 15:43:13 +0000 (15:43 +0000)]
Add EOS fix to mod_deflate bundle.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587620 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 14 Apr 2014 21:17:48 +0000 (21:17 +0000)]
Add <compatibility> notes for changes made in version 2.4.5 (and one forgotten in 2.4.8)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587324 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Mon, 14 Apr 2014 18:02:04 +0000 (18:02 +0000)]
Propose rotatelogs change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587265 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 14 Apr 2014 12:47:49 +0000 (12:47 +0000)]
Merge r1572630, r1572611, r1572967, r1573229 from trunk:
Redo what was reverted in r1572627.
Don't reuse a SSL backend connection whose SNI differs. PR 55782.
This may happen when ProxyPreserveHost is on and the proxy-worker
handles connections to different Hosts.
Follows up r1572606.
MMN minor bump required by proxy_conn_rec change.
mod_proxy: follows up r1572630.
Don't reuse a SSL backend connection with no SNI for a request requiring SNI.
mod_proxy: Add comment and avoid ternary operator as condition (no functional change).
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587201 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 14 Apr 2014 12:44:53 +0000 (12:44 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587200 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 14 Apr 2014 12:44:34 +0000 (12:44 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587199 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 13 Apr 2014 21:04:22 +0000 (21:04 +0000)]
Add <compatibility> notes for changes made in version 2.4.7 + synch formating with 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587098 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 13 Apr 2014 19:47:52 +0000 (19:47 +0000)]
Remove extra '<'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587082 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 13 Apr 2014 16:33:31 +0000 (16:33 +0000)]
Add <compatibility> notes for changes made in version 2.4.8 + synch formating with 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1587031 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 12 Apr 2014 16:10:34 +0000 (16:10 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1586868 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 11 Apr 2014 20:11:33 +0000 (20:11 +0000)]
Proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1586764 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 11 Apr 2014 19:02:31 +0000 (19:02 +0000)]
Add log tags update to mod_deflate bundle.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1586746 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 10 Apr 2014 21:03:24 +0000 (21:03 +0000)]
Add <compatibility> notes for changes made in version 2.4.4 + fix default value for FallbackResource
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1586470 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 10 Apr 2014 19:35:48 +0000 (19:35 +0000)]
Add <compatibility> notes for changes made in version 2.4.3 + fix some formating + backport things in trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1586447 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 10 Apr 2014 19:35:04 +0000 (19:35 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1586445 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 10 Apr 2014 19:32:13 +0000 (19:32 +0000)]
Merge r1586437 from trunk:
This C-T: limitation was removed in 2.2.12 and retconned into CHANGES much later.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1586440 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 9 Apr 2014 20:46:16 +0000 (20:46 +0000)]
Vote for mod_authn_socache fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1586142 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 9 Apr 2014 20:13:53 +0000 (20:13 +0000)]
Vote and promote mod_auth_form fix (and remove duplicate).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1586125 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 9 Apr 2014 09:48:34 +0000 (09:48 +0000)]
add a few mod_ssl backport proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1585922 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 9 Apr 2014 08:24:25 +0000 (08:24 +0000)]
Update SSLPassPhraseDialog directive docs to correctly describe the
current behavior for "exec"-type programs in 2.4.x, at least.
The new argument structure is a consequence of r1573360 (backport
to 2.4.8 [unreleased]).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1585902 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 8 Apr 2014 20:29:24 +0000 (20:29 +0000)]
Add <compatibility> notes for changes made in version 2.4.2 + fix a typo not backported in 2.4 branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1585830 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 8 Apr 2014 20:14:59 +0000 (20:14 +0000)]
mod_proxy_fcgi fix from Jim Riggs?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1585826 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 7 Apr 2014 09:28:40 +0000 (09:28 +0000)]
Add mod_auth_form missing log tags.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1585439 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 7 Apr 2014 09:24:05 +0000 (09:24 +0000)]
Propose mod_auth_form optional functions load changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1585438 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 5 Apr 2014 17:08:12 +0000 (17:08 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1585145 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 5 Apr 2014 12:56:30 +0000 (12:56 +0000)]
monster
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1585089 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 5 Apr 2014 12:33:39 +0000 (12:33 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1585085 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 5 Apr 2014 12:04:22 +0000 (12:04 +0000)]
a patch with the build bits is needed for reviewing mod_authnz_fcgi
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1585081 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 4 Apr 2014 23:44:32 +0000 (23:44 +0000)]
mod_authnz_fcgi...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1584941 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 4 Apr 2014 14:16:25 +0000 (14:16 +0000)]
Follup to r1584684: AcceptFilter was wrongly turned into a Windows specific feature.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1584704 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 4 Apr 2014 14:08:00 +0000 (14:08 +0000)]
Add compatibility changes to SSLOCSPUseRequestNonce (manual) proposal.
Remove other manual changes proposal (CTR, already backported).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1584701 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 4 Apr 2014 13:45:10 +0000 (13:45 +0000)]
- Manual: merge modules' directives obsolete compatibilities.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1584684 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 4 Apr 2014 09:44:12 +0000 (09:44 +0000)]
Make the manuals' obsolete compatibilities a proposal per se.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1584582 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 4 Apr 2014 08:33:55 +0000 (08:33 +0000)]
Add manual modifications to SSLOCSPUseRequestNonce proposal and 2.4.x patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1584561 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 3 Apr 2014 22:58:28 +0000 (22:58 +0000)]
Propose mod_expires' fix for PR 55669.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1584450 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 3 Apr 2014 22:49:04 +0000 (22:49 +0000)]
Move entry already backported to 2.4.8.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1584443 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 3 Apr 2014 21:50:37 +0000 (21:50 +0000)]
vote for reqtimeout i proposed
add a -1 for aliasmatch thing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1584415 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 3 Apr 2014 21:27:20 +0000 (21:27 +0000)]
Yea infra!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1584404 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 3 Apr 2014 21:24:05 +0000 (21:24 +0000)]
let's see if this feature is well aged or just ignored...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1584402 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 2 Apr 2014 17:28:28 +0000 (17:28 +0000)]
Add manual/CHANGES modifications to SSLOCSPUseRequestNonce proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1584101 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 2 Apr 2014 16:22:09 +0000 (16:22 +0000)]
Merge r1584081 from trunk:
provide an expression parser example that can control based on http status code,
rather than just excluding locally generated errors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1584082 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 2 Apr 2014 16:11:33 +0000 (16:11 +0000)]
Merge r1584078 from trunk:
try to clarify that "onsuccess" is for anything but locally-generated errors,
the module behavior and the doc are equally painful for users.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1584079 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 31 Mar 2014 17:40:29 +0000 (17:40 +0000)]
revert r1570168, which added a blurb for Unix domain backends
with proxy under the 2.4.8 section
it had already been added the the proper (2.4.7) section
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1583378 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 30 Mar 2014 19:41:04 +0000 (19:41 +0000)]
Propose SSLOCSPUseRequestNonce patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1583192 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 30 Mar 2014 18:27:13 +0000 (18:27 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1583180 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 29 Mar 2014 17:06:00 +0000 (17:06 +0000)]
Merge r1583005 and
1583027 from trunk:
Report OpenSSL directories in configuration summary
Describe issue with multiple OpenSSL installs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1583028 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Mar 2014 15:51:36 +0000 (15:51 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1583012 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 29 Mar 2014 09:15:33 +0000 (09:15 +0000)]
mod_lua: Give me all the backports and eggs you have. (see CHANGES)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1582968 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 27 Mar 2014 11:22:33 +0000 (11:22 +0000)]
mod_lua: Prevent HTTP Response Splitting by not allowing tables in the request_rec to be set with values containing newlines.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1582264 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 27 Mar 2014 11:00:34 +0000 (11:00 +0000)]
mod_lua: escape key/value pairs when setting cookies to prevent header splitting with tainted cookies.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1582255 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 27 Mar 2014 10:47:35 +0000 (10:47 +0000)]
mod_lua: Reformat and escape script error output.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1582251 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 25 Mar 2014 09:30:08 +0000 (09:30 +0000)]
iVote2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1581283 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 24 Mar 2014 17:45:16 +0000 (17:45 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1580937 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 24 Mar 2014 17:42:37 +0000 (17:42 +0000)]
Remove example from the long-ago past.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1580934 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 23 Mar 2014 19:03:13 +0000 (19:03 +0000)]
propose reqtimeout patch from PR56216
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1580571 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 22 Mar 2014 13:30:57 +0000 (13:30 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1580209 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 18 Mar 2014 17:03:34 +0000 (17:03 +0000)]
typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1578965 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 18 Mar 2014 17:02:47 +0000 (17:02 +0000)]
mod_lua: backport r1578870+r1578882 and add to change log.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1578964 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Tue, 18 Mar 2014 13:45:57 +0000 (13:45 +0000)]
Typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1578887 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 15 Mar 2014 18:12:15 +0000 (18:12 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1577915 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 15 Mar 2014 17:23:52 +0000 (17:23 +0000)]
correct the compat section per Lucien, matches trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1577905 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 15 Mar 2014 16:28:55 +0000 (16:28 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1577893 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Mar 2014 16:41:41 +0000 (16:41 +0000)]
And we are at 2.4.10-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1577237 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Mar 2014 16:37:56 +0000 (16:37 +0000)]
Get ready to tag 2.4.9
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1577234 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Mar 2014 16:36:33 +0000 (16:36 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1577232 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Mar 2014 16:35:59 +0000 (16:35 +0000)]
Update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1577231 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 13 Mar 2014 16:08:43 +0000 (16:08 +0000)]
squeeze in a contributor
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1577218 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Mar 2014 13:41:23 +0000 (13:41 +0000)]
Add leading space :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1577157 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Mar 2014 12:57:16 +0000 (12:57 +0000)]
Note PCRE issue
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1577146 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 13 Mar 2014 12:55:53 +0000 (12:55 +0000)]
mod_lua: Add a fixups hook that checks if the original request is intended
for LuaMapHandler. This fixes a bug where FallbackResource invalidates the
LuaMapHandler directive in certain cases by changing the URI before the map
handler code executes [Daniel Gruno].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1577145 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Mar 2014 12:43:43 +0000 (12:43 +0000)]
Note changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1577139 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Mar 2014 12:39:33 +0000 (12:39 +0000)]
Merge r1576741 from trunk:
A bug in some older versions of OpenSSL will cause a crash
in SSL_get_certificate for servers where the certificate hasn't
been sent.
Workaround by setting the ssl structure to client mode which
bypasses the faulty code in OpenSSL. Normally setting a server
ssl structure to client mode would cause problems later on:
but we are freeing the structure immediately without attempting
to use it.
Submitted by: drh
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1577137 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 13 Mar 2014 11:53:01 +0000 (11:53 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1577122 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 13 Mar 2014 11:50:53 +0000 (11:50 +0000)]
* We track the mergeinfo only at the root
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1577120 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Mar 2014 11:25:49 +0000 (11:25 +0000)]
2.4.8 is not gonna be released
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1577116 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log