]> granicus.if.org Git - apache/log
apache
9 years agompm_event(opt), mpm_worker: follow up to r1635521.
Yann Ylavic [Mon, 17 Nov 2014 13:59:36 +0000 (13:59 +0000)]
mpm_event(opt), mpm_worker: follow up to r1635521.
Allocate retained idle_spawn_rate vector on the process pool.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1640161 13f79535-47bb-0310-9956-ffa450edef68

9 years agompm_worker, mpm_prefork: follow up to r1635521.
Yann Ylavic [Mon, 17 Nov 2014 11:45:29 +0000 (11:45 +0000)]
mpm_worker, mpm_prefork: follow up to r1635521.
Use one dedicated accept mutex per listeners bucket.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1640145 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFollow up to r1640040: CHANGES entry.
Yann Ylavic [Sun, 16 Nov 2014 22:27:48 +0000 (22:27 +0000)]
Follow up to r1640040: CHANGES entry.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1640042 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_proxy_fcgi, mod_authnz_fcgi: stop reading the response and issue an error
Yann Ylavic [Sun, 16 Nov 2014 22:25:32 +0000 (22:25 +0000)]
mod_proxy_fcgi, mod_authnz_fcgi: stop reading the response and issue an error
when parsing or forwarding the response fails.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1640040 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_proxy_fcgi: SECURITY: CVE-2014-3583 (cve.mitre.org)
Yann Ylavic [Sun, 16 Nov 2014 22:04:39 +0000 (22:04 +0000)]
mod_proxy_fcgi: SECURITY: CVE-2014-3583 (cve.mitre.org)
Fix a potential crash with response headers' size above 8K.

The code changes to mod_authnz_fcgi keep the handle_headers()
function in sync between the two modules.  mod_authnz_fcgi
does not have this issue because it allocated a separate byte
for terminating '\0'.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1640036 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRevert r1638818, r1639812, r1639717 and r1639814 for new staging.
Yann Ylavic [Sun, 16 Nov 2014 21:52:40 +0000 (21:52 +0000)]
Revert r1638818, r1639812, r1639717 and r1639814 for new staging.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1640034 13f79535-47bb-0310-9956-ffa450edef68

9 years agoevent, eventopt: follow up to r1638879 and r1639960.
Yann Ylavic [Sun, 16 Nov 2014 21:32:48 +0000 (21:32 +0000)]
event, eventopt: follow up to r1638879 and r1639960.
Clear the pool in ap_push_pool() before recycling.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1640031 13f79535-47bb-0310-9956-ffa450edef68

9 years agoavoid dereferencing a recently apr_pool_clear()'ed event_conn_state_t *cs
Christophe Jaillet [Sun, 16 Nov 2014 05:55:14 +0000 (05:55 +0000)]
avoid dereferencing a recently apr_pool_clear()'ed event_conn_state_t *cs
in several paths where ptrans is being recycled at the end of a request.

Same as r1638879 which was for the event MPM.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1639960 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_authnz_fcgi: follow up to r1639717.
Yann Ylavic [Sat, 15 Nov 2014 00:37:13 +0000 (00:37 +0000)]
mod_authnz_fcgi: follow up to r1639717.
Let ap_scan_script_header*() validate the headers.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1639814 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_proxy_fcgi: follow up to r1638818.
Yann Ylavic [Sat, 15 Nov 2014 00:35:37 +0000 (00:35 +0000)]
mod_proxy_fcgi: follow up to r1638818.
Let ap_scan_script_header*() validate the headers.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1639812 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_authnz_fcgi: Fix a potential crash with response headers' size above 8K.
Yann Ylavic [Fri, 14 Nov 2014 18:18:15 +0000 (18:18 +0000)]
mod_authnz_fcgi: Fix a potential crash with response headers' size above 8K.
(similar to r1638818 for mod_proxy_fcgi).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1639717 13f79535-47bb-0310-9956-ffa450edef68

9 years agodon't call notify_suspend() in a worker thread after
Eric Covener [Fri, 14 Nov 2014 12:04:46 +0000 (12:04 +0000)]
don't call notify_suspend() in a worker thread after
start_lingering_close_common may have put the socket back
into the pollset.

If it becomes readable too quickly, cs can be
free'ed or accessed concurrently.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1639614 13f79535-47bb-0310-9956-ffa450edef68

