]>
granicus.if.org Git - apache/log
Christophe Jaillet [Fri, 6 Feb 2015 20:25:21 +0000 (20:25 +0000)]
Tab vs space
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1657949 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 6 Feb 2015 16:54:16 +0000 (16:54 +0000)]
mod_proxy(es): Avoid error response/document handling by the core if some
input filter already did it while reading client's payload.
When an input filter returns AP_FILTER_ERROR, it has already called ap_die()
or at least already responded to the client.
Here we don't want to lose AP_FILTER_ERROR when returning from proxy handlers,
so we use ap_map_http_request_error() to forward any AP_FILTER_ERROR to
ap_die() which knows whether a response needs to be completed or not.
Before this commit, returning an HTTP error code in this case caused a double
response to be generated.
Depends on r1657881 to preserve r->status (for logging) when nothing is to be
done by ap_die() when handling AP_FILTER_ERROR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1657897 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 6 Feb 2015 16:16:52 +0000 (16:16 +0000)]
http: Make ap_die() robust against any HTTP error code and not modify
response status (finally logged) when nothing is to be done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1657881 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 6 Feb 2015 15:11:15 +0000 (15:11 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1657857 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 6 Feb 2015 15:10:32 +0000 (15:10 +0000)]
add a generic tuning section and linked to the piped logger
issue in logs.html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1657856 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 6 Feb 2015 15:08:43 +0000 (15:08 +0000)]
PR57094: Provide some hints about Windows problems
with more than a few dozen piped loggers.
Submitted by: Edward Lu
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1657854 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 5 Feb 2015 21:03:04 +0000 (21:03 +0000)]
Save a few bytes in conf pool when parsing some directives. Use temp_pool when applicable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1657692 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 5 Feb 2015 20:47:08 +0000 (20:47 +0000)]
Improve doc as spotted by Kalessin in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1657687 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 5 Feb 2015 20:33:59 +0000 (20:33 +0000)]
Expression parser: Optimize another concatenation
case by using iteration instead of recursion.
We have a relatively small recursion limit of
about 10 operations. This is a compilation
limit (a define). It can be hit if many expr
vars or function calls are concatenated.
The new optimization is very similar to the
existing one, which optimizes consecutive
concatenations in node2 of the tree. The new
one optimizes consecutive concatenations in
node 1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1657685 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Feb 2015 17:43:18 +0000 (17:43 +0000)]
CHANGES: Follow up to r1657636, clarify message.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1657638 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Feb 2015 17:36:23 +0000 (17:36 +0000)]
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1657636 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 4 Feb 2015 21:38:15 +0000 (21:38 +0000)]
Fix typo spotted by micha137 in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1657407 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 4 Feb 2015 14:52:50 +0000 (14:52 +0000)]
followup to r1657261 whitespace only -- reindent body of while loop.
(no change under svn diff -x-w)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1657263 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 4 Feb 2015 14:44:23 +0000 (14:44 +0000)]
*) SECURITY: CVE-2015-0228 (cve.mitre.org)
mod_lua: A maliciously crafted websockets PING after a script
calls r:wsupgrade() can cause a child process crash.
[Edward Lu <Chaosed0 gmail.com>]
Discovered by Guido Vranken <guidovranken gmail.com>
Submitted by: Edward Lu
Committed by: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1657261 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 4 Feb 2015 14:33:51 +0000 (14:33 +0000)]
Fix bit-shifting of websockets frame fields that would yield wrong opcodes
when the FIN bit was set. Results in PING not being recognized
by mod_lua. PR57524
Submitted By: Edward Lu
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1657256 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 3 Feb 2015 10:42:21 +0000 (10:42 +0000)]
mod_macro: Clear macros before initialization to avoid use-after-free
on startup or restart when the module is linked statically. PR 57525
Submitted by: apache.org tech.futurequest.net
Committed by: Yann Ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1656669 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 2 Feb 2015 19:31:37 +0000 (19:31 +0000)]
Fix cut and paste typo in error message + remove empty lines to be consistent
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1656549 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 1 Feb 2015 22:13:15 +0000 (22:13 +0000)]
Follow up to r1635521: ListenCoresBucketsRatio's manual.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1656368 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 1 Feb 2015 21:10:03 +0000 (21:10 +0000)]
Follow up to r1656259: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1656359 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 1 Feb 2015 16:38:40 +0000 (16:38 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1656324 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 1 Feb 2015 16:37:29 +0000 (16:37 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1656323 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 1 Feb 2015 08:11:59 +0000 (08:11 +0000)]
adjust link to SSL_CONF_cmd man page on www.openssl.org
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1656269 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 1 Feb 2015 00:05:59 +0000 (00:05 +0000)]
mod_proxy_http: don't connect or reuse backend before prefetching request body.
The goal is to minimize the delay between this connection is considered alive
and the first bytes sent (should the client's link be slow or some input filter
retain the data).
This is a best effort to prevent the backend from closing (from under us) what
it thinks is an idle connection, hence to reduce to the minimum the unavoidable
local ap_proxy_is_socket_connected() vs remote keepalive race condition.
PR 56541.
Also, allow the new subprocess_env variable "proxy-flushall" to prevent any
buffering of the request body before it is forwarded to the backend.
When set, the prefetch is still done (although non-blocking), so we can still
determine Content-Length vs chunked vs spooled (depending on data available
with the header or while reading it), and then all brigades are flushed when
passed to the backend.
PR 37920.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1656259 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 31 Jan 2015 18:19:59 +0000 (18:19 +0000)]
mod_proxy_connect: fix duplicated AH introduced by r1635645.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1656230 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 31 Jan 2015 17:53:42 +0000 (17:53 +0000)]
mod_alias: follow up to r1653941.
Fill empty APLOGNO().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1656225 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 30 Jan 2015 21:11:36 +0000 (21:11 +0000)]
correct copy/paste error, use cmd->cmd->name
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1656122 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 30 Jan 2015 17:17:12 +0000 (17:17 +0000)]
Block Define/Undefine from per-directory context, because they will
fire while the block is read not when it evaluates for a given
request.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1656063 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 30 Jan 2015 17:15:02 +0000 (17:15 +0000)]
expand comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1656062 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 30 Jan 2015 16:58:20 +0000 (16:58 +0000)]
Provide a way for EXEC_ON_READ directives to see their context
(parent directive).
Usually, this context is not also EXEC_ON_READ so it's not fully processed, so
e.g cmd->path is not fluffed up yet because the closing tag
of the section is not read yet and ap_check_cmd_context()
doesn't work)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1656058 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Fri, 30 Jan 2015 02:39:37 +0000 (02:39 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1655920 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Fri, 30 Jan 2015 02:33:55 +0000 (02:33 +0000)]
Fix typo in mod_deflate doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1655917 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Fri, 30 Jan 2015 02:05:38 +0000 (02:05 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1655906 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Fri, 30 Jan 2015 01:57:06 +0000 (01:57 +0000)]
Fix typos in mod_deflate doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1655904 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 29 Jan 2015 18:24:12 +0000 (18:24 +0000)]
Added doc links between mod_proxy_fcgi and mod_authnz_fcgi
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1655778 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 29 Jan 2015 17:55:10 +0000 (17:55 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1655767 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 27 Jan 2015 20:21:48 +0000 (20:21 +0000)]
AP_INIT_NO_ARGS mishandled in macro
Submitted by: Joachim Zobel <jzobel heute-morgen.de>, covener
Committed by: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1655146 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 27 Jan 2015 20:02:36 +0000 (20:02 +0000)]
Improve r1525489 (one line with a "-" was forgotten) and synch with 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1655141 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 27 Jan 2015 07:21:07 +0000 (07:21 +0000)]
Fix doc as spotted by mebjas.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1654984 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 27 Jan 2015 07:11:37 +0000 (07:11 +0000)]
Fix doc as spotted by mrskman.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1654983 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 26 Jan 2015 16:00:06 +0000 (16:00 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1654832 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 26 Jan 2015 15:59:59 +0000 (15:59 +0000)]
comment feedback -- flow is confusing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1654831 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 24 Jan 2015 15:29:04 +0000 (15:29 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1654543 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 24 Jan 2015 14:53:56 +0000 (14:53 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1654528 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 24 Jan 2015 14:52:30 +0000 (14:52 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1654527 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 23 Jan 2015 12:21:34 +0000 (12:21 +0000)]
as in r1517366, drop the severity in authz_groupfile when a require
didn't match but no real error was encountered.
This individual 'require group' may not really dictate who gets in. PR55523
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1654184 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 22 Jan 2015 18:37:06 +0000 (18:37 +0000)]
mod_ssl: Fix merge problem with SSLProtocol that made SSLProtocol ALL ignored
in virtualhost context (new version of r1653906 reverted by r1653993).
Submitted By: Michael Kaufmann <apache-bugzilla michael-kaufmann.ch>
Committed/modified By: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1653997 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 22 Jan 2015 18:27:46 +0000 (18:27 +0000)]
mod_ssl: revert r1653906, will commit an alternative just after.
The issue with r1653906 is that existing configurations like
"SSLProtocol -SSLv3" (where the default is assumed to be ALL)
won't work anymore.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1653993 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 22 Jan 2015 18:06:57 +0000 (18:06 +0000)]
Use unsigned bit fields.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1653978 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 22 Jan 2015 17:02:22 +0000 (17:02 +0000)]
mod_alias: Introduce expression parser support for Alias, ScriptAlias
and Redirect.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1653941 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 22 Jan 2015 15:19:39 +0000 (15:19 +0000)]
Fix merge problem with SSLProtocol that made SSLProtocol ALL ignored
in virtualhost context.
Submitted By: Michael Kaufmann <apache-bugzilla michael-kaufmann.ch>
Commited By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1653906 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 21 Jan 2015 21:42:36 +0000 (21:42 +0000)]
Bump mmn as documented in commit log msg r1653666
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1653667 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 21 Jan 2015 21:39:55 +0000 (21:39 +0000)]
Revert r4635428 corresponding to PR41867.
The code reverted attempted to restrict comparisons of the r->filename
to given DirectoryMatch blocks.
r->filename was already a non-directory entity at this point, because we
have already fallen out of the } while (thisinfo.filetype == APR_DIR);
block above.
The addition of r->d_is_directory was redundant. That is what is always
returned by ap_get_core_module_config(r->per_dir_config).
Note modifying dir_config required an MMN major bump as this commit could
have realigned the offset of refs (had it been added to the end, this
would correspond to an mmn minor bump) and other fields packed into the
same bytes (this is undefined). Bump on revert to prevent unexpected crashes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1653666 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 21 Jan 2015 14:09:49 +0000 (14:09 +0000)]
Remove the bitfield spec from the http_ctx_t.state enum
as it causes an error-prone mismatch between the enum values and the
state values. Caused a busy loop in windows.
Added in r1484852 and trunk-only.
Submitted By: Edward Lu, Yann Ylavic
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1653539 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 19 Jan 2015 12:42:41 +0000 (12:42 +0000)]
Fix indentation and tab use after r1652955.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1652989 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 19 Jan 2015 12:34:29 +0000 (12:34 +0000)]
Addition to r1652955: Use "=" in combination
with "test" instead of "==".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1652985 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 19 Jan 2015 12:22:34 +0000 (12:22 +0000)]
Fix detection of old Solaris versions.
Autotools need double square brackets.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1652982 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 19 Jan 2015 10:32:51 +0000 (10:32 +0000)]
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>.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1652955 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 19 Jan 2015 08:14:48 +0000 (08:14 +0000)]
Generate #LoadModule directive in default httpd.conf for every --enable-mpms-shared. PR 53882.
Submitted by: olli hauer <ohauer gmx.de>
Committed by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1652930 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 19 Jan 2015 08:06:56 +0000 (08:06 +0000)]
Fix --enable-v4-mapped configuration on *BSD. PR 53824.
Submitted by: olli hauer <ohauer gmx.de>
Committed by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1652929 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 19 Jan 2015 00:35:25 +0000 (00:35 +0000)]
Enable to build mod_lua against Lua 5.3.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1652886 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sun, 18 Jan 2015 23:38:20 +0000 (23:38 +0000)]
NetWare build: fix problem with NLM version.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1652875 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 18 Jan 2015 18:57:53 +0000 (18:57 +0000)]
Silence compiler warnings:
- modules/aaa/mod_authnz_fcgi.c:705: warning:
'orspbuflen' may be used uninitialized in this function
- modules/aaa/mod_authnz_fcgi.c:1235: warning:
comparison is always false due to limited range of data type
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1652829 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 17 Jan 2015 15:55:10 +0000 (15:55 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1652630 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 17 Jan 2015 15:54:06 +0000 (15:54 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1652629 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 16 Jan 2015 19:43:30 +0000 (19:43 +0000)]
mod_rewrite: Improve 'bad flag delimeters' startup error by showing
how the input was tokenized. PR 56528.
Submitted By: Edward Lu <Chaosed0 gmail.com>
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1652507 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 16 Jan 2015 13:23:14 +0000 (13:23 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1652403 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 16 Jan 2015 13:21:34 +0000 (13:21 +0000)]
comments feedback -- it's an initial _request_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1652400 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 14 Jan 2015 13:31:57 +0000 (13:31 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1651666 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 14 Jan 2015 13:30:31 +0000 (13:30 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1651664 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 13 Jan 2015 20:46:54 +0000 (20:46 +0000)]
update transforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1651485 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 13 Jan 2015 20:39:34 +0000 (20:39 +0000)]
Insert .htaccess example talking about relative paths when using
mod_rewrite in .htaccess files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1651479 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 13 Jan 2015 13:54:17 +0000 (13:54 +0000)]
Backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1651343 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 12 Jan 2015 13:45:30 +0000 (13:45 +0000)]
r1651088 for eventopt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1651089 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 12 Jan 2015 13:42:31 +0000 (13:42 +0000)]
Update conn_rec.id when a new thread begins working on a connection, because
the old thread may work on a new connection and assign the same ID in parallel.
Submitted By: Michael Thorpe
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1651088 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Jan 2015 16:09:17 +0000 (16:09 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650763 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Jan 2015 16:07:26 +0000 (16:07 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650762 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Jan 2015 10:24:28 +0000 (10:24 +0000)]
* modules/dav/main/config.m4: Remove long-redundant expat reference.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650490 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Jan 2015 16:24:28 +0000 (16:24 +0000)]
Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650322 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Jan 2015 16:13:55 +0000 (16:13 +0000)]
Fix copy and paste error in docs of new feature.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650320 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Jan 2015 15:36:43 +0000 (15:36 +0000)]
Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650311 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Jan 2015 15:34:10 +0000 (15:34 +0000)]
Add SSLSessionTickets (on|off).
It controls the use of TLS session tickets
(RFC 5077). Default is unchanged (on).
Using session tickets without restarting
the web server with an appropriate frequency
(e.g. daily) compromises perfect forward
secrecy.
As long as we do not have a nice key management
there should be a way to deactivate session
tickets.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650310 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 8 Jan 2015 15:28:48 +0000 (15:28 +0000)]
save some bytes per Christophe's review.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650309 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 7 Jan 2015 14:20:57 +0000 (14:20 +0000)]
mod_ssl: follow up to r1601919.
Likewise when set from SNI callback.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650061 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 7 Jan 2015 12:27:00 +0000 (12:27 +0000)]
update mod_ssl.html.en transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650048 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 7 Jan 2015 12:24:48 +0000 (12:24 +0000)]
Add support for extracting subjectAltName entries of type
rfc822Name and dNSName into SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n
variables.
* docs/manual/mod/mod_ssl.xml: add SSL_*_SAN_*_n entries to the
environment variables table
* modules/ssl/ssl_engine_kernel.c: in ssl_hook_Fixup, add extraction
of subjectAltName entries for the "StdEnvVars" case
* modules/ssl/ssl_engine_vars.c: add support for retrieving the
SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n variables, either with
individual on-demand lookup (ssl_var_lookup_ssl_cert_san),
or with full-list extraction to the environment ("StdEnvVars")
* modules/ssl/ssl_private.h: add modssl_var_extract_san_entries prototype
* modules/ssl/ssl_util_ssl.c: implement SSL_X509_getSAN and
SSL_ASN1_STRING_to_utf8 helper functions, with factoring out common
code from SSL_X509_getIDs and SSL_X509_NAME_ENTRY_to_string where
suitable. Limit SSL_X509_getSAN to the two most common subjectAltName
entry types appearing in user or server certificates (i.e., rfc822Name
and dNSName), for the time being.
* modules/ssl/ssl_util_ssl.h: add SSL_ASN1_STRING_to_utf8
and SSL_X509_getSAN prototypes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650047 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 7 Jan 2015 10:36:12 +0000 (10:36 +0000)]
mod_proxy: Don't put non balancer-member workers in error state by
default for connection or 500/503 errors, and honor status=+I for
any error. PR 48388.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650028 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 6 Jan 2015 22:56:02 +0000 (22:56 +0000)]
Add CHANGE for r1649632
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649966 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 6 Jan 2015 22:46:34 +0000 (22:46 +0000)]
Add PR
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649964 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 5 Jan 2015 20:03:50 +0000 (20:03 +0000)]
Add missing 'filemod' in functions list + minor formatting issue + long line split
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649636 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 5 Jan 2015 19:53:35 +0000 (19:53 +0000)]
Be consistant with the code below which accepts lower or upper case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649632 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 5 Jan 2015 10:06:29 +0000 (10:06 +0000)]
* modules/cache/mod_socache_memcache.c (socache_mc_store): Pass
through expiration time.
Submitted by: Faidon Liambotis <paravoid debian.org>, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649491 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 14:10:06 +0000 (14:10 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649341 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 14:09:16 +0000 (14:09 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649340 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 14:06:00 +0000 (14:06 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649339 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 14:04:34 +0000 (14:04 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649338 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 13:43:21 +0000 (13:43 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649332 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 13:40:37 +0000 (13:40 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649330 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 13:38:28 +0000 (13:38 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649328 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 13:28:54 +0000 (13:28 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649327 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 13:27:14 +0000 (13:27 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649326 13f79535 -47bb-0310-9956-
ffa450edef68