]>
granicus.if.org Git - apache/log
Yann Ylavic [Wed, 14 May 2014 17:34:05 +0000 (17:34 +0000)]
mod_cache: follow up to r1594643.
Avoid table lookup if not necessary (fast path first).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1594648 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 14 May 2014 17:11:49 +0000 (17:11 +0000)]
mod_cache: follow up to r1591328.
Define the cache_merge_headers_out() function to merge r->err_headers_out into
r->headers_out and add the ones from r->content_type/encoding if available.
Use it in ap_cache_cacheable_headers_out() where the same is done and in
cache_save_filter() where this has to be done before updating the entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1594643 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 14 May 2014 15:54:38 +0000 (15:54 +0000)]
mod_proxy_wstunnel: Fix the use of SSL connections with the "wss:" scheme.
PR55320.
Submitted by: Alex Liu <alex.leo.ca gmail.com>
Committed by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1594625 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Wed, 14 May 2014 12:33:57 +0000 (12:33 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1594560 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 14 May 2014 10:51:25 +0000 (10:51 +0000)]
Remove entry for r1583175 and r1593745, now in 2.4.x branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1594540 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Tue, 13 May 2014 17:50:39 +0000 (17:50 +0000)]
Fix some comment typos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1594301 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 13 May 2014 12:18:54 +0000 (12:18 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1594210 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 12 May 2014 21:01:36 +0000 (21:01 +0000)]
Based on report from Ken Zalewski, on online doc.
Add missing Server-Variables useable in RewriteCond directive.
Introduced in r1132494
CONTEXT_PREFIX
CONTEXT_DOCUMENT_ROOT
Introduced in r737973
IPV6
Missing for ages!
SCRIPT_GROUP
SCRIPT_USER
I have added where I found it logical, feel free to adjust.
I have also reordered this table to ease reading.
Finally, I have beautified some tables at the end.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1594094 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 11 May 2014 20:52:32 +0000 (20:52 +0000)]
PR56333: Add an API to resume a connection that a handler has previously suspended.
Submitted by: Artem <artemciy gmail.com>, Edward Lu <Chaosed0 gmail.com>
Committed by: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1593860 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 11 May 2014 20:41:45 +0000 (20:41 +0000)]
Extend the socket callbacks in event to allow a timeout on the I/O callback.
When a socket callback has a timeout, an associated timer event is used to
remove the sockets from the pollset and call a timeout function.
* This includes a noteworthy change to the main event loop. Previously,
we would call epoll, then process the timer events, then iterate through the
poll results. After this patch, the timer events are processed before the poll()
a _non-queued_ action can change the pollset conents (a users timed callback
function conversely could easily sit in a queue while the main thread continues
down into epoll)
* timer events can now have sockets associated with them, those sockets are
removed from the pollset when the timer event fires w/o a queue to the worker.
* timer events now have a canceled flag that can be toggled without locking
the timer list.
* Drop the severity of some wstunnel messages from DEBUG to TRACE1
* Lift the restriction on using asynchronous websockets connections but having
an idle timeout
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1593857 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 10 May 2014 23:43:48 +0000 (23:43 +0000)]
stop setting context info for AliasMatch. These concepts do not really map
well/reliably to AliasMatch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1593745 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 10 May 2014 11:28:10 +0000 (11:28 +0000)]
Minor visual improvement.
Remove useless link.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1593687 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 10 May 2014 05:49:43 +0000 (05:49 +0000)]
- Add missing links
- Fix extra ] spotted in online doc by emigas.
- Remove another ] introduced in Hearder syntax in r1588244
- s/variable/varname/ to match the text below it.
- Turn the syntax of both Header and RequestHeader to be:
header [value [replacement [early|env=[!]variable|expr=expression]]]
in order to match the code.
This removes the ambiguity of expr=<something> which can now be used in 2 different places in the syntax.
- Also remove the space in 'expr= value' in compatibility note, to help distinguish between the two
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1593665 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 7 May 2014 13:12:42 +0000 (13:12 +0000)]
remove some entries for backported improvements
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1593010 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Tue, 6 May 2014 05:00:21 +0000 (05:00 +0000)]
mod_dav: Fix invalid Location header when a resource is created by passing an
absolute URI on the request line.
Using r->unparsed_uri is wrong since it might contain a scheme, hostname and
port. See section 5.1.2 of RFC 2616, an absolute URI is allowed. The
unparsed_uri field is absolutely unparsed. The current code causes the
Location header to end up having the scheme, host and port included twice.
* modules/dav/main/mod_dav.c
(dav_created): Call ap_escape_uri() on r->uri when caller doesn't provide a
location.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1592655 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 5 May 2014 21:13:12 +0000 (21:13 +0000)]
fix Doxygen markup error
Submitted by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1592632 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 5 May 2014 19:26:33 +0000 (19:26 +0000)]
Follow-up to r1592529:
Define default port for "scgi" schemes (as chosen by
mod_proxy_scgi) in a common location.
Suggested by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1592615 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 5 May 2014 14:02:48 +0000 (14:02 +0000)]
mod_proxy_scgi: Support Unix sockets.
ap_proxy_port_of_scheme(): Support default SCGI port (4000).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1592529 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 5 May 2014 12:47:18 +0000 (12:47 +0000)]
Clarify an existing requirement of the server_portstr parameter
to ap_proxy_determine_connection(): it must be a buffer of at
least one byte in size.
(And don't bother with using strcpy in order to zap a string.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1592514 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 5 May 2014 12:40:47 +0000 (12:40 +0000)]
reformat only (get rid of unnecessary block scope)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1592511 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 5 May 2014 12:13:15 +0000 (12:13 +0000)]
now understood why users haven't reported the segfault (yet) when mod_proxy_fcgi
can't connect to the application
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1592500 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 3 May 2014 13:44:05 +0000 (13:44 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1592206 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 3 May 2014 13:43:14 +0000 (13:43 +0000)]
Fill in various blurry areas reported on the certificate-transparency
forum.
Fix a minor formatting glitch with the attempt to show shell escaping
for a hash sign.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1592205 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 3 May 2014 12:33:28 +0000 (12:33 +0000)]
rebuild docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1592193 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 2 May 2014 20:46:28 +0000 (20:46 +0000)]
mod_proxy_fcgi: Fix occasional high CPU when handling request bodies.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1592037 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 2 May 2014 20:33:57 +0000 (20:33 +0000)]
better diagnostics for failures during dispatch()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1592032 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 1 May 2014 11:44:08 +0000 (11:44 +0000)]
Now in https://svn.apache.org/repos/asf/httpd/mod_spdy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591623 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Thu, 1 May 2014 02:48:38 +0000 (02:48 +0000)]
fix LastChangedRevision
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591537 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 30 Apr 2014 22:52:41 +0000 (22:52 +0000)]
mod_proxy_fcgi: Support iobuffersize parameter.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591508 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 30 Apr 2014 20:21:03 +0000 (20:21 +0000)]
Axe unnecessary memset() calls and allocating an extra
byte in an I/O buffer for '\0', which hasn't been needed
since a strstr("\r\n\r\n") was removed in r371428.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591472 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 30 Apr 2014 17:15:07 +0000 (17:15 +0000)]
mod_ssl: follow up to r1583191.
Use type BOOL for modssl_ctx_t's field ocsp_use_request_nonce.
Suggested by: kbrand.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591401 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 30 Apr 2014 16:53:00 +0000 (16:53 +0000)]
mod_cache: follow up to r1591390
Fix code typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591394 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 30 Apr 2014 16:34:15 +0000 (16:34 +0000)]
mod_cache: follow up to r1591322
Avoid one unnecessary test when checking 304 contradictions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591390 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 30 Apr 2014 14:58:33 +0000 (14:58 +0000)]
mod_cache: Preserve non-cacheable headers forwarded from an origin 304
response. PR 55547.
When mod_cache asks for a revalidation of a stale entry and the origin responds
with a 304 (not that stale), the module strips the non-cacheable headers from
the origin response and merges the stale headers to update the cache.
The problem is that mod_cache won't forward the non-cacheable headers to the
client, for example if the 304 response contains both Set-Cookie and
'Cache-Control: no-cache="Set-Cookie"' headers, or CacheIgnoreHeaders is used.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591328 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 30 Apr 2014 14:53:35 +0000 (14:53 +0000)]
mod_cache: follow up to r1591320.
Use the new MOD_CACHE_ENTITY_HEADERS[] names to check 304 contradictions
against the same headers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591322 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 30 Apr 2014 14:43:27 +0000 (14:43 +0000)]
mod_cache: Don't add cached/revalidated entity headers to a 304 response.
PR 55547.
When the conditional request meets the conditions of the stale then revalidated
entry, the forwarded 304 response includes the entity headers merged from the
cached headers (before updating the entry).
Strip them before returning a 304.
Since the entity headers are stripped elsewhere, factorize the code using a
new table (MOD_CACHE_ENTITY_HEADERS[]) containing these headers's names.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591320 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 30 Apr 2014 14:33:21 +0000 (14:33 +0000)]
Revert r1591312 (again) to commit the 2 fixes separately.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591316 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 30 Apr 2014 14:25:45 +0000 (14:25 +0000)]
mod_cache: Don't add cached/revalidated entity headers to a 304 response.
PR 55547.
When the conditional request meets the conditions of the stale then revalidated
entry, the forwarded 304 response includes the entity headers merged from the
cached headers (before updating the entry).
Strip them before returning a 304.
Since the entity headers are stripped elsewhere, factorize the code using a
new table (MOD_CACHE_ENTITY_HEADERS[]) containing these headers's names.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591312 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 30 Apr 2014 14:21:05 +0000 (14:21 +0000)]
Rollback r1591302, wrong file commited.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591307 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 30 Apr 2014 14:14:53 +0000 (14:14 +0000)]
mod_cache: Don't add cached/revalidated entity headers to a 304 response.
PR 55547.
When the conditional request meets the conditions of the stale then revalidated
entry, the forwarded 304 response includes the entity headers merged from the
cached headers (before updating the entry).
Strip them before returning a 304.
Since the entity headers are stripped elsewhere, factorize the code using a
new table (MOD_CACHE_ENTITY_HEADERS[]) containing these headers's names.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591302 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Wed, 30 Apr 2014 12:21:21 +0000 (12:21 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591269 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 30 Apr 2014 05:32:08 +0000 (05:32 +0000)]
Add missing links
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591198 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 30 Apr 2014 05:04:59 +0000 (05:04 +0000)]
Correct typo as spoted in a comment in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591196 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 30 Apr 2014 04:42:27 +0000 (04:42 +0000)]
Correct typo as spoted in a comment in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591191 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 30 Apr 2014 04:09:40 +0000 (04:09 +0000)]
Correct typo as spoted in a comment in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591188 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 Apr 2014 23:28:11 +0000 (23:28 +0000)]
mod_cache: Retry unconditional request with the full URL (including the
query-string) when the origin server's 304 response does not
match the conditions used to revalidate the stale entry.
http://www.mail-archive.com/dev@httpd.apache.org/msg59884.html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591143 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 29 Apr 2014 21:32:49 +0000 (21:32 +0000)]
Properly escape the < and >.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591113 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 29 Apr 2014 20:38:49 +0000 (20:38 +0000)]
Correct typo as spoted in a comment in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591096 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 29 Apr 2014 16:05:56 +0000 (16:05 +0000)]
mod_authnz_ldap: Fail explicitly when the filter is too long. Remove
unnecessary apr_pstrdup() and strlen().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1591012 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 28 Apr 2014 15:24:27 +0000 (15:24 +0000)]
Correct typo as spoted in a comment in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590674 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 28 Apr 2014 14:29:28 +0000 (14:29 +0000)]
Correct case as spoted in a comment in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590656 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Apr 2014 10:55:17 +0000 (10:55 +0000)]
Fold in mod_spdy source
NOTE: THIS IS THE INITIAL LOAD OF THE SRC AS-IS AND AS DONATED
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590597 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 28 Apr 2014 06:58:32 +0000 (06:58 +0000)]
Correct according to the comments in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590566 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 27 Apr 2014 22:39:32 +0000 (22:39 +0000)]
mod_deflate: follow up to r1587639.
Don't break the looped brigade when moving the FLUSH bucket to the returned bb
and continue reading.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590509 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 27 Apr 2014 18:10:03 +0000 (18:10 +0000)]
mod_proxy_fcgi: Don't segfault when failing to connect to the backend.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590437 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 27 Apr 2014 17:03:27 +0000 (17:03 +0000)]
Correct port number in example as spoted in comment in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590421 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 27 Apr 2014 13:56:09 +0000 (13:56 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590396 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 27 Apr 2014 11:03:13 +0000 (11:03 +0000)]
Correct links as spooted in comment in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590372 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 26 Apr 2014 21:52:38 +0000 (21:52 +0000)]
s/=/==/ as spotted in comment in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590310 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 26 Apr 2014 16:20:12 +0000 (16:20 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1590245 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 25 Apr 2014 11:19:56 +0000 (11:19 +0000)]
Only include the ldap escaping if present within APR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589995 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 25 Apr 2014 11:14:36 +0000 (11:14 +0000)]
Add the ldap-search option to mod_authnz_ldap, allowing authorization
to be based on arbitrary expressions that do not include the username.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589993 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 25 Apr 2014 10:55:04 +0000 (10:55 +0000)]
Add the ldap function to the expression API, allowing LDAP filters and
distinguished names based on expressions to be escaped correctly to
guard against LDAP injection.
Note: this requires at least APR v1.6.0 or above for the apr_escape API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589986 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 24 Apr 2014 12:51:48 +0000 (12:51 +0000)]
Follow-up to r1587607:
Export new mod_ssl APIs when using traditional Windows build mechanism
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589699 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 24 Apr 2014 12:14:16 +0000 (12:14 +0000)]
minor improvements
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589688 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 24 Apr 2014 06:29:28 +0000 (06:29 +0000)]
Follow up to r1384924 .
Update comment and allocate one extra byte to be safe, even if not needed in the particular case described in r1384924.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589599 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 23 Apr 2014 14:03:30 +0000 (14:03 +0000)]
tweaks to grammar and markup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589413 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 23 Apr 2014 12:45:45 +0000 (12:45 +0000)]
allow operation without any logs configured or without the
log client tool configured
this supports configurations where SCTs are managed by the admin or
by some other infrastructure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589398 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 23 Apr 2014 12:38:03 +0000 (12:38 +0000)]
ensure that the post-config hook runs after that of mod_ssl
(mod_ssl_ct looks for stuff that should have been found
while mod_ssl ran)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589389 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 22 Apr 2014 15:03:51 +0000 (15:03 +0000)]
rebuild CT docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589157 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 22 Apr 2014 15:02:54 +0000 (15:02 +0000)]
more Certificate Transparency docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589154 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Tue, 22 Apr 2014 12:02:29 +0000 (12:02 +0000)]
rebuild docs (add mod_ssl_ct & ctlogconfig)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589098 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Tue, 22 Apr 2014 11:21:09 +0000 (11:21 +0000)]
fixes for validate-xml, fix properties
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589088 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 22 Apr 2014 00:05:05 +0000 (00:05 +0000)]
follow-up to r1588987:
Support build of mod_ssl_ct on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1589009 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 21 Apr 2014 21:31:42 +0000 (21:31 +0000)]
back to c89
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588989 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 21 Apr 2014 21:14:21 +0000 (21:14 +0000)]
Add module mod_ssl_ct, which provides an implementation of Certificate
Transparency (RFC 6962) for httpd.
mod_ssl_ct requires OpenSSL 1.0.2 (in beta) and must be explicitly
enabled via configure.
Note that support/ctauditscts is purposefully not installed; it
does not properly function due to a dependency on a
certificate-transparency open source project tool which itself is
not sufficiently complete at this time.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588987 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 21 Apr 2014 21:00:30 +0000 (21:00 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588982 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 21 Apr 2014 16:33:29 +0000 (16:33 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588918 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 21 Apr 2014 11:03:26 +0000 (11:03 +0000)]
Initialize post_handshake_rc for case where a failure has
already occurred (doesn't change execution but avoids warning
with some levels of gcc).
Pointed out by: kbrand
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588868 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 21 Apr 2014 09:33:41 +0000 (09:33 +0000)]
Typo in comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588862 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Mon, 21 Apr 2014 07:21:05 +0000 (07:21 +0000)]
in 2.4.x as of r1588496
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588855 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Mon, 21 Apr 2014 06:54:41 +0000 (06:54 +0000)]
ssl_stapling_init_cert: do not return success when no responder URI is found
stapling_renew_response: abort early (before apr_uri_parse) if ocspuri is empty
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588853 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 21 Apr 2014 06:51:36 +0000 (06:51 +0000)]
Better self document code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588852 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Mon, 21 Apr 2014 06:39:24 +0000 (06:39 +0000)]
ssl_callback_TmpDH: for OpenSSL 1.0.2 and later, set the current cert to the
one actually used for the connection before calling SSL_get_privatekey(ssl)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588851 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 20 Apr 2014 17:56:10 +0000 (17:56 +0000)]
mod_lua: stop complaining
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588807 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 20 Apr 2014 17:53:38 +0000 (17:53 +0000)]
r1494157 from eventopt for event, per sf's review comments.
use a subpool of pchild since skiplist allocations will
happen across threads and are only protected from
other skiplist operations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588806 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 20 Apr 2014 13:58:13 +0000 (13:58 +0000)]
mod_lua: Use binary strstr for finding endpoints of a multipart object. (How did this EVER work?! *sigh*)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588761 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 20 Apr 2014 13:13:15 +0000 (13:13 +0000)]
expr=value updates:
update RequestHeader syntax,
add compat to Header and RequestHeader
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588747 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 19 Apr 2014 20:21:01 +0000 (20:21 +0000)]
Fix errors with CacheLock on Windows:
cache_util.c(757): (OS 80)The file exists. : [client 127.0.0.1:63889]
AH00784: Attempt to obtain a cache lock for stale cached URL failed,
revalidating entry anyway:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588704 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Apr 2014 19:21:35 +0000 (19:21 +0000)]
strncmp(r->filename, "proxy:", 6) is faster than a
note. Plus, allows for checking even if not due to
rewrite.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588544 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 18 Apr 2014 17:38:15 +0000 (17:38 +0000)]
mod_proxy: Preserve original request headers even if they differ
from the ones to be forwarded to the backend. PR 45387.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588527 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 18 Apr 2014 17:19:53 +0000 (17:19 +0000)]
mod_proxy: follow up to r1588519: CHANGE.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588521 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 18 Apr 2014 17:17:06 +0000 (17:17 +0000)]
mod_proxy: When ping/pong is configured for a worker, don't send or forward
"100 Continue" (interim) response to the client if it does not
expect one.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588519 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 18 Apr 2014 11:47:06 +0000 (11:47 +0000)]
Move two variable assignments off the fast path.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588448 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Fri, 18 Apr 2014 09:07:19 +0000 (09:07 +0000)]
Also clear the error queue before calling SSL_CTX_use_certificate[_chain]_file
(workaround for OpenSSL versions before 0.9.8h, see
https://rt.openssl.org/Ticket/Display.html?user=guest&pass=guest&id=1513).
PR 56410.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588427 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Fri, 18 Apr 2014 08:29:11 +0000 (08:29 +0000)]
Merge r1585090 from trunk:
Bring SNI behavior into better conformance with RFC 6066:
- no longer send a warning-level unrecognized_name(112) alert
when no matching vhost is found (PR 56241)
- at startup, only issue warnings about IP/port conflicts and name-based
SSL vhosts when running with an OpenSSL without TLS extension support
(almost 5 years after SNI was added to 2.2.x, the
"[...] only work for clients with TLS server name indication support"
warning feels obsolete)
Proposed by: kbrand
Reviewed by: jorton, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588424 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 17 Apr 2014 19:10:26 +0000 (19:10 +0000)]
Grammar
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588344 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 17 Apr 2014 18:14:49 +0000 (18:14 +0000)]
Prevent an external proxy from presenting an internal proxy
in mod_remoteip.c. PR 55962.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588330 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 17 Apr 2014 17:48:00 +0000 (17:48 +0000)]
axe entries for changes that are in 2.4.10-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588318 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 17 Apr 2014 11:29:20 +0000 (11:29 +0000)]
rebuild docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1588219 13f79535 -47bb-0310-9956-
ffa450edef68