9 years agorevert r1638691, more comprehensive followup planned shortly.
Eric Covener [Fri, 14 Nov 2014 02:24:40 +0000 (02:24 +0000)]
revert r1638691, more comprehensive followup planned shortly.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1639564 13f79535-47bb-0310-9956-ffa450edef68

9 years agoavoid dereferencing a recently apr_pool_clear()'ed event_conn_state_t *cs
Eric Covener [Wed, 12 Nov 2014 17:32:24 +0000 (17:32 +0000)]
avoid dereferencing a recently apr_pool_clear()'ed event_conn_state_t *cs
in several paths where ptrans is being recycled at the end of a request.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1638879 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_proxy_fcgi: CVE-2014-3583: Fix a potential crash with response headers'
Yann Ylavic [Wed, 12 Nov 2014 15:41:07 +0000 (15:41 +0000)]
mod_proxy_fcgi: CVE-2014-3583: Fix a potential crash with response headers'
size above 8K.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1638818 13f79535-47bb-0310-9956-ffa450edef68

9 years ago* mod_ssl: call ERR_free_strings() with OpenSSL >= 0.9.8e. Fixes memory leak
Jan Kaluža [Wed, 12 Nov 2014 12:27:09 +0000 (12:27 +0000)]
* mod_ssl: call ERR_free_strings() with OpenSSL >= 0.9.8e. Fixes memory leak
in mod_ssl on graceful restart. PR 53435.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1638772 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix a bug in r1604350 that can lead to crashes in the event MPM under load.
Eric Covener [Wed, 12 Nov 2014 02:29:38 +0000 (02:29 +0000)]
Fix a bug in r1604350 that can lead to crashes in the event MPM under load.

if start_lingering_close_blocking() returns 0, notify_suspend() will
write a 1 into some potentially recently free'd memory from
ptrans (cs->suspended).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1638691 13f79535-47bb-0310-9956-ffa450edef68

9 years agosee your doctor about any rashes since r1608202.
Eric Covener [Wed, 12 Nov 2014 01:46:28 +0000 (01:46 +0000)]
see your doctor about any rashes since r1608202.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1638687 13f79535-47bb-0310-9956-ffa450edef68

9 years agotab vs space
Christophe Jaillet [Tue, 11 Nov 2014 21:16:11 +0000 (21:16 +0000)]
tab vs space

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1638412 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix style
Christophe Jaillet [Tue, 11 Nov 2014 15:40:06 +0000 (15:40 +0000)]
Fix style

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1638188 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix indent.
Christophe Jaillet [Tue, 11 Nov 2014 15:20:49 +0000 (15:20 +0000)]
Fix indent.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1638159 13f79535-47bb-0310-9956-ffa450edef68

9 years ago* server/scoreboard.c: Check for child_num < 0 also in ap_update_child_status
Jan Kaluža [Tue, 11 Nov 2014 12:06:53 +0000 (12:06 +0000)]
* server/scoreboard.c: Check for child_num < 0 also in ap_update_child_status
and ap_update_child_status_from_conn. PR 56767.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1638073 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_auth_basic: Fix comment mentioning 403 instead of 401.
Jan Kaluža [Tue, 11 Nov 2014 12:00:17 +0000 (12:00 +0000)]
mod_auth_basic: Fix comment mentioning 403 instead of 401.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1638072 13f79535-47bb-0310-9956-ffa450edef68

9 years agoResolve rashes with LDAP authz and non-LDAP authn since r1608202.
Eric Covener [Mon, 10 Nov 2014 22:43:53 +0000 (22:43 +0000)]
Resolve rashes with LDAP authz and non-LDAP authn since r1608202.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1637990 13f79535-47bb-0310-9956-ffa450edef68

