]>
granicus.if.org Git - apache/log
Christophe Jaillet [Sun, 19 Apr 2015 11:55:25 +0000 (11:55 +0000)]
Fix doc as spotted by Falco Schwarz in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674612 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Apr 2015 16:20:00 +0000 (16:20 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674533 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Apr 2015 16:18:47 +0000 (16:18 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674532 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 17 Apr 2015 20:32:10 +0000 (20:32 +0000)]
rebuild docs with meta element enabled
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674394 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 17 Apr 2015 19:54:17 +0000 (19:54 +0000)]
backport http://svn.apache.org/r1674382
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674387 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 17 Apr 2015 19:53:26 +0000 (19:53 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674386 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 17 Apr 2015 06:03:39 +0000 (06:03 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674218 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 16 Apr 2015 18:30:52 +0000 (18:30 +0000)]
Don't match just .cgi or ..cgi or ...cgi, etc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674131 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 16 Apr 2015 18:29:46 +0000 (18:29 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674129 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 16 Apr 2015 18:21:23 +0000 (18:21 +0000)]
Applies fix recommended in bz56346
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674127 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 16 Apr 2015 14:59:48 +0000 (14:59 +0000)]
Rebuild a crapload of xdocs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674086 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 16 Apr 2015 14:48:09 +0000 (14:48 +0000)]
Update proposal (client_failed) for mod_proxy_ajp.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674080 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 16 Apr 2015 11:48:57 +0000 (11:48 +0000)]
minor capitalization tweaks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674048 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 16 Apr 2015 05:45:41 +0000 (05:45 +0000)]
Add r1673769 to a proposal (tweak error message)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674006 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 15 Apr 2015 20:59:47 +0000 (20:59 +0000)]
Correct a regex so that it doesn't match the file named '.cgi'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673957 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 15 Apr 2015 20:53:58 +0000 (20:53 +0000)]
Resolves bz55123 - spaces around emdashes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673953 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 20:10:22 +0000 (20:10 +0000)]
clarify, fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673946 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 19:56:29 +0000 (19:56 +0000)]
inadvertent change in
1673940
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673942 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 19:51:44 +0000 (19:51 +0000)]
Merge r1634120 from trunk:
* Use the correct server name for SNI in case the backend SSL connection itself
is established via a proxy server.
PR: 57139
Submitted by: Szabolcs Gyurko <szabolcs gyurko.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673941 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 19:49:31 +0000 (19:49 +0000)]
Merge r1666297 from trunk:
ssl_util: Fix possible crash (free => OPENSSL_free) and error path leaks when
checking the server certificate constraints (SSL_X509_getBC()).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673940 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 18:39:23 +0000 (18:39 +0000)]
compat info pointed out by Christophe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673924 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 18:06:04 +0000 (18:06 +0000)]
Merge r1652955, r1652985, r1652989 from trunk:
PR 57379: If mod_cgi and mod_cgid get installed,
use IfModule for MPM to LoadModule mod_cgi for
prefork and mod_cgid for all other MPMs.
Previously when combined with --enable-load-all-modules
both modules were loaded and it was undefined
which one actually handled cgi requests.
Based on a patch by olli hauer <ohauer gmx.de>.
Addition to r1652955: Use "=" in combination
with "test" instead of "==".
Fix indentation and tab use after r1652955.
Submitted By: olli hauer <ohauer gmx.de>
Reviewed By: rjung, ylavic, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673909 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 17:59:42 +0000 (17:59 +0000)]
Merge r1671918, r1673113 from trunk:
allow time to first byte (of response headers)
to be logged by mod_logio.
mod_logio was just a conveninent place to do this
w/o writing a new filter or complicating an existing
important one.
Use 'unsigned int' in bitfield
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673904 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 17:57:18 +0000 (17:57 +0000)]
Backport r1669299 from trunk:
*) mod_proxy_wstunnel: Avoid an empty response by failing with 502 (Bad
Gateway) when no response is ever received from the backend.
Submitted By: jkaluza
Reviewde By: covener, ylavic, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673902 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 17:55:41 +0000 (17:55 +0000)]
Merge r1673455 from trunk:
mod_ssl: Protect ENGINE_CTRL_CHIL_SET_FORKCHECK macro with a
featue check for libressl.
Submitted by: Stuart Henderson <sthen openbsd.org>
Reviewed by: covener, trawick, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673900 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 17:50:46 +0000 (17:50 +0000)]
mod_proxy_http: Use the "Connection: close" header for requests to
backends not recycling connections (disablereuse), including the default
reverse and forward proxies.
Submitted by: ylavic (and trawick for an old helper function)
Reviewed by: rjung, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673896 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 15 Apr 2015 17:48:11 +0000 (17:48 +0000)]
Note which indexoptions require fancyindexing. resolves bz56985
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673893 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 15 Apr 2015 17:40:00 +0000 (17:40 +0000)]
Moving back event timers duplicates fix to proposals.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673891 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 17:03:44 +0000 (17:03 +0000)]
ask for details on stalled issue
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673874 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Wed, 15 Apr 2015 17:03:08 +0000 (17:03 +0000)]
We need moar emails - format change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673873 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 16:56:22 +0000 (16:56 +0000)]
Merge r1632742, r1634836 from trunk:
mod_buffer: Forward flushed input data immediately and avoid (unlikely)
access to freed memory.
Submitted by: ylavic, jailletc36
Reviewed by: covener, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673871 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Wed, 15 Apr 2015 16:53:25 +0000 (16:53 +0000)]
Flip directives and topics sections after discussion around ordering
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673869 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 16:52:53 +0000 (16:52 +0000)]
doubl-rainbow vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673868 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 16:42:46 +0000 (16:42 +0000)]
Merge r1642847 and r1673155 from trunk so that yesterday's ApacheCon talk is valid:
core: Add CGIPassAuth directive to control whether HTTP authorization
headers are passed to scripts as CGI variables.
PR: 56855
Reviewed by: rjung, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673860 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 15 Apr 2015 16:35:10 +0000 (16:35 +0000)]
Rebuilds Daniel's change to the order of directictives vs topics in
manual docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673855 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Wed, 15 Apr 2015 16:31:50 +0000 (16:31 +0000)]
Adjust template to align page content with table of contents
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673852 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 16:25:47 +0000 (16:25 +0000)]
one pear-flavored drink, one vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673850 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 15:57:55 +0000 (15:57 +0000)]
sorry for crappy comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673842 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 15 Apr 2015 15:53:23 +0000 (15:53 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673839 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 15:50:51 +0000 (15:50 +0000)]
conditional +1 for errorlogprovider
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673835 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 15 Apr 2015 15:48:01 +0000 (15:48 +0000)]
Resolves bz56695 - %O can in fact be zero sometimes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673834 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 15:29:45 +0000 (15:29 +0000)]
Jeff's ajp confusion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673828 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 15 Apr 2015 15:26:08 +0000 (15:26 +0000)]
Applies patch from bz57189, thanks go to Tom Fredrik Blenning. Adds
Norwegin translations of error pages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673826 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 15 Apr 2015 15:02:24 +0000 (15:02 +0000)]
Rebuild core.html and translations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673808 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 15 Apr 2015 15:00:36 +0000 (15:00 +0000)]
As per bz53530, a brief explanation of when you may and must use quotes
in directory paths.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673805 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 14:50:26 +0000 (14:50 +0000)]
had to move on
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673795 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 15 Apr 2015 14:14:47 +0000 (14:14 +0000)]
Next conditional vote :p
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673776 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 15 Apr 2015 14:13:25 +0000 (14:13 +0000)]
Vote/Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673774 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 14:05:52 +0000 (14:05 +0000)]
quid
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673772 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 14:03:44 +0000 (14:03 +0000)]
merge
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673771 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 15 Apr 2015 13:04:31 +0000 (13:04 +0000)]
Conditional vote :p
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673750 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 15 Apr 2015 12:55:18 +0000 (12:55 +0000)]
Vote/Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673747 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 12:09:35 +0000 (12:09 +0000)]
pre-caffeine lowest-hanging-fruit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673735 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 02:58:10 +0000 (02:58 +0000)]
smattering of backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673624 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 01:43:11 +0000 (01:43 +0000)]
approved, not a showstopper!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673610 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 01:40:14 +0000 (01:40 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673609 13f79535 -47bb-0310-9956-
ffa450edef68
Ken Coar [Tue, 14 Apr 2015 22:19:49 +0000 (22:19 +0000)]
Build..
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673568 13f79535 -47bb-0310-9956-
ffa450edef68
Ken Coar [Tue, 14 Apr 2015 22:02:22 +0000 (22:02 +0000)]
Related to httpd-doc bug 53530; uniform use of quotation marks.
Put quotation marks around most arbitrary-text or filesystem
strings for directives:
* {Alias,Redirect,Proxy*}{,Match}
* <{Directory,Files,Location}{,Match}>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673563 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 14 Apr 2015 19:39:38 +0000 (19:39 +0000)]
Rebuild HTML docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673539 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 14 Apr 2015 19:37:52 +0000 (19:37 +0000)]
Clarify order of operations - some variables aren't accessible to If.
See bz 53349 for context.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673536 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 14 Apr 2015 19:23:36 +0000 (19:23 +0000)]
Rebuild HTML docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673531 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 14 Apr 2015 19:20:48 +0000 (19:20 +0000)]
Clarifies (I hope) what RewriteRule patterns are matched against. See
bz53153 for context.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673529 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 14 Apr 2015 19:08:04 +0000 (19:08 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673522 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 14 Apr 2015 18:40:41 +0000 (18:40 +0000)]
Clarifies FilesMatch and LocationMatch examples, as per bz53483
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673500 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 14 Apr 2015 18:29:23 +0000 (18:29 +0000)]
Rebuild HTML docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673492 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 14 Apr 2015 18:25:33 +0000 (18:25 +0000)]
Clarify DirectoryMatch example. (bz 53483)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673489 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 14 Apr 2015 17:20:30 +0000 (17:20 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673474 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 14 Apr 2015 17:18:59 +0000 (17:18 +0000)]
Add "pre-compressed content" reccipe, as per
https://bz.apache.org/bugzilla/show_bug.cgi?id=51336
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673473 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 14 Apr 2015 03:15:18 +0000 (03:15 +0000)]
one patch is enough
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673342 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 13 Apr 2015 19:58:36 +0000 (19:58 +0000)]
Remove an empty line at the end of the file to synch with trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673264 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 13 Apr 2015 13:22:52 +0000 (13:22 +0000)]
Of course I trusted you in advance...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673179 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 13 Apr 2015 10:59:19 +0000 (10:59 +0000)]
updated CGIPassAuth per current comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673156 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 13 Apr 2015 10:40:35 +0000 (10:40 +0000)]
Merge r1661486 from trunk:
core.c: Fix warnings about unused variables
Reviewed by: rjung, jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673151 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 13 Apr 2015 05:03:31 +0000 (05:03 +0000)]
Vote + promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673106 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 12 Apr 2015 19:08:40 +0000 (19:08 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673043 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 12 Apr 2015 15:49:26 +0000 (15:49 +0000)]
Some votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673024 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 12 Apr 2015 15:21:08 +0000 (15:21 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673018 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Apr 2015 16:53:26 +0000 (16:53 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1672899 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Apr 2015 16:52:14 +0000 (16:52 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1672898 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Apr 2015 16:51:24 +0000 (16:51 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1672897 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Apr 2015 16:46:01 +0000 (16:46 +0000)]
XML Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1672894 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 10 Apr 2015 20:38:34 +0000 (20:38 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1672762 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 10 Apr 2015 20:37:35 +0000 (20:37 +0000)]
Merge r1672757 from trunk:
mod_proxy_wstunnel isn't limited to Unix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1672760 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 9 Apr 2015 21:52:51 +0000 (21:52 +0000)]
CGIPassAuth just tested with 2.4.x's mod_proxy_scgi
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1672502 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 9 Apr 2015 21:22:25 +0000 (21:22 +0000)]
warnings are distracting :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1672494 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 9 Apr 2015 20:51:11 +0000 (20:51 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1672485 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 9 Apr 2015 20:48:42 +0000 (20:48 +0000)]
Merge r1672480,
1672483 from trunk:
SetEnv doesn't work for proxy-scgi-pathinfo
Further tweak: omit the period after the example lest it get copied
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1672484 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 7 Apr 2015 10:06:23 +0000 (10:06 +0000)]
Credit to guy who stumbled into bug and hid possible untested fix in dark corner of bugzilla: 0%
Credit to guy who rediscovered, fixed, committed & merged: 100%
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1671786 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 5 Apr 2015 19:14:41 +0000 (19:14 +0000)]
Credit where credit is due (wasn't aware of PR 53253).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1671417 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 5 Apr 2015 01:12:50 +0000 (01:12 +0000)]
Merge r1671364 from trunk:
Mention the cmake/OpenSSL compatibility issue.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1671365 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 2 Apr 2015 01:50:45 +0000 (01:50 +0000)]
Not that hard to explain...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1670805 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 31 Mar 2015 12:58:59 +0000 (12:58 +0000)]
Merge r1669289, r1669292 from trunk:
core_filters: restore/disable TCP_NOPUSH option after non-blocking sendfile.
CHANGES: follow up to r1669289.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1670328 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 31 Mar 2015 12:57:46 +0000 (12:57 +0000)]
Merge r1664071, r1664299 from trunk:
core: If explicitly configured, use the KeepaliveTimeout value of the
virtual host which handled the latest request on the connection, or by
default the one of the first virtual host bound to the same IP:port.
For non-async MPMs, use either r->server's or c->base_server's value in
ap_process_http_sync_connection() depending on a new server_rec's flag
called keep_alive_timeout_set and determined at config time.
For event MPM, use a queue per timeout value, chaining the queues per
type (keepalive wrt KeepAliveTimeout, write completion wrt to Timeout)
so that maintenance can be done on all the queues from the head, and such
that insertions/maintenance remain in O(1).
A server config is created and pointing to the queue of each vhost at
post_config time, hence the config can be associated to the connection
state (cs) at post_read_request time (keep_alive_timeout_set is used to
determine r->server vs c->base_server here), and we can simply insert
with TO_QUEUE_INSERT(cs->sc->q, cs). PR56226.
While at it, since each queue now embeds it own timeout and hence the
expiration_time of the cs has changed to a queue_timestamp (the time it
was queued), we can detect clock skews and expire entries immediatly if
the system is set (eg. far) in the past during runtime and we want to
avoid waiting for (eg.) centuries before the current logic kills them.
Any entry which is registered above now + q->timeout is concerned, and
is now cleaned from the queue when encountered. PR57374.
core: Follow up to r1664071: comments on new keep_alive_timeout_set flag.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1670326 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 31 Mar 2015 12:54:40 +0000 (12:54 +0000)]
Merge r1668532, r1668535, r1668553 from trunk:
core: Initialize scoreboard's used optional functions on graceful restarts to
avoid a crash when relocation occurs. PR 57177.
core: follow up to r1668532: CHANGES entry.
core: follow up to r1668532: always initialize optional_fn pointers in ap_create_scoreboard().
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1670325 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 31 Mar 2015 12:53:00 +0000 (12:53 +0000)]
Merge r1657636, r1657638, r1669130 from trunk:
mod_proxy_connect/wstunnel: If both client and backend sides get readable
at the same time, don't lose errors occuring while forwarding on the first
side when none occurs next on the other side, and abort.
CHANGES: Follow up to r1657636, clarify message.
mod_proxy_{connect,wstunnel}: follow up to r1657636.
Since rv is not used as an apr_status_t in the loop (it's logging is done by
proxy_{connect,wstunnel}_transfer() when necessary/relevent), use a boolean
instead to avoid the ugly ORs between APR error codes.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1670324 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 31 Mar 2015 12:52:06 +0000 (12:52 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1670322 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 31 Mar 2015 12:51:04 +0000 (12:51 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1670321 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 31 Mar 2015 12:49:45 +0000 (12:49 +0000)]
Merge r1661448 from trunk:
core: Add expression support to ErrorDocument. Switch from a fixed
sized 664 byte array per merge to a hash table.
Submitted by: minfrin
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1670320 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 31 Mar 2015 12:48:27 +0000 (12:48 +0000)]
Merge r1666361 from trunk:
Avoid a potential integer underflow in the lock timeout value sent back to a client. The answer to a LOCK request could be an extremly large integer if the time needed to lock the resource was longer that the requested timeout given in the LOCK request. In such a case, we now answer "Second-0". PR55420
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1670319 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 30 Mar 2015 18:41:29 +0000 (18:41 +0000)]
Remove proposal, it has already been applied in r1669920
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1670173 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log