]>
granicus.if.org Git - apache/log
Jim Jagielski [Sat, 9 Nov 2013 14:37:23 +0000 (14:37 +0000)]
* mod_headers: Allow for format specifiers to be used in the base
substitution string when using Header edit
trunk patch: http://people.apache.org/~druggeri/patches/HeaderEditENV.trunk.patch
2.4.x patch: http://people.apache.org/~druggeri/patches/HeaderEditENV.2.4.patch
+1: druggeri, covener, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1540313 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 9 Nov 2013 14:36:18 +0000 (14:36 +0000)]
Merge r1531961 from trunk:
Support optional initialization arguments for socache providers in
mod_authn_socache.
Submitted by: chrisd
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1540312 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 9 Nov 2013 14:35:16 +0000 (14:35 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1540311 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 9 Nov 2013 14:34:49 +0000 (14:34 +0000)]
votes and proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1540310 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 8 Nov 2013 23:37:32 +0000 (23:37 +0000)]
Add a comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1540219 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 6 Nov 2013 17:02:48 +0000 (17:02 +0000)]
This note seems to fit nicely into the 'OTHER' proposals section
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1539398 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 6 Nov 2013 16:52:50 +0000 (16:52 +0000)]
Press [pause], there's a section for this
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1539395 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 4 Nov 2013 22:53:47 +0000 (22:53 +0000)]
propose, vote, question mod_auth_form
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1538797 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 1 Nov 2013 12:48:58 +0000 (12:48 +0000)]
Fixes to the modguide, courtesy of Petter Berntsen (sluggr)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1537916 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Fri, 1 Nov 2013 05:10:09 +0000 (05:10 +0000)]
move stray /i switch into proper location
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1537823 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Wed, 30 Oct 2013 14:48:19 +0000 (14:48 +0000)]
Doc : introducing french translation for getting-started
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1537117 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Wed, 30 Oct 2013 14:33:40 +0000 (14:33 +0000)]
Doc : reordering a section for better understanding
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1537109 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 28 Oct 2013 14:32:36 +0000 (14:32 +0000)]
Transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1536368 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 28 Oct 2013 14:31:56 +0000 (14:31 +0000)]
Merge
1536310 from trunk:
* docs/manual/upgrading.xml: Note 2.4 backwards-compat break for
some piped logging configurations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1536367 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Oct 2013 12:03:26 +0000 (12:03 +0000)]
Merge r1531683 from trunk:
mod_session: Reset the max-age on session save. PR 47476.
Submitted by: minfrin
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1536321 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Oct 2013 12:02:17 +0000 (12:02 +0000)]
Merge r1531679 from trunk:
mod_session: After parsing the value of the header specified by the
SessionHeader directive, remove the value from the response. PR 55279.
Submitted by: minfrin
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1536320 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Oct 2013 12:00:51 +0000 (12:00 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1536318 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 26 Oct 2013 19:05:56 +0000 (19:05 +0000)]
Merge r1536021 from trunk:
this was backported to 2.2, so not an upgrade issue.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1536022 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 26 Oct 2013 14:34:36 +0000 (14:34 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1535996 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Fri, 25 Oct 2013 17:23:21 +0000 (17:23 +0000)]
easy votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1535793 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Fri, 25 Oct 2013 17:20:42 +0000 (17:20 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1535790 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Oct 2013 15:40:09 +0000 (15:40 +0000)]
note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1534227 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 20 Oct 2013 18:39:38 +0000 (18:39 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1533945 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 19 Oct 2013 14:12:18 +0000 (14:12 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1533769 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 19 Oct 2013 13:50:06 +0000 (13:50 +0000)]
merge wording improvement r1533224 from trunk:
s/sometimes maybe not what/sometimes may not be what/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1533763 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 19 Oct 2013 12:49:59 +0000 (12:49 +0000)]
Remove erroneous space reported in pr55676
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1533749 13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Sat, 19 Oct 2013 02:54:49 +0000 (02:54 +0000)]
Propose mod_authn_socache provider argument support.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1533680 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Oct 2013 13:38:15 +0000 (13:38 +0000)]
Merge r1529559, r1531505 from trunk:
Fix PR 55397: dav_resource->uri treated as an unparsed uri.
The change made for PR 54611 caused this field to be treated as
unescaped. mod_dav_svn however, provided escaped URIs. Essentially
breaking support for paths with non-URI safe characters in SVN.
Adjust the code so that dav_resource->uri is assumed to be escaped and
adjust mod_dav_fs so that it uses escaped URIs in this field.
* modules/dav/fs/repos.c
(dav_fs_get_resource): Use the unparsed_uri to contruct the resource uri.
* modules/dav/main/mod_dav.c
(dav_xml_escape_uri): Do not uri escape, just handle xml escaping.
(dav_created): Assume that locn if provided is escaped.
(dav_method_copymove, dav_method_bind): Use the unparsed_uri on the request
when calling dav_created() to adjust to locn assuming it is escaped.
* modules/dav/main/mod_dav.h
(dav_resource): Document that uri is escaped.
Followup to r1529559: mod_dav_fs: Fix encoding of hrefs in PROPFIND response.
Previous commit missed encoding the names of the children of the PROPFIND
request when the depth wasn't 0.
* modules/dav/fs/repos.c
(dav_fs_append_uri): New function
(dav_fs_walker): Use dav_fs_append_uri() and adjust length calculations to
use the encoded length.
Submitted by: breser
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1533448 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Oct 2013 13:36:21 +0000 (13:36 +0000)]
Merge r1528718 from trunk:
mod_dav: Fix PR 55306.
Makes mod_dav no longer require that the lock token be provided when the
source of a COPY is locked. The prior behavior was in violating of
RFC 4918 which says that the lock token is only required on resources
that may be modified by the method.
* modules/dav/main/mod_dav.h
(DAV_VALIDATE_NO_MODIFY): New flag to be passed to dav_validate_* functions.
* modules/dav/main/mod_dav.c
(dav_method_copymove): Use the new flag when calling dav_validate_request()
on the COPY source.
* modules/dav/main/util.c
(dav_validate_resource_state): Use the flag to decide to ignore if the lock
token is not provided.
Submitted by: breser
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1533447 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Oct 2013 13:33:21 +0000 (13:33 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1533446 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Oct 2013 13:33:02 +0000 (13:33 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1533445 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 17 Oct 2013 20:42:28 +0000 (20:42 +0000)]
Grammar. Rebuild other stuff.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1533256 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 17 Oct 2013 18:24:53 +0000 (18:24 +0000)]
Broken markup in example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1533199 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 17 Oct 2013 05:08:06 +0000 (05:08 +0000)]
Correct URL for trunk patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1532964 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 16 Oct 2013 17:42:35 +0000 (17:42 +0000)]
generated from "make docs"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1532826 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 16 Oct 2013 17:23:18 +0000 (17:23 +0000)]
Merge r1532816 from trunk:
Interpolation worked within the scheme portion of URLs for
ProxyPass and ProxyPassReverse until a fix to apr_uri_parse()
in APR-Util 1.5.2 closed the hole that had previously allowed
the necessary {} characters within the scheme.
Lack of support for interpolation within the scheme will be a
permanent limitation.
The mod_proxy documentation is updated to provide an alternate
configuration solution.
PR: 55315
Submitted by: Mike Rumph <mike.rumph oracle.com>
Tweaked by: trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1532824 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 14 Oct 2013 14:37:03 +0000 (14:37 +0000)]
hyphenate websocket-aware
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1531914 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 13 Oct 2013 13:09:44 +0000 (13:09 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1531684 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 13 Oct 2013 12:36:07 +0000 (12:36 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1531681 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 13 Oct 2013 12:20:23 +0000 (12:20 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1531678 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 13 Oct 2013 11:20:36 +0000 (11:20 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1531669 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Sat, 12 Oct 2013 16:51:58 +0000 (16:51 +0000)]
* STATUS: Nominate changes for PR 55397
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1531559 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 12 Oct 2013 15:07:03 +0000 (15:07 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1531539 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 10 Oct 2013 14:34:19 +0000 (14:34 +0000)]
Merge r1526666, r1527220 from trunk:
WinNT MPM: Exit the child if the parent process crashes or is terminated.
Submitted by: Oracle, via trawick
The original modification was made some years ago for Oracle HTTP Server
by an Oracle employee. trawick made additional changes for style and
for trunk/2.4.x changes.
Follow up to r1526666:
Use SYNCHRONIZE instead of PROCESS_ALL_ACCESS because
a. it is sufficient
b. it avoids an issue where PROCESS_ALL_ACCESS is larger on
newer SDKs, resulting in a run-time error when running on
older Windows
Close the handle.
Submitted by: Ivan Zhakov <ivan visualsvn.com>
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1531000 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 10 Oct 2013 14:32:59 +0000 (14:32 +0000)]
Merge r1530793 from trunk:
core: Don't truncate output when sending is interrupted by a signal,
such as from an exiting CGI process.
PR: 55643
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530999 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 10 Oct 2013 14:31:20 +0000 (14:31 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530998 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 10 Oct 2013 14:31:00 +0000 (14:31 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530997 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 10 Oct 2013 12:29:46 +0000 (12:29 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530938 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 10 Oct 2013 12:03:51 +0000 (12:03 +0000)]
propose a WinNT fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530932 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 9 Oct 2013 23:16:46 +0000 (23:16 +0000)]
PR 55643?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530830 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 9 Oct 2013 07:14:57 +0000 (07:14 +0000)]
Break long lines.
Add missing <code></code>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530513 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 8 Oct 2013 15:36:12 +0000 (15:36 +0000)]
add a blurb for r1530279 -- null device name on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530311 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 8 Oct 2013 14:28:32 +0000 (14:28 +0000)]
skiplist v3 :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530288 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 8 Oct 2013 14:19:55 +0000 (14:19 +0000)]
Merge r1524079 from trunk:
mod_session_crypto: Add support for exec: calls to obtain key similar to
mod_ssl and mod_authnz_ldap. Essentially copypasta from mod_authnz_ldap...
Submitted by: druggeri
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530281 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 8 Oct 2013 14:18:44 +0000 (14:18 +0000)]
Merge r1529014 from trunk:
core: Add missing Reason-Phrase in HTTP response headers.
PR 54946.
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530280 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 8 Oct 2013 14:17:33 +0000 (14:17 +0000)]
Merge r1527008 from trunk:
Fix the null device name on Windows so that stderr can be sent
to the bit bucket. (This logic is always hit when using an error
log provider.)
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530279 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 8 Oct 2013 14:17:00 +0000 (14:17 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530278 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 8 Oct 2013 14:16:00 +0000 (14:16 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530277 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 8 Oct 2013 06:04:52 +0000 (06:04 +0000)]
Fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530162 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Mon, 7 Oct 2013 20:02:48 +0000 (20:02 +0000)]
Merge r1529449 from trunk:
* WinNT MPM: Follow MS docs on AcceptEx/GetAcceptExSockaddrs
Submitted By: trawick
Reviewed By: covener, gsmith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530045 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Mon, 7 Oct 2013 19:41:19 +0000 (19:41 +0000)]
Merge r1529449 from trunk:
* core: Axe MSVC warning for http_protocol.c (issued about 128 times
with a 2.4.x build)
Submitted By: trawick
Reviewed By: covener, gsmith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530038 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Mon, 7 Oct 2013 19:35:52 +0000 (19:35 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530037 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 7 Oct 2013 19:12:57 +0000 (19:12 +0000)]
Merge r1528556 from trunk:
*) mod_rewrite: Make rewrite websocket aware to allow proxying.
PR 55598. [Chris Harris <chris.harris kitware com>]
Submitted By: [Chris Harris <chris.harris kitware com>
Reviewed By: jim, rjung, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530032 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 7 Oct 2013 19:09:31 +0000 (19:09 +0000)]
vote/promote some small ones
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1530031 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 7 Oct 2013 16:28:43 +0000 (16:28 +0000)]
propose yet another Windows glitch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1529993 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 6 Oct 2013 23:18:43 +0000 (23:18 +0000)]
propose another Windows fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1529713 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 6 Oct 2013 21:40:03 +0000 (21:40 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1529696 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 5 Oct 2013 13:10:01 +0000 (13:10 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1529448 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 5 Oct 2013 12:50:21 +0000 (12:50 +0000)]
Add comment regarding skiplist requirement
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1529443 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Fri, 4 Oct 2013 20:07:57 +0000 (20:07 +0000)]
merge r1529277 from trunk
WebSocket support requires Winsock2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1529278 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 3 Oct 2013 21:54:42 +0000 (21:54 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1529017 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 3 Oct 2013 18:55:16 +0000 (18:55 +0000)]
* mod_ldap: Don't filter subgroups on cn=*
Proposed by: covener
Reviewed by: jim, rjung
Backport of r1528143 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528970 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 3 Oct 2013 18:52:55 +0000 (18:52 +0000)]
Multiple backports from trunk:
- rotatelog: Factor out from doRotate, main; make error handling consistant
and print the actual error to stderr
PR 45084
Backport of r1374247 from trunk.
- rotatelog: Cleanups, no functional change. Drop revision history,
"svn log" works; use APR_PATH_MAX; constify more
Backport of r1409800 from trunk.
- rotatelog: error[120] is already defined in this function. Just use
it instead of shadowing.
Backport of r1416121 from trunk.
- rotatelog: Use apr_snprintf(... "%pm"...) instead of explicit call
to apr_strerror
Backport of r1463736 from trunk.
- mod_deflate: style fix (no code change)
Backport of r1499679 from trunk.
- mod_socache_shmcb: Correct the use of the printf formatter.
Backport of r1493925 from trunk.
- mod_cache_socache: Fixed signed<->unsigned compiler warning.
Backport of r1490550 from trunk.
- mod_ssl: add missing space between directive description and syntax
Backport of r1509983 from trunk.
- mpm/winnt: style consistency in winnt's worker_main
Backport of r1520760 from trunk.
Proposed by: jailletc36
Reviewed by: jim, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528969 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 3 Oct 2013 18:44:04 +0000 (18:44 +0000)]
ab: Add wait time, fix processing time, and output write errors only if
they occured.
§rd patch of P45355.
Proposed by: jailletc36
Reviewed by: jim, rjung
Backport of r1488471 from turnk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528965 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 3 Oct 2013 18:35:41 +0000 (18:35 +0000)]
worker MPM: Don't forcibly kill worker threads if the child process is
exiting gracefully.
Submitted by: Oracle, via trawick
This modification was made some years ago for Oracle HTTP Server
by an Oracle employee.
Proposed by: trawick
Reviewed by: jim, rjung
Backport of r1526220 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528962 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 3 Oct 2013 18:31:22 +0000 (18:31 +0000)]
Wildcard name-based vhosts printed twice in apachectl -S
PR54948
Proposed by: covener
Reviewed by: jim, rjung
Backport of r1485675 and r1525000 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528958 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 3 Oct 2013 18:22:48 +0000 (18:22 +0000)]
Add AuthBasicUseDigestAlgorithm directive to allow migration of
passwords from digest to basic authentication.
Proposed by: chrisd
Reviewed by: jim, rjung
Backport of r1514064 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528957 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 3 Oct 2013 16:44:47 +0000 (16:44 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528926 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 3 Oct 2013 16:42:19 +0000 (16:42 +0000)]
Add some love and peace.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528925 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 3 Oct 2013 11:38:33 +0000 (11:38 +0000)]
ldap vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528815 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Thu, 3 Oct 2013 06:13:11 +0000 (06:13 +0000)]
Propose PR 55306 fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528728 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 2 Oct 2013 18:13:35 +0000 (18:13 +0000)]
follow up r1528438
skiplist now in apr 1.5
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528584 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 2 Oct 2013 16:41:24 +0000 (16:41 +0000)]
Backport PR 55598 fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528557 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 2 Oct 2013 12:28:48 +0000 (12:28 +0000)]
Since skiplist is now in apr, adjust patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528443 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 2 Oct 2013 12:20:14 +0000 (12:20 +0000)]
remove... now in apr 1.5
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528438 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Tue, 1 Oct 2013 17:27:20 +0000 (17:27 +0000)]
propose mod_ssl (EC)DH ephemeral keying patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528154 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 1 Oct 2013 16:44:15 +0000 (16:44 +0000)]
propose a small mod_ldap contribution
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528145 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 1 Oct 2013 12:00:42 +0000 (12:00 +0000)]
ez votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528059 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 1 Oct 2013 11:55:34 +0000 (11:55 +0000)]
this was also added.... fold into 1 userland change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528058 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 1 Oct 2013 11:53:33 +0000 (11:53 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528057 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 1 Oct 2013 11:52:38 +0000 (11:52 +0000)]
Merge r1488644 from trunk:
Add a new -l parameter in order not to check the length of the responses. This can be usefull with dynamic pages.
PR9945, PR27888, PR42040
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528053 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 1 Oct 2013 11:51:44 +0000 (11:51 +0000)]
Merge r1451849 from trunk:
The 2 first patches from PR45355 have been ported
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1528052 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 1 Oct 2013 09:18:13 +0000 (09:18 +0000)]
Proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1527982 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 30 Sep 2013 19:19:18 +0000 (19:19 +0000)]
vote/promote/note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1527725 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 30 Sep 2013 13:47:28 +0000 (13:47 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1527566 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 29 Sep 2013 07:13:09 +0000 (07:13 +0000)]
Proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1527278 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Sep 2013 15:29:47 +0000 (15:29 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1527201 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 26 Sep 2013 19:02:33 +0000 (19:02 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1526642 13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Thu, 26 Sep 2013 17:54:24 +0000 (17:54 +0000)]
Follow up to r1526598: add missing util_fcgi source files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1526631 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 26 Sep 2013 16:46:28 +0000 (16:46 +0000)]
Merge r1513492 from trunk:
follow up to r1513454: fill in missing log number
Submitted by: trawick
Reviewed/backported by: jim
* util_fcgi API to 2.4.x (allows mod_proxy_fcgi to be kept in sync, along
with other less important reasons)
trunk: http://svn.apache.org/r1513454 and http://svn.apache.org/r1513492
2.4.x: copy server/util_fcgi.c and include/util_fcgi.h, then apply
http://people.apache.org/~trawick/patch-after-copying-util_fcgi-splat.txt
+1: trawick, jim, chrisd
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1526598 13f79535 -47bb-0310-9956-
ffa450edef68