9 years agoxforms
Eric Covener [Mon, 10 Nov 2014 01:21:47 +0000 (01:21 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1637771 13f79535-47bb-0310-9956-ffa450edef68

9 years agofix copy/paste error for CacheSocacheMinTime, rest of content is correct.
Eric Covener [Mon, 10 Nov 2014 01:06:10 +0000 (01:06 +0000)]
fix copy/paste error for CacheSocacheMinTime, rest of content is correct.
  http://httpd.apache.org/docs/trunk/mod/mod_cache_socache.html#comment_3247

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1637768 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sun, 9 Nov 2014 17:15:26 +0000 (17:15 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1637697 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
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

9 years agomake docs
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

9 years agomention the cmake-based build
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

9 years agonamded captures show up in the env with a MATCH_ prefix.
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

9 years agoadd a -in wordlist example, change 'string list' to wordlist so you can jump to the...
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

9 years agoremove some more recent 2.4 backports.
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

9 years agoremove two recently backported items
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

9 years ago* Add missing include for ap_pglobal
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

9 years agoSupport custom ErrorDocuments for HTTP 501 and 414 status codes.
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

9 years agomod_proxy_connect: Don't issue AH02447 on sockets hangups, let the read
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

9 years agomod_proxy_wstunnel: abort backend connection on polling error to avoid
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

9 years agomake docs
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

9 years agoshow a bit more of openssl's -status display
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

9 years agoMPMs, core: make duplicated listeners (SO_REUSEPORT) introduced in r1599531
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

9 years agomake docs
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

9 years agomore hints for OCSP Stapling:
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

9 years agocore: Do not match files when using DirectoryMatch. PR41867.
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

9 years agoFollow up to r1632742: CHANGES entry.
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

9 years agoFix compatibility note
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

9 years agoRemove commented-out SSLStaplingForceURL at global scope.
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

9 years agoWhen using EBCDIC encoding, HTTPS through ProxyPass and ProxyRemote doesn't
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

9 years agofix another case of 304 response sent to an unconditional request
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

9 years agoRebuild.
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

9 years agoXML update.
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

9 years ago* Use the correct server name for SNI in case the backend SSL connection itself
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

9 years agomake docs
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

9 years agotrying to enable OCSP Stapling without certificate chain
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

9 years agoadd hint on discovering that OCSP Stapling cache is too small
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

9 years agoadd OCSP Stapling configuration, disabled by default
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

9 years agotab vs space
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

9 years agotab vs space
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

9 years agotab vs space
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

9 years agotab vs space
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

9 years agotab vs space
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

9 years agotab vs space
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

9 years agoFix indent.
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

9 years agomod_ssl: Fix SSL_CLIENT_VERIFY value when "SSLVerifyClient optional_no_ca" and
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

9 years agoFix strange indent.
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

9 years agoRebuild.
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

9 years agoXML update.
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

9 years agomod_buffer: avoid unlikely access to freed memory and forward flushed buckets
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

9 years agomod_cache: avoid unlikely access to freed memory.
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

9 years agomake docs
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

9 years agoAdd how-to guide for OCSP Stapling
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

9 years agoRemove some backported item
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

9 years agomod_substitute: No real functional change, but:
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

9 years agomake docs
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

9 years agovery minor improvements to OCSP-related doc
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

9 years agoSSLOCSPUseRequestNonce already in 2.4.x branch
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

9 years agoinclude mod_ssl_ct
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

9 years agothe hard-coded limit on LimitRequestLine has been gone since 2.1.x, see r819480
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

9 years agoRebuild.
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

9 years agoXML Update.
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

9 years agoStyle ('{' on same line as function definition)
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

9 years agoStyle (space before ending ';')
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

9 years agoRevert style changes
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

9 years ago* Check if we are having an SSL connection before looking up SSL related
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

9 years agoxform
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

9 years agomod_ssl_ct: Update the doc for the recent sync with current OpenSSL 1.0.2
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

9 years agomod_ssl_ct: Work with current Certificate Transparency tools
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

9 years agomake docs
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

9 years agocore: follow up to r1629909: fix min_spare_threads lower bound and check wrt num_buckets.
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

9 years agocore: follow up to r1629925: changelog.
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

9 years agocore: follow up to r1629925: new log tag
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

9 years agocore: ensure that MPMs return an error on runtime failure and hence that
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

9 years agompms: enforce assertion that unreachable code is not reached.
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

9 years agocore: follow up to r1629909: ap_daemons_to_start can't be lower than 1 (not 0) for...
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

9 years agocore: Use process scoreboard to store each child's listener bucket,
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

9 years agolog the command-line before invoking the log client
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

9 years agoFix one missed s/tab/space/
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

9 years agos/tab/space/
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

9 years agoStyle
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

9 years agoFix link
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