]>
granicus.if.org Git - apache/log
Lucien Gentis [Sat, 24 Jan 2015 15:36:49 +0000 (15:36 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1654544 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 23 Jan 2015 13:07:55 +0000 (13:07 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1654199 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 23 Jan 2015 12:23:17 +0000 (12:23 +0000)]
add groupfile logging tweek
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1654185 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 22 Jan 2015 18:48:36 +0000 (18:48 +0000)]
And we are 2.4.13-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1654002 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 22 Jan 2015 18:45:47 +0000 (18:45 +0000)]
get ready to tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1654000 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 22 Jan 2015 18:38:57 +0000 (18:38 +0000)]
Modify PR57100 proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1653998 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 22 Jan 2015 18:08:01 +0000 (18:08 +0000)]
Update proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1653979 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 22 Jan 2015 17:34:09 +0000 (17:34 +0000)]
note t&r
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1653965 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 22 Jan 2015 17:33:07 +0000 (17:33 +0000)]
Merge r1652982 from trunk:
Fix detection of old Solaris versions.
Autotools need double square brackets.
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1653963 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 22 Jan 2015 17:32:27 +0000 (17:32 +0000)]
Merge r1652929, r1652931 from trunk:
Fix --enable-v4-mapped configuration on *BSD. PR 53824.
Submitted by: olli hauer <ohauer gmx.de>
Committed by: ylavic
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1653962 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 22 Jan 2015 17:25:13 +0000 (17:25 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1653955 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 22 Jan 2015 17:20:31 +0000 (17:20 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1653951 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 22 Jan 2015 17:19:06 +0000 (17:19 +0000)]
Voted up low-hanging autoconf.in fruit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1653950 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 22 Jan 2015 17:15:57 +0000 (17:15 +0000)]
This is a crash-bug fix that is easy to review, really low hanging fruit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1653948 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 22 Jan 2015 15:45:29 +0000 (15:45 +0000)]
sslprotocol fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1653917 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 19 Jan 2015 20:49:22 +0000 (20:49 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1653114 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Jan 2015 15:13:22 +0000 (15:13 +0000)]
won't be releasing 2.4.11
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1653026 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 19 Jan 2015 12:46:46 +0000 (12:46 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652991 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 19 Jan 2015 12:44:01 +0000 (12:44 +0000)]
Another proposal enhancement.
Thanks Yann.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652990 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 19 Jan 2015 12:38:56 +0000 (12:38 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652988 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 19 Jan 2015 12:35:41 +0000 (12:35 +0000)]
Enhance proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652986 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 19 Jan 2015 12:26:52 +0000 (12:26 +0000)]
Vote and add another patch in the same spirit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652983 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 19 Jan 2015 11:05:56 +0000 (11:05 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652964 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 19 Jan 2015 10:44:02 +0000 (10:44 +0000)]
Add contribution note.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652959 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 19 Jan 2015 10:36:21 +0000 (10:36 +0000)]
Add proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652957 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 19 Jan 2015 09:50:05 +0000 (09:50 +0000)]
Remove "accepted" background proposal that
was added back by reverting its commit
(PR 41867, DirectoryMatch).
Add another proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652951 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 19 Jan 2015 08:50:34 +0000 (08:50 +0000)]
Revert r1652931: meant to commit STATUS instead...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652936 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 19 Jan 2015 08:37:25 +0000 (08:37 +0000)]
Revert r1652933: meant to commit STATUS instead...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652935 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 19 Jan 2015 08:33:00 +0000 (08:33 +0000)]
Propose fixes for PR 53824 and PR 53882.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652934 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 19 Jan 2015 08:26:30 +0000 (08:26 +0000)]
Follow up to r1652930: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652933 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 19 Jan 2015 08:23:37 +0000 (08:23 +0000)]
Follow up to r1652929: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652931 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 19 Jan 2015 04:16:28 +0000 (04:16 +0000)]
revert r1642852 for 2.4.x release purposes. It appears to break
too much DirectoryMatch matching and is not critical to have in.
Discussion on dev@ on trunk rev commit msg for r1635428
Also, I don't think the addition in the middle of the core_dir_config
given that the core_dir_config is exposed to modules as kind
of a special case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652902 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sun, 18 Jan 2015 04:25:46 +0000 (04:25 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652701 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sun, 18 Jan 2015 04:24:21 +0000 (04:24 +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@
1652700 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 17 Jan 2015 17:21:01 +0000 (17:21 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652646 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 17 Jan 2015 15:57:31 +0000 (15:57 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652632 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 17 Jan 2015 15:56:10 +0000 (15:56 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652631 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 16 Jan 2015 13:22:06 +0000 (13:22 +0000)]
Merge r1652400 from trunk:
comments feedback -- it's an initial _request_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652402 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 15 Jan 2015 20:46:45 +0000 (20:46 +0000)]
Larger win32 os-specific patch applied (post-2.4.11 to avoid disruption)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652268 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 15 Jan 2015 20:45:57 +0000 (20:45 +0000)]
As noted by Yann, this resulted in a dead var assignment. Preinit won't
work due to the fact that we overload rv as both the DWORD windows result
and the apr_status_t result code.
Backport: r1611244
Reviewed by: wrowe, gsmith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652267 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 15 Jan 2015 20:43:47 +0000 (20:43 +0000)]
mpm_winnt: Accept utf-8 (Unicode) service names and descriptions for
internationalization.
Backports: r1611169
Reviewed by: wrowe, gsmith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652266 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 15 Jan 2015 20:41:06 +0000 (20:41 +0000)]
mpm_winnt service.c: Normalize error and status messages, clean up
source formatting
Backport: r1611165
Reviewed by: wrowe, gsmith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652265 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 15 Jan 2015 19:57:52 +0000 (19:57 +0000)]
and we are 2.4.12-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652260 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 15 Jan 2015 19:55:57 +0000 (19:55 +0000)]
Get ready to tag as 2.4.11
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652258 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 15 Jan 2015 19:38:04 +0000 (19:38 +0000)]
note T&R in prep for tagging
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652253 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 15 Jan 2015 13:08:16 +0000 (13:08 +0000)]
xlations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652085 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Jan 2015 12:20:33 +0000 (12:20 +0000)]
Merge r1650310 and r1650320 from trunk:
mod_ssl: Add SSLSessionTickets (on|off).
It controls the use of TLS session tickets (RFC 5077).
Default is unchanged (on).
Using session tickets without restarting the web server with
an appropriate frequency (e.g. daily) compromises perfect forward
secrecy. As long as we do not have a nice key management
there needs to be a way to deactivate the use of session tickets.
Submitted by: rjung
Reviewed by: rjung, covener, ylavic
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1652074 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Jan 2015 08:19:34 +0000 (08:19 +0000)]
Propose listeners buckets.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651967 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 14 Jan 2015 22:35:02 +0000 (22:35 +0000)]
remove bad merge from CHANGES in r1651656
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651856 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 14 Jan 2015 13:35:12 +0000 (13:35 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651670 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 14 Jan 2015 13:33:59 +0000 (13:33 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651669 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 14 Jan 2015 13:32:57 +0000 (13:32 +0000)]
sprinkle some compat info
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651668 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 14 Jan 2015 13:31:27 +0000 (13:31 +0000)]
sync with trunk, needs compat info
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651665 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 14 Jan 2015 13:28:47 +0000 (13:28 +0000)]
Merge r1647035 from trunk:
provide alternative PATH_INFO calculation options for proxy_fcgi.
PR 55329
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651663 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 14 Jan 2015 13:28:00 +0000 (13:28 +0000)]
Merge the following revisions from trunk:
trunk patch: http://svn.apache.org/r1588544 (rewrite+UDS)
http://svn.apache.org/r1641636 ('using default worker' msg tweak)
http://svn.apache.org/r1647005 (tcp reuse)
http://svn.apache.org/r1647009 (uds reuse)
http://svn.apache.org/r1647334 (uds reuse fix)
+ 1 additional de_socketfy call in mod_proxy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651662 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 14 Jan 2015 13:25:18 +0000 (13:25 +0000)]
put back misplaced then removed changes entry for
1651656
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651660 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 14 Jan 2015 13:24:10 +0000 (13:24 +0000)]
Merge r1646724, r1650309 from trunk:
tweak SCRIPT_FILENAME passed to fastcgi backends when a balancer is used.
save some bytes per Christophe's review.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651658 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 14 Jan 2015 13:22:36 +0000 (13:22 +0000)]
Merge r1651088 from trunk:
Update conn_rec.id when a new thread begins working on a connection, because
the old thread may work on a new connection and assign the same ID in parallel.
Submitted By: Michael Thorpe
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651656 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 14 Jan 2015 13:21:20 +0000 (13:21 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651655 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 14 Jan 2015 13:20:49 +0000 (13:20 +0000)]
Merge r1648394 from trunk:
Configuration files with long lines and continuation characters
are not read properly. PR 55910.
Submitted By: Manuel Mausz <manuel-as mausz.at>
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651653 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 14 Jan 2015 13:08:44 +0000 (13:08 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651650 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 14 Jan 2015 12:56:38 +0000 (12:56 +0000)]
some backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651645 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 14 Jan 2015 12:56:05 +0000 (12:56 +0000)]
Merge r1648201 from trunk:
Add class attributes for empty descriptions
Submitted by: druggeri
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651644 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 13 Jan 2015 21:41:52 +0000 (21:41 +0000)]
xlate
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651511 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 13 Jan 2015 20:43:17 +0000 (20:43 +0000)]
Insert htaccess/RewriteRule examples, illustrating how RewriteRule
syntax is weird in .htaccess files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651482 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 13 Jan 2015 18:13:43 +0000 (18:13 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651433 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 12 Jan 2015 15:45:27 +0000 (15:45 +0000)]
fcgi trunk proposals, these are not must-haves for 2.4.11.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651124 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jan 2015 14:01:23 +0000 (14:01 +0000)]
Merge r1649632, r1649966 from trunk:
Be consistant with the code below which accepts lower or upper case.
Add CHANGE for r1649632
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651097 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jan 2015 14:00:26 +0000 (14:00 +0000)]
Merge r1649043 from trunk:
mod_proxy_ajp: Fix get_content_length().
clength in request_rec is for response sizes,
not request body size. It is initialized to 0,
so the "if" branch was never taken.
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651096 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jan 2015 13:59:57 +0000 (13:59 +0000)]
Merge r1648719 from trunk:
split-logfile: Fix perl error: 'Can't use string ("example.org:80")
as a symbol ref while "strict refs"'. PR 56329.
Submitted By: Holger Mauermann <mauermann gmail.com>
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@
1651095 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jan 2015 13:59:22 +0000 (13:59 +0000)]
Merge r1648433 from trunk:
PR 56603: Inappropiate ProxyPassReverse match when interpolated URL
is empty string
Submitted By: <ajprout hotmail.com>
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@
1651094 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jan 2015 13:58:25 +0000 (13:58 +0000)]
promotes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651093 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jan 2015 13:57:36 +0000 (13:57 +0000)]
VOTEs baby!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651092 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 12 Jan 2015 13:45:47 +0000 (13:45 +0000)]
propose conn_rec.id fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651090 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jan 2015 13:39:42 +0000 (13:39 +0000)]
Merge r1626978 from trunk:
mod_cgi: log cgi script stderr to ScriptLog, use APLOGNO for log_scripterror
errors.
Submitted by: jkaluza
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651086 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jan 2015 13:39:33 +0000 (13:39 +0000)]
Merge r1626978 from trunk:
mod_cgi: log cgi script stderr to ScriptLog, use APLOGNO for log_scripterror
errors.
Submitted by: jkaluza
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651085 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jan 2015 13:39:07 +0000 (13:39 +0000)]
Merge r1512819, r1513461 (part of it), r1565777, r1643538 from trunk:
* core: Add ap_log_data(), ap_log_rdata(), etc. for logging buffers.
Submitted by: Jeff Trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651084 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jan 2015 13:38:02 +0000 (13:38 +0000)]
Merge r1643825 from trunk:
* core: Fix -D[efined] or <Define>[d] variables lifetime accross restarts.
PR 57328.
Submitted-by: Armin Abfalterer <a.abfalterer gmail.com>
Reviewed/Committed-by: ylavic
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651083 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jan 2015 13:37:20 +0000 (13:37 +0000)]
Merge r1588527 from trunk:
mod_proxy: Preserve original request headers even if they differ
from the ones to be forwarded to the backend. PR 45387.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651082 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jan 2015 13:36:17 +0000 (13:36 +0000)]
Merge r1598946, r1602989 from trunk:
Fix computation of the size of 'struct sockaddr_un' when passed to 'connect()'.
Use the same logic as the one in ' in 'proxy_util.c'.
mod_proxy: Don't limit the size of the connectable Unix Domain Socket paths.
Since connect() to UDS path is used at several places, introduce
ap_proxy_connect_uds() in proxy_util.
Submitted by: jailletc36, ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651081 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jan 2015 13:34:53 +0000 (13:34 +0000)]
Merge r1601291, r1601630 from trunk:
mod_proxy: Shutdown (eg. SSL close notify) the backend connection
before closing.
mod_proxy: follow up to r1601291.
Since deferred_write_pool is needed by the core_output_filter and is a subpool
of the connection, shutdown in a pre_cleanup of the connection's pool to avoid
a freed memory access (SEGV).
Reported By: takashi
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651080 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jan 2015 13:32:18 +0000 (13:32 +0000)]
Merge r1601919, r1650061 from trunk:
mod_ssl: dump SSL IO/state for the write side of the connection(s), like reads.
mod_ssl: follow up to r1601919.
Likewise when set from SNI callback.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651078 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jan 2015 13:31:16 +0000 (13:31 +0000)]
Merge r1601184, r1601274, r1601185 from trunk:
mod_ssl: Ensure that the SSL close notify alert is flushed to the client.
PR54998.
Submitted By: Tim Kosse <tim.kosse filezilla-project.org>, ylavic
Committed By: ylavic
mod_ssl: SSL_smart_shutdown(): follow up to r1601184.
Use SSL_get_wbio() to comply with OPENSSL_NO_SSL_INTERN.
Stop SSL shutdown loop when flush fails.
mpm_event[opt]: Send the SSL close notify alert when the KeepAliveTimeout
expires. PR54998.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651077 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 11 Jan 2015 19:45:59 +0000 (19:45 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650956 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 10 Jan 2015 17:29:43 +0000 (17:29 +0000)]
vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650773 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 9 Jan 2015 21:33:12 +0000 (21:33 +0000)]
Merge r1640495, r1644031 from trunk
* mod_proxy_fcgi: Ignore body data from backend for 304 responses. PR 57198.
Submitted by: jkaluza
Reviewed by: jkaluza, ylavic, covener
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650677 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 9 Jan 2015 20:51:03 +0000 (20:51 +0000)]
Merge r1630947, r1645670 from trunk
* mod_ssl: Check if we are having an SSL connection before looking up SSL
related variables during expression evaluation to avoid a crash.
If not return NULL as ssl_var_lookup_ssl does by default. PR 57070
Submitted by: rpluem
Reviewed by: jailletc36, ylavic, covener
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650659 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 9 Jan 2015 20:37:50 +0000 (20:37 +0000)]
Merge r1644503 from trunk
* mod_proxy_ajp: Fix handling of the default port (8009) in the
ProxyPass and <Proxy> configurations. PR 57259.
Submitted by: ylavic
Reviewed by: ylavic, jim, covener
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650655 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 9 Jan 2015 20:26:06 +0000 (20:26 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650648 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Jan 2015 16:25:54 +0000 (16:25 +0000)]
Add copy and paste typo fix to proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650323 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Jan 2015 16:07:03 +0000 (16:07 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650319 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Jan 2015 16:05:53 +0000 (16:05 +0000)]
Add some easy votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650318 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Jan 2015 15:45:34 +0000 (15:45 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650313 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 7 Jan 2015 14:24:03 +0000 (14:24 +0000)]
Update mod_ssl's IO/state dump proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650063 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 14:02:18 +0000 (14:02 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1649337 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 14:01:33 +0000 (14:01 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1649336 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 13:58:17 +0000 (13:58 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1649335 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 13:52:00 +0000 (13:52 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1649334 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 3 Jan 2015 15:39:40 +0000 (15:39 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1649213 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 3 Jan 2015 15:38:43 +0000 (15:38 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1649212 13f79535 -47bb-0310-9956-
ffa450edef68