]>
granicus.if.org Git - apache/log
Jim Jagielski [Tue, 2 Dec 2014 12:47:58 +0000 (12:47 +0000)]
Merge r1635644 from trunk:
mod_proxy_wstunnel: abort backend connection on polling error to avoid
further processing (lingering close, SSL shutdown).
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642856 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Dec 2014 12:47:22 +0000 (12:47 +0000)]
Merge r1640040, r1640042 from trunk:
mod_proxy_fcgi, mod_authnz_fcgi: stop reading the response and issue an error
when parsing or forwarding the response fails.
Follow up to r1640040: CHANGES entry.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642855 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Dec 2014 12:45:12 +0000 (12:45 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642854 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Dec 2014 12:44:32 +0000 (12:44 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642853 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Dec 2014 12:43:23 +0000 (12:43 +0000)]
Merge r1635428 from trunk:
core: Do not match files when using DirectoryMatch. PR41867.
Submitted by: jkaluza
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642852 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Dec 2014 12:42:39 +0000 (12:42 +0000)]
Merge r1638073 from trunk:
* server/scoreboard.c: Check for child_num < 0 also in ap_update_child_status
and ap_update_child_status_from_conn. PR 56767.
Submitted by: jkaluza
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642851 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Dec 2014 12:42:12 +0000 (12:42 +0000)]
Merge r1638072 from trunk:
mod_auth_basic: Fix comment mentioning 403 instead of 401.
Submitted by: jkaluza
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642850 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 1 Dec 2014 13:21:29 +0000 (13:21 +0000)]
Votes, promotions, and comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642678 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 30 Nov 2014 18:23:20 +0000 (18:23 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642593 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 30 Nov 2014 18:22:58 +0000 (18:22 +0000)]
Merge r1642590 from trunk:
use an actual list since we're gong to the trouble to use -in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642592 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 30 Nov 2014 18:19:48 +0000 (18:19 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642589 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 30 Nov 2014 18:17:33 +0000 (18:17 +0000)]
Merge r1642581, r1642584 from trunk:
even out some whitespace
add a few more examples per feedback
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642587 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 30 Nov 2014 01:43:52 +0000 (01:43 +0000)]
propose mild mod_lua CVE
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642500 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 29 Nov 2014 23:18:15 +0000 (23:18 +0000)]
propose rewrite usability feature
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642485 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Nov 2014 17:47:19 +0000 (17:47 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642457 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Nov 2014 17:46:40 +0000 (17:46 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642456 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Nov 2014 17:44:43 +0000 (17:44 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642455 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Nov 2014 17:43:43 +0000 (17:43 +0000)]
Typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642454 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Nov 2014 17:41:52 +0000 (17:41 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642453 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Nov 2014 17:40:47 +0000 (17:40 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642452 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 29 Nov 2014 09:25:02 +0000 (09:25 +0000)]
Merge r1638772 from trunk
* mod_ssl: call ERR_free_strings() with OpenSSL >= 0.9.8e. Fixes memory
leak in mod_ssl on graceful restart. PR 53435.
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@
1642404 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 29 Nov 2014 09:22:43 +0000 (09:22 +0000)]
Merge r1533765, r1621419, r1638159, r1638188, r1601603, r1638412, r1418763 from trunk
ssl: Axe needless string duplication in setup for call to apr_proc_create()
Fix sscanf format spotted by cppcheck
fix indent.
fix style
Private function doesn't need ap_ prefix.
tab vs space
rename variables: s should be the server_rec
Submitted by: trawick, jailletc36, jailletc36, jailletc36, takashi, jailletc36, sf
Reviewed by: jailletc36, ylavic, covener
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642403 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 28 Nov 2014 15:28:47 +0000 (15:28 +0000)]
Refer to versions in the release branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642311 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Fri, 28 Nov 2014 08:47:10 +0000 (08:47 +0000)]
Propose r1609680 and r1641381.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642273 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 26 Nov 2014 19:06:38 +0000 (19:06 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1641891 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 26 Nov 2014 19:05:53 +0000 (19:05 +0000)]
Merge r1641888 from trunk:
add a few more expresion examples to illustrate functions and -f
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1641890 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 26 Nov 2014 02:38:08 +0000 (02:38 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1641751 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 26 Nov 2014 02:37:16 +0000 (02:37 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1641750 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 26 Nov 2014 02:29:45 +0000 (02:29 +0000)]
rejigger vote on event backport by adding ylavic's followup.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1641748 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 25 Nov 2014 12:36:15 +0000 (12:36 +0000)]
Propose r1640495.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1641608 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 25 Nov 2014 09:17:41 +0000 (09:17 +0000)]
Merged.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1641552 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 25 Nov 2014 09:17:19 +0000 (09:17 +0000)]
Merge r1640036, r1640331 from trunk:
mod_proxy_fcgi: SECURITY: CVE-2014-3583 (cve.mitre.org)
Fix a potential crash with response headers' size above 8K.
The code changes to mod_authnz_fcgi keep the handle_headers()
function in sync between the two modules. mod_authnz_fcgi
does not have this issue because it allocated a separate byte
for terminating '\0'.
Submitted by: ylavic, trawick
Reviewed by: ylavic, trawick, mrumph
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1641551 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Nov 2014 18:05:09 +0000 (18:05 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1641437 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Nov 2014 18:04:47 +0000 (18:04 +0000)]
Merge r1641434 from trunk:
move text outside of example for readability.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1641436 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Nov 2014 16:18:00 +0000 (16:18 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1641417 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Nov 2014 16:17:39 +0000 (16:17 +0000)]
Merge r1641414 from trunk:
steal the sethandler example from mod_proxy.html and mention worker issue
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1641416 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Nov 2014 12:50:32 +0000 (12:50 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1641387 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Nov 2014 12:50:09 +0000 (12:50 +0000)]
Merge r1641384 from trunk:
the next sentence says:
The URL argument must be parsable as a URL before regexp substitutions (as well as after). This limits the matches you can use. For instance, if we had used
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1641386 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Nov 2014 12:47:27 +0000 (12:47 +0000)]
Merge r1641311, r1641382 from trunk:
surprising but confirmed by comment in mod_proxy
test/document php-fpm with proxy_fcgi
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1641383 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 22 Nov 2014 23:15:45 +0000 (23:15 +0000)]
quick votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1641137 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 20 Nov 2014 18:58:25 +0000 (18:58 +0000)]
Vote for mod_proxy_fcgi fix and add references for APR and APR-util 1.5.x branches.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1640782 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Wed, 19 Nov 2014 08:28:48 +0000 (08:28 +0000)]
Propose r1635428.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1640499 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Wed, 19 Nov 2014 07:10:09 +0000 (07:10 +0000)]
Propose r1638072 and r1638073.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1640494 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 18 Nov 2014 13:23:14 +0000 (13:23 +0000)]
*fcgi fun
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1640339 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 18 Nov 2014 10:15:59 +0000 (10:15 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1640298 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 18 Nov 2014 10:14:54 +0000 (10:14 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1640297 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 16 Nov 2014 22:35:28 +0000 (22:35 +0000)]
Propose new *fcgi fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1640045 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 16 Nov 2014 22:10:14 +0000 (22:10 +0000)]
Propose CVE-2014-3583 fix made minimal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1640037 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 16 Nov 2014 21:46:40 +0000 (21:46 +0000)]
Propose follow-up r1640031.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1640033 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 16 Nov 2014 06:02:53 +0000 (06:02 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1639961 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 15 Nov 2014 01:04:52 +0000 (01:04 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1639820 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 15 Nov 2014 00:44:03 +0000 (00:44 +0000)]
Update fcgi fixes proposals according to Jeff's review.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1639815 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 14 Nov 2014 22:25:18 +0000 (22:25 +0000)]
Propose poll()ing fixes for proxy_connect (PR57168) and proxy_wstunnel.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1639800 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 14 Nov 2014 12:06:34 +0000 (12:06 +0000)]
propose the right event fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1639615 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 14 Nov 2014 02:22:32 +0000 (02:22 +0000)]
yank event proposal, it is about to be superceded in trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1639563 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 13 Nov 2014 06:59:52 +0000 (06:59 +0000)]
Easy proposals to synch 2.4 and trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1639254 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 12 Nov 2014 17:37:31 +0000 (17:37 +0000)]
propose event fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1638882 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 12 Nov 2014 15:54:11 +0000 (15:54 +0000)]
Propose fix for CVE-2014-3583.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1638820 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Wed, 12 Nov 2014 15:32:12 +0000 (15:32 +0000)]
Propose r1638772.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1638817 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 12 Nov 2014 13:11:35 +0000 (13:11 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1638778 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 12 Nov 2014 02:32:06 +0000 (02:32 +0000)]
propose event fix http://svn.apache.org/r1638691 which was regressed in 2.4.10 and 2.4.11
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1638692 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 11 Nov 2014 11:46:49 +0000 (11:46 +0000)]
Merge r1635762 from trunk:
Support custom ErrorDocuments for HTTP 501 and 414 status codes.
PR 57167 [Edward Lu <Chaosed0 gmail.com>]
Submitted By: Edward Lu <Chaosed0 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@
1638071 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 11 Nov 2014 11:45:35 +0000 (11:45 +0000)]
Merge r1632740 from trunk:
mod_cache: avoid unlikely access to freed memory.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1638070 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 11 Nov 2014 11:44:52 +0000 (11:44 +0000)]
Merge r1622450 from trunk:
ab: increase request and response header size to 8192 bytes,
fix potential buffer-overflow in Server: header handling.
Submitted by: jkaluza
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1638069 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 10 Nov 2014 01:43:59 +0000 (01:43 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1637773 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 10 Nov 2014 01:06:38 +0000 (01:06 +0000)]
Merge r1637768 from trunk:
fix copy/paste error for CacheSocacheMinTime, rest of content is correct.
http://httpd.apache.org/docs/trunk/mod/mod_cache_socache.html#comment_3247
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1637769 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 9 Nov 2014 17:25:33 +0000 (17:25 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1637699 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 9 Nov 2014 17:24:31 +0000 (17:24 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1637698 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 6 Nov 2014 14:49:37 +0000 (14:49 +0000)]
vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1637125 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 6 Nov 2014 14:23:38 +0000 (14:23 +0000)]
missed mergeinfo update from r1637114
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1637116 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 6 Nov 2014 14:22:41 +0000 (14:22 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1637115 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 6 Nov 2014 14:22:05 +0000 (14:22 +0000)]
merge r1637112 from trunk:
mention the cmake-based build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1637114 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 3 Nov 2014 14:49:27 +0000 (14:49 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1636365 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 2 Nov 2014 22:25:11 +0000 (22:25 +0000)]
Vote, comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1636202 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 2 Nov 2014 21:15:59 +0000 (21:15 +0000)]
Merge r1636195 from trunk:
namded captures show up in the env with a MATCH_ prefix.
http://httpd.apache.org/docs/2.4/sections.html#comment_3193
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1636196 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 2 Nov 2014 21:01:55 +0000 (21:01 +0000)]
Merge r1636189 from trunk:
add a -in wordlist example, change 'string list' to wordlist so you can jump to the grammar.
leave a hint about line endings (uncommitted change in my tree)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1636190 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 1 Nov 2014 18:01:31 +0000 (18:01 +0000)]
restore SECURITY to top
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1636006 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 1 Nov 2014 17:59:01 +0000 (17:59 +0000)]
committed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1636003 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 1 Nov 2014 17:58:49 +0000 (17:58 +0000)]
Merge r1634425 from trunk:
When using EBCDIC encoding, HTTPS through ProxyPass and ProxyRemote doesn't
work correctly. PR 57092
Submitted By: Edward Lu
Reviewed By: covener, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1636002 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 1 Nov 2014 17:57:47 +0000 (17:57 +0000)]
Merge r1634237 from trunk:
fix another case of 304 response sent to an unconditional request
Submitted By: covener
Reviewed By: covener, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1636001 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 1 Nov 2014 15:21:33 +0000 (15:21 +0000)]
Merge r1633031, r1633522, r1633529, r1633530 from trunk
Style fix
Submitted by: jailletc36
Reviewed by: jailletc36, jim, ylavic
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635970 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 1 Nov 2014 09:19:17 +0000 (09:19 +0000)]
Merge r1611858, r1611908, r1611916 from trunk
doc: improve doxygen output for util_ebcdic.h and util_charset.h.
Submitted by: jailletc36
Reviewed by: jailletc36, rjung, ylavic
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635905 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 1 Nov 2014 07:06:46 +0000 (07:06 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635896 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 31 Oct 2014 13:21:28 +0000 (13:21 +0000)]
propose errordoc fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635763 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Fri, 31 Oct 2014 09:41:44 +0000 (09:41 +0000)]
Propose r1622450 and r1626978.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635741 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 30 Oct 2014 18:33:08 +0000 (18:33 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635581 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 30 Oct 2014 17:34:43 +0000 (17:34 +0000)]
merge r1635558 from trunk:
show a bit more of openssl's -status display
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635559 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 30 Oct 2014 14:31:21 +0000 (14:31 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635513 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 30 Oct 2014 14:30:28 +0000 (14:30 +0000)]
merge r1635510 from trunk:
more hints for OCSP Stapling:
* when a different cache mechanism is used...
* testing that your server sends an OCSP response
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635512 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 29 Oct 2014 11:58:36 +0000 (11:58 +0000)]
fix typo in "mod_ssl"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635105 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 28 Oct 2014 19:00:50 +0000 (19:00 +0000)]
Merge r1631983 from trunk:
mod_substitute: no real functional change, but:
- define default for maximum line length
indepenent of MAX_STRING_LEN
- Clarify line length check with a comment
- add supported 'b' suffix to directive
description
Submitted by: rjung
Reviewed by: jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634948 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Oct 2014 10:32:46 +0000 (10:32 +0000)]
Split suggested by Christophe done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634839 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Oct 2014 09:57:06 +0000 (09:57 +0000)]
Work on split suggested by Christophe.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634829 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Oct 2014 09:55:23 +0000 (09:55 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634827 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 28 Oct 2014 07:04:49 +0000 (07:04 +0000)]
Note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634800 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 28 Oct 2014 06:47:58 +0000 (06:47 +0000)]
Fix compatibility note + rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634793 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 27 Oct 2014 23:22:57 +0000 (23:22 +0000)]
Merge r1634736 from trunk:
Remove commented-out SSLStaplingForceURL at global scope.
Global or not, its use is specialized and those that need it won't need a sample,
and others may be confused.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634737 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Oct 2014 12:50:05 +0000 (12:50 +0000)]
Merge r1629372, r1629485, r1629519 from trunk:
Move OCSP stapling information from a per-certificate store
(ex_data attached to an X509 *) to a per-server hash which is
allocated from the pconf pool. Fixes PR 54357, PR 56919 and
a leak with the certinfo_free cleanup function (missing
OCSP_CERTID_free).
* modules/ssl/ssl_util_stapling.c: drop certinfo_free, and add
ssl_stapling_certid_free (used with apr_pool_cleanup_register).
Switch to a stapling_certinfo hash which is keyed by the SHA-1
digest of the certificate's DER encoding, rework ssl_stapling_init_cert
to only store info once per certificate (allocated from the pconf
to the extent possible) and extend the logging.
* modules/ssl/ssl_private.h: adjust prototype for
ssl_stapling_init_cert, replace ssl_stapling_ex_init with
ssl_stapling_certinfo_hash_init
* modules/ssl/ssl_engine_init.c: adjust ssl_stapling_* calls
Based on initial work by Alex Bligh <alex alex.org.uk>
Follow up to r1629372: ensure compatibily with OpenSSL < 1.0 (sk_OPENSSL_STRING_value).
Follow up to r1629372 and r1629485: ensure compatibily with OpenSSL < 1.0 (sk_OPENSSL_STRING_[num|value|pop] macros).
Submitted by: kbrand, ylavic, ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634529 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Oct 2014 12:48:24 +0000 (12:48 +0000)]
Merge r1629508 from trunk:
mod_cache_socache: Change average object size
hint from 32 bytes to 2048 bytes.
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634528 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Oct 2014 12:47:47 +0000 (12:47 +0000)]
Merge r1629507, r1629652 from trunk:
mod_cache_socache: Add cache status to server-status.
The status_hook simply calls the status function of
socache, very much like mod_ssl does for the ssl
session cache.
Silence build warning about missing prototype.
Followup to r1629507.
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634527 13f79535 -47bb-0310-9956-
ffa450edef68