]>
granicus.if.org Git - apache/log
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
Jim Jagielski [Thu, 13 Mar 2014 11:19:28 +0000 (11:19 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1577115 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 12 Mar 2014 20:46:02 +0000 (20:46 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1576898 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 12 Mar 2014 20:44:38 +0000 (20:44 +0000)]
Replace FilesMatch with Files where appropriate
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1576896 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 12 Mar 2014 20:06:05 +0000 (20:06 +0000)]
Looks correct. Not applicable to 2.2.x, so far as I can tell?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1576876 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 12 Mar 2014 16:04:52 +0000 (16:04 +0000)]
Propose fix for ssl crash...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1576798 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Wed, 12 Mar 2014 13:08:09 +0000 (13:08 +0000)]
Propose r1576233 to backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1576725 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 11 Mar 2014 21:10:01 +0000 (21:10 +0000)]
Fix 2.4.8 release year.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1576504 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 11 Mar 2014 20:47:55 +0000 (20:47 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1576499 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 11 Mar 2014 20:45:15 +0000 (20:45 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1576498 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 11 Mar 2014 18:38:49 +0000 (18:38 +0000)]
fix spelling error in CVE-2014-0098 entry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1576466 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 11 Mar 2014 16:45:56 +0000 (16:45 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1576419 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 11 Mar 2014 16:44:07 +0000 (16:44 +0000)]
Ensure that .lua.foo files aren't affected
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1576416 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 11 Mar 2014 16:17:33 +0000 (16:17 +0000)]
And we are 2.4.9-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1576408 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 11 Mar 2014 16:14:43 +0000 (16:14 +0000)]
Get ready to tag 2.4.8
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1576406 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 11 Mar 2014 16:12:58 +0000 (16:12 +0000)]
Log CVE for change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1576403 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 10 Mar 2014 19:05:40 +0000 (19:05 +0000)]
Typo in comment (was r1575958)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1576050 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 10 Mar 2014 13:13:45 +0000 (13:13 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575935 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 10 Mar 2014 13:04:03 +0000 (13:04 +0000)]
Merge r1524192, r1524770, r1527925, r1541270, r1541368 from trunk:
Update rationale
draft-ietf-httpbis-p1-messaging-23 fixes regarding interactions
between TE and content-length in the same req/resp.
PR 55616 (add missing APLOGNO), part 1
Wrap at 80 still, here at httpd project
Use a distinguishing APLOGNO for unk t-e with read-until-close behavior
Submitted by: jim, kbrand, wrowe, wrowe
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575934 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 10 Mar 2014 12:56:11 +0000 (12:56 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575926 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 10 Mar 2014 11:52:26 +0000 (11:52 +0000)]
Merge r1423933 from trunk:
On NetWare skip these unsupported function prototypes.
Submitted by: fuankg
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575914 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 10 Mar 2014 11:51:50 +0000 (11:51 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575913 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 10 Mar 2014 11:51:31 +0000 (11:51 +0000)]
just in case
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575912 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 10 Mar 2014 11:47:29 +0000 (11:47 +0000)]
niche-platform-specific build fix: does it even need a vote?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575911 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 10 Mar 2014 11:23:47 +0000 (11:23 +0000)]
Merge r1575400 from trunk:
CVE-2014-0098 (reported by Rainer Canavan <rainer-apache 7val com>)
Segfaults w/ truncated cookie logging.
Clean up the cookie logging parser to recognize only the cookie=value pairs,
not valueless cookies. This refactors multiple passes over the same string
buffer into a single pass parser.
Submitted by: wrowe
Reviewed by: rpluem, jim
Submitted by: wrowe
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575904 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 10 Mar 2014 11:15:33 +0000 (11:15 +0000)]
Vote and promote r1575400.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575900 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 10 Mar 2014 10:54:02 +0000 (10:54 +0000)]
ivote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575898 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 10 Mar 2014 01:29:43 +0000 (01:29 +0000)]
Added proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575790 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 10 Mar 2014 00:57:32 +0000 (00:57 +0000)]
Fixed mod_lua NetWare build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575784 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 10 Mar 2014 00:48:47 +0000 (00:48 +0000)]
Added missing proxy export symbols.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575783 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 9 Mar 2014 21:31:42 +0000 (21:31 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575775 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 9 Mar 2014 21:30:55 +0000 (21:30 +0000)]
copy/paste errors in new directive DirectoryCheckHandler
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575774 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 8 Mar 2014 22:56:14 +0000 (22:56 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575629 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 8 Mar 2014 17:39:43 +0000 (17:39 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575579 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 7 Mar 2014 21:08:02 +0000 (21:08 +0000)]
Rebuild HTML
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575409 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 7 Mar 2014 21:07:22 +0000 (21:07 +0000)]
As per comment, removing quotes makes the example work
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575408 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 7 Mar 2014 21:02:18 +0000 (21:02 +0000)]
With enough eyeballs, all bugs are shallow. One more for your consideration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1575404 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 6 Mar 2014 06:01:30 +0000 (06:01 +0000)]
No... I mean, really, really?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1574777 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 5 Mar 2014 15:03:01 +0000 (15:03 +0000)]
backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1574519 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 5 Mar 2014 13:31:20 +0000 (13:31 +0000)]
Merge r1562472, r1561262, r1561923, r1574151 from trunk:
More debugging
More debug messaging... useful for tracking down
if we used attach or create
c89 fix
follow-up to r1562472,
1561262 , and
1561923 :
Improve messaging...
* easier to tell what went wrong in some cases
* reduce number of debug messages without losing information in some cases
Submitted by: jim, covener, trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1574476 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 5 Mar 2014 13:30:00 +0000 (13:30 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1574474 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 5 Mar 2014 13:29:37 +0000 (13:29 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1574472 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 5 Mar 2014 00:06:58 +0000 (00:06 +0000)]
s/whine/vote/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1574264 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 4 Mar 2014 21:35:00 +0000 (21:35 +0000)]
Vote for r1574151 to be included in mod_slotmem_shm logs' changeset
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1574217 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 4 Mar 2014 17:47:41 +0000 (17:47 +0000)]
cloudy in southeastern New Mexico for some reason
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1574155 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 3 Mar 2014 21:34:27 +0000 (21:34 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573760 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 3 Mar 2014 15:41:43 +0000 (15:41 +0000)]
Set mod_slotmem_shm patches in correct order to be applyable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573588 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 3 Mar 2014 15:25:59 +0000 (15:25 +0000)]
Vote for mod_slotmem_shm without ftok().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573583 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 3 Mar 2014 15:02:45 +0000 (15:02 +0000)]
Backport r1557639 r1557640 from trunk
restore http://svn.apache.org/viewvc?view=revision&revision=233369
under a configurable option: don't run mod_dir if r->handler is already set.
Backported by: covner
Reviewed By: jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573580 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 3 Mar 2014 15:02:00 +0000 (15:02 +0000)]
Vote for mod_slotmem_shm debugging logs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573578 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 3 Mar 2014 14:54:14 +0000 (14:54 +0000)]
Promote DirectoryCheckHandler.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573575 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 3 Mar 2014 14:51:04 +0000 (14:51 +0000)]
Vote for DirectoryCheckHandler.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573574 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 2 Mar 2014 20:21:23 +0000 (20:21 +0000)]
Merge r1553204, r1555240, r1572198 from trunk:
* Do not perform SNI / Host header comparison in case of a forward proxy request as
in case of a forward proxy request the host header can not be used for virtual
host selection in our webserver.
* Update comment. No functional change.
* Put a note in CHANGES about r1553204
Submitted by: rpluem
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573362 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 2 Mar 2014 20:20:14 +0000 (20:20 +0000)]
Merge r1546804, r1553824, r1554192, r1555463, r1555467, r1563417, r1564760, r1565081 from trunk:
Throw away the myCtxVar{Set,Get} abomination and introduce
a pphrase_cb_arg_t struct instead, for passing stuff between
ssl_pphrase_Handle and ssl_pphrase_Handle_CB. Prefer struct
members instead of using additional local variables, to make
the data flow more transparent. (Doesn't "vastly simplify"
the code yet, but hopefully we'll get there when further
stripping down ssl_pphrase_Handle.)
Remove the hardcoded algorithm-type dependency for the SSLCertificateFile
and SSLCertificateKeyFile directives, and deprecate SSLCertificateChainFile
Splitting the patch into smaller pieces turned out to be infeasible,
unfortunately, due to the heavily intertwined code in ssl_engine_config.c,
ssl_engine_init.c and ssl_engine_pphrase.c, which all depends on the
modssl_pk_server_t data structure. For better comprehensibility,
a detailed listing of the changes follows:
ssl_private.h
- drop the X509 certs and EVP_PKEY keys arrays from modssl_pk_server_t
- use apr_array_header_t for cert_files and key_files
- drop tPublicCert from SSLModConfigRec
- drop the ssl_algo_t struct and the SSL_ALGO_* and SSL_AIDX_* constants
ssl_engine_config.c
- change to apr_array_header_t for SSLCertificate[Key]File
- drop ssl_cmd_check_aidx_max, i.e. allow an arbitrary number of certs
and keys (in theory; currently OpenSSL does not support more than
one cert/key per algorithm type)
- add deprecation warning for SSLCertificateChainFile
ssl_engine_init.c
- configure server certs/keys in ssl_init_server_certs (no longer via
ssl_pphrase_Handle in ssl_init_Module)
- in ssl_init_server_certs, read in certificates and keys with standard
OpenSSL API functions (SSL_CTX_use_*_file), and only fall back to
ssl_load_encrypted_pkey when encountering an encrypted private key
- drop ssl_server_import_cert, ssl_server_import_key, ssl_init_server_check,
and ssl_init_ctx_cleanup_server
- move the "problematic re-initialization" check to ssl_init_server_ctx
ssl_engine_pphrase.c
- use servername:port:index as the key identifier, instead of the
previously used servername:port:algorithm
- ssl_pphrase_Handle overhaul: remove all cert/public-key handling,
make it only load a single (encrypted) private key, and rename
to ssl_load_encrypted_pkey
- in the passphrase prompt message, show the private key file name
instead of the vhost id and the algorithm name
- do no longer supply the algorithm name as an argument to "exec"-type
passphrase prompting programs
ssl_util.c
- drop ssl_util_algotypeof, ssl_util_algotypestr, ssl_asn1_keystr,
and ssl_asn1_table_keyfmt
ssl_util_ssl.{c,h}
- drop SSL_read_X509
- constify the filename arg for SSL_read_PrivateKey
CodeWarrior compiler doesnt allow vars as struct inits.
Remove per-certificate chain handling code (obsoleted by
https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=
b9fa413a08d436d6b522749b5e808fcd931fd943 )
make the ppcb_arg initialization a bit more uniform and easier to read
Followup fix for r1553824:
also pass the file name to ssl_load_encrypted_pkey, to make sure that we
retry with the same filename we used for SSL_CTX_use_PrivateKey_file first
With OpenSSL 1.0.2 or later, enable OCSP stapling in a loop based on
SSL_CTX_set_current_cert(), near the end of ssl_init_server_ctx.
update APLOGNO for r1564760
Submitted by: kbrand, fuankg, kbrand, kbrand, kbrand, kbrand, kbrand
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573360 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 2 Mar 2014 20:18:03 +0000 (20:18 +0000)]
Merge r1572543 from trunk:
Cleanup the client to backend brigade before returning an error (if any) to avoid buckets lifetime issues (backend connection's pool destroyed before request's one). PR 50335.
Suggested by rpluem.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573359 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 2 Mar 2014 20:17:40 +0000 (20:17 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573358 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 2 Mar 2014 20:17:14 +0000 (20:17 +0000)]
Merge r1568404 from trunk:
mod_proxy_http: don't recycle backend connections known to be closed (eg. EOS by close).
This saves a useless ap_is_socket_connected() call when reused.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573357 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 2 Mar 2014 20:16:52 +0000 (20:16 +0000)]
Merge r1570598 from trunk:
Log an error in mod_proxy_http when reading the request body fails.
Follow-up to r1538776 where incomplete bodies are detected and an error returned through the input filters.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573356 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 2 Mar 2014 20:05:59 +0000 (20:05 +0000)]
* Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573353 13f79535 -47bb-0310-9956-
ffa450edef68
Stephen Henson [Sun, 2 Mar 2014 18:23:36 +0000 (18:23 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573335 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 2 Mar 2014 14:33:26 +0000 (14:33 +0000)]
vote for 'skip SNI check for forward proxy requests' proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573314 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sun, 2 Mar 2014 14:06:21 +0000 (14:06 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573310 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sun, 2 Mar 2014 14:05:36 +0000 (14:05 +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@
1573309 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sun, 2 Mar 2014 12:20:53 +0000 (12:20 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1573293 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sun, 2 Mar 2014 12:20:04 +0000 (12:20 +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@
1573292 13f79535 -47bb-0310-9956-
ffa450edef68