www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-11 02:42:23 +03:00
Code Activity
31,587 Commits 62 Branches 304 Tags
cea360b369519e1ff373f6a285e9383db61d7149
Commit Graph

6539 Commits

Author SHA1 Message Date
Christophe Jaillet
a369776b21 With the current implementation, it is likely to connect/close a socket with the memcache server for each command sent. 
The root cause is a too small idle timeout (600 microseconds).

Add a new directive, 'MemcacheConnTTL',  to control this idle connection timeout with the memcache server(s).
Change the default value from 600 usec (!) to 15 sec as per Yann suggestion.

I've limited accepted values from 1 to 1800 seconds (half an hour) because internaly, the value passed to 'apr_memcache_server_create' is still in mirco-seconds.

PR 58091
~~~~~~~~~~~~~~~~~~~_
Homemade measurement (on a slighly modified version of httpd) shows a +30% in number of processed requests using memcache to cache /index.html.
Comparison made between the 600 usec and 15 sec TTL.

Memcache config:
    default
httpd Config:
    CacheEnable socache /
    CacheSocache memcache:127.0.0.1
    LoadModule mpm_event_module modules/mod_mpm_event.so
httpd compiled with:
    ./configure --enable-mpms-shared=all --with-included-apr --with-mysql --with-libxml2 --enable-modules=reallyall --enable-ssl-ct=no --enable-maintainer-mode --prefix=$HOME/httpd-2.5
httpd and memcache running on the same VM running under Ubuntu 15.04
Load tested using:
    ab -n 20000 http://127.0.0.1/index.html

Creation/closing of connections beetween httpd and memcache confirmed using the telnet connection to memcache and the stats command



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1696105 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-15 22:05:08 +00:00
Stefan Eissing
1a3158ad94 removed HackMpm and MaxWrite config directives, added dynamic write size behaviour according to recommendations from Ilya Grigorik similar to Apache Traffic Server 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1695920 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-14 14:07:43 +00:00
Mike Rumph
cd3e041f0b Generated doc changes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1695915 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-14 13:56:35 +00:00
Mike Rumph
cf7ed8e030 Clarify RewriteRule example in mod_proxy doc 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1695913 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-14 13:51:38 +00:00
Mike Rumph
3fe5162cc5 Generated doc changes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1695904 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-14 13:28:57 +00:00
Stefan Eissing
1f0bb9e838 removed H2Engine directive 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1695885 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-14 12:56:21 +00:00
Mike Rumph
e0d80d75bf Generated doc changes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1695765 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-13 19:41:36 +00:00
Mike Rumph
e80a3519c3 Grammar corrections. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1695762 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-13 19:36:41 +00:00
Stefan Eissing
58119ed85c new directive ProtocolsHonorOrder, added documentation for Protocols feature, changed preference selection and config merging 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1695727 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-13 15:33:07 +00:00
Rich Bowen
0f42f130dc Rebuild 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693829 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-02 21:12:46 +00:00
Rich Bowen
30e6f856ca Document the syntax for invoking the check_forensic script, too. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693828 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-02 21:09:47 +00:00
Rich Bowen
8aa9c03dc4 Rebuild 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693827 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-02 20:54:23 +00:00
Rich Bowen
3ac83804bc Example of how to invoke the forensic log 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693826 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-02 20:52:55 +00:00
Kaspar Brand
29024c38b0 update mod_ssl.html.en transformation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693793 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-02 07:32:46 +00:00
Kaspar Brand
73dbf35961 Add support for extracting the msUPN and dnsSRV forms 
of subjectAltName entries of type "otherName" into
SSL_{CLIENT,SERVER}_SAN_OTHER_{msUPN,dnsSRV}_n environment
variables. Addresses PR 58020.

* docs/manual/mod/mod_ssl.xml: add SSL_*_SAN_OTHER_*_n entries to the
  environment variables table

* modules/ssl/ssl_engine_vars.c: add support for retrieving the
  SSL_{CLIENT,SERVER}_SAN_OTHER_{msUPN,dnsSRV}_n variables

* modules/ssl/ssl_util_ssl.c: add parse_otherName_value, which
  currently recognizes the "msUPN" (1.3.6.1.4.1.311.20.2.3) and
  "id-on-dnsSRV" (1.3.6.1.5.5.7.8.7) otherName forms, and
  adapt modssl_X509_getSAN to take an optional otherName form
  argument for the GEN_OTHERNAME case

* modules/ssl/ssl_util_ssl.h: adapt modssl_X509_getSAN prototype

* modules/ssl/mod_ssl.c: register the id-on-dnsSRV otherName form
  OID (1.3.6.1.5.5.7.8.7) in OpenSSL's objects table


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693792 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-02 07:30:45 +00:00
André Malo
5c139eebf1 update transformation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1691820 13f79535-47bb-0310-9956-ffa450edef68
 2015-07-19 12:10:13 +00:00
