www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-12 14:01:05 +03:00
Code Activity
27,585 Commits 62 Branches 304 Tags
6fb46ae27ff973ee001ecda4baf960a00b17178d
Commit Graph

5412 Commits

Author SHA1 Message Date
Rich Bowen
f9e30cc94c Use 2.4 access control syntax. Patch from info@mathijs.info 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1702012 13f79535-47bb-0310-9956-ffa450edef68
 2015-09-09 13:58:54 +00:00
Christophe Jaillet
6f11e6bd83 rebuild 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1701350 13f79535-47bb-0310-9956-ffa450edef68
 2015-09-05 06:36:56 +00:00
Christophe Jaillet
58c4db6a9b Fix typo spotted in comment in online doc. [comment #4454) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1701349 13f79535-47bb-0310-9956-ffa450edef68
 2015-09-05 06:34:02 +00:00
Stefan Eissing
379f9d4d33 changed Protocols default to http/1.1 only, updated documentation, changed ap_select_protocol() to return NULL when no protocol could be agreed upon 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1701005 13f79535-47bb-0310-9956-ffa450edef68
 2015-09-03 12:45:26 +00:00
Yann Ylavic
15c29da76d Follow up to r1698123: also revert r1697352. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700601 13f79535-47bb-0310-9956-ffa450edef68
 2015-09-01 15:52:46 +00:00
Rich Bowen
9f99da4683 Rebuild 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700594 13f79535-47bb-0310-9956-ffa450edef68
 2015-09-01 15:28:40 +00:00
Christophe Jaillet
6930a7b64d Allow 0 as a valid value (never close idle connections) 
Increased maximum allowed value to 3600 s (1 hour)
Use 'ap_timeout_parameter_parse' to allow more flexible configuration (i.e. h, min, s, ms suffixes)
Use 'apr_time_from_sec' when applicable.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700418 13f79535-47bb-0310-9956-ffa450edef68
 2015-09-01 08:23:01 +00:00
Lucien Gentis
d6f0af233d Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700045 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-29 14:52:49 +00:00
Lucien Gentis
18ed2ec5b6 XML updates. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700044 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-29 14:51:51 +00:00
Stefan Eissing
5d6c9e84ab removed mod_h2 directives which were experimental and should not support any longer, changed H2Direct to only be enabled by default when not using TLS, conf. to rfc7540 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697446 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-24 16:07:39 +00:00
Mike Rumph
14459b9d4a Generated doc changes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697440 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-24 15:41:44 +00:00
Yann Ylavic
b4a695971f Document balancer and balancer-member growth margin reached's behaviour. 
[Reverted by r1700601]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697352 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-24 10:34:02 +00:00
Stefan Eissing
e586ad099f changed Protocols to let vhosts override servers, removed old H2Engine example from readme 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697339 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-24 09:26:17 +00:00
Lucien Gentis
bcd1ad49c3 Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697098 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-22 16:39:58 +00:00
Lucien Gentis
13d977a3b9 XML update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697097 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-22 16:39:02 +00:00
Yann Ylavic
c72daaab5c mod_substitute: follow up r1697013. 
Update the doc.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697015 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-21 15:52:29 +00:00
Mike Rumph
da9bcf7aed Generated doc changes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1696624 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-19 16:22:42 +00:00
Mike Rumph
2cc9b103f5 Restructure ProxyPass directive doc 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1696622 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-19 16:18:23 +00:00
Mike Rumph
17512740b3 Generated doc changes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1696481 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-18 18:48:34 +00:00
Mike Rumph
d9b3e75186 Grammar corrections 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1696480 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-18 18:44:50 +00:00
Mike Rumph
87dfd8b274 Generated doc changes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1696475 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-18 18:17:38 +00:00
Lucien Gentis
de815d9ab0 Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1696152 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-16 15:58:57 +00:00
Lucien Gentis
10049c6112 XML updates. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1696151 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-16 15:58:03 +00:00
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