httpd

Checkout Tools
  • last updated 4 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1702017 is being indexed.

Rebuild
  1. … 20 more files in changeset.
Patch from info@mathijs.info to use 2.4 authz syntax.

Use 2.4 access control syntax. Patch from info@mathijs.info

propose old trunk patch

merged latest changes in 2.4.x
  1. … 5 more files in changeset.
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

    • ?
    /httpd/branches/2.4.x/support/logresolve.c
Merge r1696105, r1700418 from trunk:

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

added 1701347, re-merged with current 2.4.x
    • ?
    /httpd/branches/2.4.17-protocols-http2/STATUS
In order to save a few cycles, delay a hash table lookup which is not necessary needed
updated http2 backport proposal with own branch reference
merge of protocols + http2 relevant changes
  1. … 80 more files in changeset.
transient branch to bring Protocols feature and mod_h2 into 2.4.x

Vote.
Update proposal
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.

Revert r1697735.
vote for alternative fix

remove old flavor of ALPN proposal, new ALPN/Protols is now proposed.

some easy votes/promotes

Add CHANGES entry
autoindex fix w/o mod_mime and mod_dir

allow autoindex w/o mod_dir/mod_mime setting the DIR_MAGIC_TYPE.

Merge r1597352 from trunk:

* 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

*) mod_session_dbd: fix lifetime of Request notes.

trunk: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/mod_session_dbd.c?r1=1679181&r2=1687087&view=patch

2.4.x: trunk patch applies.

+1: niq, ylavic, jim

Merge r1693963 from trunk:

Allow cookies set by mod_rewrite to contain ':' by accepting

';' as an alternate separator. PR47241.

Submitted By: <bugzilla schermesser com>, covener

Committed By: covener

Submitted by: covener

Reviewed/backported by: jim

Merge r1693919 from trunk:

Add HTTPD_VERSION and HTTPD_MMN to the variables available with apxs -q

PR58202.

Submitted By: Daniel Shahaf

Committed By: covener

Submitted by: covener

Reviewed/backported by: jim

promote

ok

Merge r1695170 from trunk:

Avoid a crash when lacking correct DB access permissions. PR 57868.

Submitted by: jailletc36

Reviewed/backported by: jim

Merge r1688660 from trunk:

mod_authz_dbd: Avoid a crash when lacking correct DB access permissions. PR 57868.

Submitted by: Jose Kahan <jose w3.org>

Submitted by: ylavic

Reviewed/backported by: jim