André Malo
94f9137a1b fixup properties 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1691819 13f79535-47bb-0310-9956-ffa450edef68
 2015-07-19 12:06:14 +00:00
Lucien Gentis
d144965f1c Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690380 13f79535-47bb-0310-9956-ffa450edef68
 2015-07-11 15:55:05 +00:00
Lucien Gentis
8cbd15b788 XML updates. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690379 13f79535-47bb-0310-9956-ffa450edef68
 2015-07-11 15:54:00 +00:00
Stefan Eissing
8c27a4cd1b reworked mod_h2 donation checkin into build system, added documentation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690248 13f79535-47bb-0310-9956-ffa450edef68
 2015-07-10 11:45:46 +00:00
André Malo
d80e4641d5 update transformation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690173 13f79535-47bb-0310-9956-ffa450edef68
 2015-07-09 20:59:23 +00:00
Yann Ylavic
d9a3b78926 s/\<\(\w\+\)\>\s\+\<\1\>/\1/g 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690137 13f79535-47bb-0310-9956-ffa450edef68
 2015-07-09 18:07:50 +00:00
Rich Bowen
29603b5fe3 s/a a/a/g 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690122 13f79535-47bb-0310-9956-ffa450edef68
 2015-07-09 16:07:25 +00:00
Rich Bowen
f788b1279c Rebuild html. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690121 13f79535-47bb-0310-9956-ffa450edef68
 2015-07-09 16:03:29 +00:00
Rich Bowen
85f20cb5d2 s/the the/the/g 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690120 13f79535-47bb-0310-9956-ffa450edef68
 2015-07-09 16:01:56 +00:00
Christophe Jaillet
de69fc5a7d Add missing <code> around a parameter 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1689317 13f79535-47bb-0310-9956-ffa450edef68
 2015-07-06 06:30:57 +00:00
Lucien Gentis
3140c949c1 Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1689164 13f79535-47bb-0310-9956-ffa450edef68
 2015-07-04 14:21:37 +00:00
Lucien Gentis
918dd88ec1 XML update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1689163 13f79535-47bb-0310-9956-ffa450edef68
 2015-07-04 14:20:40 +00:00
Mike Rumph
18db2969ec Generated doc changes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688700 13f79535-47bb-0310-9956-ffa450edef68
 2015-07-01 18:21:22 +00:00
Mike Rumph
7babb474ac Grammar, spelling, and other minor corrections 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688698 13f79535-47bb-0310-9956-ffa450edef68
 2015-07-01 18:16:20 +00:00
Lucien Gentis
61d7e832db Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688010 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-28 13:41:05 +00:00
Lucien Gentis
cae2395673 Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688004 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-28 13:28:16 +00:00
Lucien Gentis
b6a86167f6 Typo and XML update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688003 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-28 13:26:26 +00:00
Yann Ylavic
409227de9b Don't count your chickens before they are hatched. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1687567 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-25 16:01:44 +00:00
Yann Ylavic
85fad62c0c mod_substitute: follow up r1684900. 
Introduce the SubstituteInheritBefore directive to configure the merge order.
This allows to preserve 2.4 and earlier behaviour.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1687539 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-25 14:50:55 +00:00
Lucien Gentis
881636709e Problem adding mod_log_forensic.html.fr 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686726 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-21 14:21:56 +00:00
Lucien Gentis
3cc1c51364 Problem with mod_log_forensic.xml.fr 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686723 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-21 13:57:51 +00:00
Lucien Gentis
789f36cc9b Problem with mod_log_forensic.xml.fr. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686722 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-21 13:55:33 +00:00
Lucien Gentis
50a3e2835b Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686721 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-21 13:49:41 +00:00
Lucien Gentis
17c811378b XML update and conflict resolution with mod_log_forensic.html.fr 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686720 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-21 13:48:14 +00:00
André Malo
958711b872 update transformation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686709 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-21 12:55:44 +00:00
Lucien Gentis
2a7d2f0ce3 Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685412 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-14 15:35:20 +00:00
Lucien Gentis
c5c99b9d41 Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685269 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-13 15:11:05 +00:00
Lucien Gentis
73ded938f1 XML update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685268 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-13 15:09:58 +00:00
Christophe Jaillet
3f385894c2 Add compatibility note. 
Turn some tabs into space.
Remove some useless <br /> in <highlight> blocks. (this was causing some additionnal blank lines at the end of some examples)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1684313 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-09 05:08:20 +00:00
Christophe Jaillet
5d348e7855 Add compatibility note 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1684311 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-09 04:33:24 +00:00
Lucien Gentis
84fc983089 XML updates. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1683923 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-06 15:51:34 +00:00
Christophe Jaillet
1333dc54c5 Fix typo 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1683883 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-06 05:45:04 +00:00
André Malo
029aa8e8d8 update transformation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1683084 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-02 12:16:04 +00:00
Rainer Jung
3d2e654d36 Xforms. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1682938 13f79535-47bb-0310-9956-ffa450edef68
 2015-06-01 15:52:57 +00:00