]>
granicus.if.org Git - apache/log
Lucien Gentis [Sun, 9 Nov 2014 17:14:03 +0000 (17:14 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1637696 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 6 Nov 2014 14:18:46 +0000 (14:18 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1637113 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 6 Nov 2014 14:17:56 +0000 (14:17 +0000)]
mention the cmake-based build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1637112 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 2 Nov 2014 21:15:40 +0000 (21:15 +0000)]
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/trunk@
1636195 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 2 Nov 2014 21:01:05 +0000 (21:01 +0000)]
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/trunk@
1636189 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 1 Nov 2014 18:03:22 +0000 (18:03 +0000)]
remove some more recent 2.4 backports.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1636007 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 1 Nov 2014 17:59:42 +0000 (17:59 +0000)]
remove two recently backported items
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1636004 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 31 Oct 2014 20:41:29 +0000 (20:41 +0000)]
* Add missing include for ap_pglobal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1635859 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 31 Oct 2014 13:17:38 +0000 (13:17 +0000)]
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1635762 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 31 Oct 2014 00:07:06 +0000 (00:07 +0000)]
mod_proxy_connect: Don't issue AH02447 on sockets hangups, let the read
determine whether it is a normal close or a real error. PR 57168.
Abort the client or backend connection on polling errors, but don't forcibly
abort the client side at the end (the core filters will do that otherwise
when necessary), so that lingering close and SSL shutdown can occur on normal
close.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1635645 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 30 Oct 2014 23:56:27 +0000 (23:56 +0000)]
mod_proxy_wstunnel: abort backend connection on polling error to avoid
further processing (lingering close, SSL shutdown).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1635644 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 30 Oct 2014 18:31:53 +0000 (18:31 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1635580 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 30 Oct 2014 17:33:31 +0000 (17:33 +0000)]
show a bit more of openssl's -status display
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1635558 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 30 Oct 2014 15:24:58 +0000 (15:24 +0000)]
MPMs, core: make duplicated listeners (SO_REUSEPORT) introduced in r1599531
less intrusive.
Submitted by: Yingqi Lu <yingqi.lu@intel.com>
Modified/Committed by: ylavic
Add ListenCoresBucketsRatio which is a configurable ratio between the number of
CPU cores (online) and the number of listeners buckets to create, defaulting to
zero (so that listeners buckets become an opt-in, ie. ncpus / ratio > 1).
This could also be made an opt-out by using the previous hardcoded value (8) as
default.
Make ap_close_listeners() act on all the listeners (including duplicated ones),
since the function is also called externally (eg. mod_cgid, mod_ssl_ct and
possibly any third party module) to cleanup opened descriptors when a process
is forked (the duplicated listeners are kept in a scoped/static variable).
Add ap_close_listeners_ex() to close a single bucket of listeners, used by the
children to close unused duplicates and internally by ap_close_listeners().
Make ap_duplicate_listeners() compute the number of buckets to be used, instead
of each MPM. This number is now based on the above ratio and will not change
unless asked to (given *num_buckets < 1, that is when the MPM does not run in
one-process mode nor after a graceful restart).
Remove some global variables (mpm_listen, enable_default_listeners) previously
used to communicate between MPMs and ap_listen, since ap_duplicate_listeners()
API can now be used to do so.
Also rename num_buckets as ap_num_listen_buckets, and prefix have_so_reuseport
with ap_ (both printed by ap_log_common(), hence kept global).
Detect ap_have_so_reuseport once only at startup.
Restore dummy_connection() as before r1599531 since sending POD signals should
not depend on the number of listeners buckets (there is still one single socket
receiving the connections).
For each MPM (concerned), move the bucket data (pod, listeners and eventually
accept mutex) into a struct and instanciate an array of them (sized by the
number of buckets), for each child to use its own data according to its bucket
index, and the parent to maintain the whole.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1635521 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 30 Oct 2014 14:24:01 +0000 (14:24 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1635511 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 30 Oct 2014 14:23:01 +0000 (14:23 +0000)]
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/trunk@
1635510 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Thu, 30 Oct 2014 08:34:12 +0000 (08:34 +0000)]
core: Do not match files when using DirectoryMatch. PR41867.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1635428 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Oct 2014 10:18:43 +0000 (10:18 +0000)]
Follow up to r1632742: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1634836 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 28 Oct 2014 06:44:46 +0000 (06:44 +0000)]
Fix compatibility note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1634791 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 27 Oct 2014 23:18:16 +0000 (23:18 +0000)]
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/trunk@
1634736 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 27 Oct 2014 00:55:20 +0000 (00:55 +0000)]
When using EBCDIC encoding, HTTPS through ProxyPass and ProxyRemote doesn't
work correctly. PR 57092
Submitted By: Edward Lu
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1634425 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 25 Oct 2014 17:45:30 +0000 (17:45 +0000)]
fix another case of 304 response sent to an unconditional request
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1634237 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 25 Oct 2014 13:11:05 +0000 (13:11 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1634223 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 25 Oct 2014 13:10:06 +0000 (13:10 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1634222 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 24 Oct 2014 19:00:10 +0000 (19:00 +0000)]
* 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/trunk@
1634120 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 23 Oct 2014 11:52:17 +0000 (11:52 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1633794 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 23 Oct 2014 11:32:40 +0000 (11:32 +0000)]
trying to enable OCSP Stapling without certificate chain
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1633793 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 23 Oct 2014 01:08:16 +0000 (01:08 +0000)]
add hint on discovering that OCSP Stapling cache is too small
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1633731 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 23 Oct 2014 00:59:40 +0000 (00:59 +0000)]
add OCSP Stapling configuration, disabled by default
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1633730 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 22 Oct 2014 05:25:23 +0000 (05:25 +0000)]
tab vs space
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1633531 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 22 Oct 2014 05:25:02 +0000 (05:25 +0000)]
tab vs space
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1633530 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 22 Oct 2014 05:24:05 +0000 (05:24 +0000)]
tab vs space
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1633529 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 22 Oct 2014 05:22:09 +0000 (05:22 +0000)]
tab vs space
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1633528 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 22 Oct 2014 05:21:22 +0000 (05:21 +0000)]
tab vs space
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1633527 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 22 Oct 2014 05:12:51 +0000 (05:12 +0000)]
tab vs space
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1633525 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 22 Oct 2014 04:54:52 +0000 (04:54 +0000)]
Fix indent.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1633522 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Mon, 20 Oct 2014 09:18:22 +0000 (09:18 +0000)]
mod_ssl: Fix SSL_CLIENT_VERIFY value when "SSLVerifyClient optional_no_ca" and
SSLSessionCache are used and SSL session is resumed. SSL_CLIENT_VERIFY value
has been set to SUCCESS on resumption even when originally it was set to
GENEROUS. PR 53193.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1633085 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 20 Oct 2014 04:37:06 +0000 (04:37 +0000)]
Fix strange indent.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1633031 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Oct 2014 16:29:36 +0000 (16:29 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1632817 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Oct 2014 16:28:30 +0000 (16:28 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1632816 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 18 Oct 2014 08:50:05 +0000 (08:50 +0000)]
mod_buffer: avoid unlikely access to freed memory and forward flushed buckets
immediatly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1632742 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 18 Oct 2014 08:46:42 +0000 (08:46 +0000)]
mod_cache: avoid unlikely access to freed memory.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1632740 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 17 Oct 2014 00:32:45 +0000 (00:32 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1632456 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 17 Oct 2014 00:31:24 +0000 (00:31 +0000)]
Add how-to guide for OCSP Stapling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1632454 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 16 Oct 2014 21:50:08 +0000 (21:50 +0000)]
Remove some backported item
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1632443 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 15 Oct 2014 10:02:31 +0000 (10:02 +0000)]
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1631983 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 14 Oct 2014 21:05:35 +0000 (21:05 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1631886 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 14 Oct 2014 21:03:59 +0000 (21:03 +0000)]
very minor improvements to OCSP-related doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1631885 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 14 Oct 2014 20:45:40 +0000 (20:45 +0000)]
SSLOCSPUseRequestNonce already in 2.4.x branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1631880 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 14 Oct 2014 00:11:52 +0000 (00:11 +0000)]
include mod_ssl_ct
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1631603 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 13 Oct 2014 19:24:34 +0000 (19:24 +0000)]
the hard-coded limit on LimitRequestLine has been gone since 2.1.x, see r819480
and r102840. PR57009
Submitted By: Ed Lu
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1631516 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Oct 2014 15:16:30 +0000 (15:16 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1631056 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Oct 2014 15:14:43 +0000 (15:14 +0000)]
XML Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1631055 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 11 Oct 2014 05:47:02 +0000 (05:47 +0000)]
Style ('{' on same line as function definition)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1631021 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 10 Oct 2014 20:37:16 +0000 (20:37 +0000)]
Style (space before ending ';')
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1630981 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 10 Oct 2014 19:53:02 +0000 (19:53 +0000)]
Revert style changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1630971 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 10 Oct 2014 17:54:33 +0000 (17:54 +0000)]
* Check if we are having an SSL connection before looking up SSL related
variables during expression evaluation to avoid a crash. If not return
an empty string.
PR: 57070
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1630947 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 10 Oct 2014 00:19:08 +0000 (00:19 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1630626 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 10 Oct 2014 00:17:33 +0000 (00:17 +0000)]
mod_ssl_ct: Update the doc for the recent sync with current OpenSSL 1.0.2
and Certificate Transparency tools, as well as a few other clarifications.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1630625 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 10 Oct 2014 00:16:05 +0000 (00:16 +0000)]
mod_ssl_ct: Work with current Certificate Transparency tools
(e.g., as of certificate-transparency commit
3f03188fe89974d45345fddee64a8227bd2ec26a )
The interface to the "ct" tool now requires the log's URL and
public key, resulting in a bit of refactoring in the module.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1630624 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 9 Oct 2014 21:22:20 +0000 (21:22 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1630594 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Oct 2014 21:59:02 +0000 (21:59 +0000)]
core: follow up to r1629909: fix min_spare_threads lower bound and check wrt num_buckets.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629990 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Oct 2014 17:03:30 +0000 (17:03 +0000)]
core: follow up to r1629925: changelog.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629928 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Oct 2014 16:59:44 +0000 (16:59 +0000)]
core: follow up to r1629925: new log tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629927 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Oct 2014 16:54:31 +0000 (16:54 +0000)]
core: ensure that MPMs return an error on runtime failure and hence that
httpd's main process also exits with an error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629925 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Oct 2014 15:46:05 +0000 (15:46 +0000)]
mpms: enforce assertion that unreachable code is not reached.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629918 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Oct 2014 15:35:56 +0000 (15:35 +0000)]
core: follow up to r1629909: ap_daemons_to_start can't be lower than 1 (not 0) for prefork either.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629916 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Oct 2014 15:16:02 +0000 (15:16 +0000)]
core: Use process scoreboard to store each child's listener bucket,
and silently adjust the configured number of processes/threads to
be above the computed number of listener buckets (depending on the
CPU cores).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629909 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 6 Oct 2014 23:19:55 +0000 (23:19 +0000)]
log the command-line before invoking the log client
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629785 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 6 Oct 2014 19:25:04 +0000 (19:25 +0000)]
Fix one missed s/tab/space/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629740 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 6 Oct 2014 19:22:32 +0000 (19:22 +0000)]
s/tab/space/
Remove empty lines
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629738 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 6 Oct 2014 19:13:32 +0000 (19:13 +0000)]
Style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629736 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 6 Oct 2014 18:30:32 +0000 (18:30 +0000)]
Fix link
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629730 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 6 Oct 2014 13:39:30 +0000 (13:39 +0000)]
Silence build warning about missing prototype.
Followup to r1629507.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629652 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Mon, 6 Oct 2014 06:07:47 +0000 (06:07 +0000)]
event: Fix worker-listener deadlock in graceful restart caused by get_worker()
allocating new worker after ap_queue_info_term(), but not setting the
have_idle_worker variable. PR 56960.
Submitted By: Zin UDA
Committed By: jkaluza
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629577 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Mon, 6 Oct 2014 05:57:02 +0000 (05:57 +0000)]
event: have_idle_worker must not be cleared in every listener_thread iteration.
Fixes bug when workers were not stopped after graceful restart (introduced in
r1605328).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629576 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Mon, 6 Oct 2014 05:45:03 +0000 (05:45 +0000)]
update Japanese translation for r1628084
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629574 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 5 Oct 2014 18:36:02 +0000 (18:36 +0000)]
Follow up to r1629372 and r1629485: ensure compatibily with OpenSSL < 1.0 (sk_OPENSSL_STRING_[num|value|pop] macros).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629519 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 5 Oct 2014 17:05:21 +0000 (17:05 +0000)]
mod_cache_socache: Change average object size
hint from 32 bytes to 2048 bytes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629508 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 5 Oct 2014 17:00:31 +0000 (17:00 +0000)]
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629507 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 5 Oct 2014 11:41:52 +0000 (11:41 +0000)]
Follow up to r1629372: ensure compatibily with OpenSSL < 1.0 (sk_OPENSSL_STRING_value).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629485 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 5 Oct 2014 07:05:33 +0000 (07:05 +0000)]
Style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629476 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 5 Oct 2014 06:43:45 +0000 (06:43 +0000)]
Style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629472 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 5 Oct 2014 05:48:35 +0000 (05:48 +0000)]
Style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629467 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 4 Oct 2014 20:09:10 +0000 (20:09 +0000)]
More style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629441 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 4 Oct 2014 20:03:06 +0000 (20:03 +0000)]
Style (mostly indent)
remove a useless local variable initialization
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629440 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Oct 2014 14:12:55 +0000 (14:12 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629396 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Oct 2014 14:11:19 +0000 (14:11 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629395 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sat, 4 Oct 2014 10:58:49 +0000 (10:58 +0000)]
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>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629372 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 3 Oct 2014 16:48:30 +0000 (16:48 +0000)]
Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629257 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 3 Oct 2014 16:25:22 +0000 (16:25 +0000)]
Partial mod_example to mod_example_hooks fix
for korean docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629250 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 3 Oct 2014 16:02:05 +0000 (16:02 +0000)]
Adjust content of some docs file for the old
switch form mod_example to mod_example_hooks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629244 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 3 Oct 2014 15:54:27 +0000 (15:54 +0000)]
Rename docs files for mod_example_hooks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629239 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 3 Oct 2014 15:49:28 +0000 (15:49 +0000)]
Fix some comments and log messages: module was
renamed form mod_example to mod_example_hooks long ago.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629235 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 2 Oct 2014 11:49:43 +0000 (11:49 +0000)]
Add docs for new directive SubstituteMaxLineLength
in mod_substitute.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1628950 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 2 Oct 2014 10:22:33 +0000 (10:22 +0000)]
mod_substitute: Restrict configuration in .htaccess to
FileInfo as documented.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1628924 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 2 Oct 2014 09:50:24 +0000 (09:50 +0000)]
mod_substitute: Make maximum line length configurable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1628919 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 2 Oct 2014 09:49:35 +0000 (09:49 +0000)]
Add CHANGES for r1628104.
(mod_substitue: Fix memory limitation in case of
regexp plus flatten.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1628918 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 1 Oct 2014 20:54:04 +0000 (20:54 +0000)]
Adjust Certificate Transparency support (mod_ssl_ct) to build with/require OpenSSL 1.0.2 Beta 3.
Update notes on missing OpenSSL documentation.
Submitted by: ben (the primary changes), trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1628833 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 1 Oct 2014 12:40:58 +0000 (12:40 +0000)]
reword/reorg/simplify based on recent feedback.
- don't worry about how multiple IP addresses map
- simplify the description of why you might use an IP address in <virtualhost
- move the note below the last paragraph
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1628690 13f79535 -47bb-0310-9956-
ffa450edef68