- Sep 23, 2015
-
-
Yann Ylavic authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1704860 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
* Do not reset the retry timeout if the worker is in error at this stage even if the connection to the backend was successful. It was likely set into error by a different thread / process in parallel e.g. for a timeout or bad status. We should respect this and should not continue with a connection via this worker even if we got one. * Do a more complete cleanup here. At this point we cannot end up with something useful with the data we created so far. Submitted by: rpluem Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1704835 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1704834 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1704833 13f79535-47bb-0310-9956-ffa450edef68
-
- Sep 21, 2015
-
-
Edward Lu authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1704402 13f79535-47bb-0310-9956-ffa450edef68
-
- Sep 19, 2015
-
-
Lucien Gentis authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1704058 13f79535-47bb-0310-9956-ffa450edef68
-
Lucien Gentis authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1704057 13f79535-47bb-0310-9956-ffa450edef68
-
- Sep 18, 2015
-
-
Yann Ylavic authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703903 13f79535-47bb-0310-9956-ffa450edef68
-
- Sep 17, 2015
-
-
Jim Jagielski authored
Add in finding LUA installed via Macports and others accept both 5.1 and 5.2, so make messages clear Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703650 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703643 13f79535-47bb-0310-9956-ffa450edef68
-
- Sep 16, 2015
-
-
Jim Jagielski authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703418 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
mod_negotiation: simplify type-map body tag lookup, and be safe should it contain a NUL byte. Submitted by: ylavic Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703406 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
Core filters do not need mod_proxy.h Small speed optimization when parsing <Limit>, <LimitExcept> and environment variables Save a few bytes in conf pool Remove some spaces between some return statements and ';' + fix a strange formating in a 'for' loop In order to save a few cycles, delay a hash table lookup which is not necessary needed Constify + save a few bytes in conf pool Submitted by: ylavic, jailletc36, jailletc36, jailletc36, jailletc36, jailletc36 Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703405 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
allow autoindex w/o mod_dir/mod_mime setting the DIR_MAGIC_TYPE. Submitted by: covener Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703404 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
Improve macro definition in order to avoid potential precedence issues. For example, sparse spotted that the following line was spurious: newcond->flags &= ~CONDFLAG_NOCASE; It this particular case, 2 bits were resetted (instead of only 1). This was harmless because the first bit (i.e. CONDFLAG_NONE) is never tested as-is. Submitted by: jailletc36 Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703403 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703402 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703401 13f79535-47bb-0310-9956-ffa450edef68
-
- Sep 15, 2015
-
-
Yann Ylavic authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703215 13f79535-47bb-0310-9956-ffa450edef68
-
Yann Ylavic authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703205 13f79535-47bb-0310-9956-ffa450edef68
-
- Sep 14, 2015
-
-
Christophe Jaillet authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703060 13f79535-47bb-0310-9956-ffa450edef68
-
Christophe Jaillet authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703053 13f79535-47bb-0310-9956-ffa450edef68
-
- Sep 13, 2015
-
-
Lucien Gentis authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1702794 13f79535-47bb-0310-9956-ffa450edef68
-
Lucien Gentis authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1702793 13f79535-47bb-0310-9956-ffa450edef68
-
- Sep 12, 2015
-
-
Kaspar Brand authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1702646 13f79535-47bb-0310-9956-ffa450edef68
-
Kaspar Brand authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1702644 13f79535-47bb-0310-9956-ffa450edef68
-
- Sep 10, 2015
-
-
Eric Covener authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1702312 13f79535-47bb-0310-9956-ffa450edef68
-
- Sep 09, 2015
-
-
Richard Bowen authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1702021 13f79535-47bb-0310-9956-ffa450edef68
-
Richard Bowen authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1702020 13f79535-47bb-0310-9956-ffa450edef68
-
Eric Covener authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1701892 13f79535-47bb-0310-9956-ffa450edef68
-
- Sep 08, 2015
-
-
Jim Jagielski authored
Merge r1700317, r1700318, r1700319, r1700320, r1700321, r1700322, r1700326, r1700328, r1700330, r1700331, r1700332, r1700334, r1700336, r1700338 from trunk: Fix some spurious ident spotted by sparse Silence a sparse warning about inconsistent indenting Silence a sparse warning about inconsistent indenting Silence a sparse warning about inconsistent indenting Silence a sparse warning about inconsistent indenting Silence a sparse warning about inconsistent indenting Silence a sparse warning about inconsistent indenting + some minor style issues Remove useless line Silence a sparse warning about inconsistent indenting + some minor style issues Silence a sparse warning about inconsistent indenting + some minor style issues Silence a sparse warning about inconsistent indenting + some minor style issues Fix some spurious ident spotted by sparse Silence a sparse warning about inconsistent indenting + some minor style issues Silence a sparse warning about inconsistent indenting + some minor style issues Submitted by: jailletc36 Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1701772 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
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 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. Submitted by: jailletc36 Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1701771 13f79535-47bb-0310-9956-ffa450edef68
-
- Sep 07, 2015
-
-
Stefan Eissing authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1701656 13f79535-47bb-0310-9956-ffa450edef68
-
Yann Ylavic authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1701559 13f79535-47bb-0310-9956-ffa450edef68
-
Christophe Jaillet authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1701550 13f79535-47bb-0310-9956-ffa450edef68
-
- Sep 06, 2015
-
-
Eric Covener authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1701534 13f79535-47bb-0310-9956-ffa450edef68
-
Eric Covener authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1701529 13f79535-47bb-0310-9956-ffa450edef68
-
Eric Covener authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1701528 13f79535-47bb-0310-9956-ffa450edef68
-
Christophe Jaillet authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1701442 13f79535-47bb-0310-9956-ffa450edef68
-
Eric Covener authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1701437 13f79535-47bb-0310-9956-ffa450edef68
-
- Sep 05, 2015
-
-
Jim Jagielski authored
* Give ap_proxy_post_request as chance to act correctly on the status code by setting r->status temporarily to access_status. r->status might be different than access_status e.g. r->status could be HTTP_OK if e.g. we override the error page on the proxy or if the error was not generated by the backend itself but by the proxy e.g. a bad gateway. Submitted by: rpluem Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1701411 13f79535-47bb-0310-9956-ffa450edef68
-