]>
granicus.if.org Git - apache/log
Graham Leggett [Sun, 27 Sep 2015 11:33:27 +0000 (11:33 +0000)]
mod_cache: r->err_headers_out is not merged into
r->headers when mod_cache is enabled and the response
is cached for the first time.
Submitted by: elu
Reviewed by: ylavic, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705528 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 27 Sep 2015 11:31:49 +0000 (11:31 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705527 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 23:36:30 +0000 (23:36 +0000)]
Propose MMN bump.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705501 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 22:55:56 +0000 (22:55 +0000)]
mod_slotmem_shm: Fix slots/SHM files names on restart for systems that
can't create new (clear) slots while previous children gracefully stopping
still use the old ones (e.g. Windows, OS2). PR 58024.
Submitted by: ylavic
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705499 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 22:54:42 +0000 (22:54 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705498 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 22:44:23 +0000 (22:44 +0000)]
util_script: Make REDIRECT_URL a complete URL (where set).
PR 57785
Submitted by: niq
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705496 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 22:42:44 +0000 (22:42 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705495 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 22:31:37 +0000 (22:31 +0000)]
We need docs...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705494 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 22:22:31 +0000 (22:22 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705493 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 22:20:14 +0000 (22:20 +0000)]
MPMs: Support SO_REUSEPORT to create multiple duplicated listener
records for scalability.
Submitted by: Yingqi Lu <yingqi.lu@intel.com>, Jeff Trawick,
Jim Jagielski, Yann Ylavic
Reviewed by: ylavic, jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705492 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 22:16:18 +0000 (22:16 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705491 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 21:59:39 +0000 (21:59 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705490 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 21:50:23 +0000 (21:50 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705488 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 21:39:42 +0000 (21:39 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705486 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 26 Sep 2015 21:36:34 +0000 (21:36 +0000)]
Proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705485 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sat, 26 Sep 2015 08:08:16 +0000 (08:08 +0000)]
propose a few PR-related mod_ssl backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705398 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 25 Sep 2015 20:08:43 +0000 (20:08 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705346 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 25 Sep 2015 19:46:55 +0000 (19:46 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705344 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 25 Sep 2015 19:10:51 +0000 (19:10 +0000)]
Fix typo in comment
(r1380525 on trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705340 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 24 Sep 2015 20:24:19 +0000 (20:24 +0000)]
add fix for abuse of per-connection module config
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705135 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 24 Sep 2015 16:30:29 +0000 (16:30 +0000)]
propose logio PR
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1705100 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 23 Sep 2015 14:09:47 +0000 (14:09 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1704860 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 23 Sep 2015 12:35:57 +0000 (12:35 +0000)]
Merge r1664709, r1697323 from trunk:
* 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 [Wed, 23 Sep 2015 12:33:57 +0000 (12:33 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1704834 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 23 Sep 2015 12:33:31 +0000 (12:33 +0000)]
vote and demote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1704833 13f79535 -47bb-0310-9956-
ffa450edef68
Edward Lu [Mon, 21 Sep 2015 19:28:11 +0000 (19:28 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1704402 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 19 Sep 2015 16:08:16 +0000 (16:08 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1704058 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 19 Sep 2015 16:07:29 +0000 (16:07 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1704057 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 18 Sep 2015 16:57:33 +0000 (16:57 +0000)]
Propose mod_proxy fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703903 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 17 Sep 2015 16:56:01 +0000 (16:56 +0000)]
Merge r1703417, r1703642 from trunk:
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 [Thu, 17 Sep 2015 15:02:43 +0000 (15:02 +0000)]
Backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703643 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Sep 2015 14:44:49 +0000 (14:44 +0000)]
Backport req
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703418 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Sep 2015 13:34:30 +0000 (13:34 +0000)]
Merge r1700851 from trunk:
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 [Wed, 16 Sep 2015 13:34:11 +0000 (13:34 +0000)]
Merge r1602978, r1683044, r1683884, r1673368, r1701717, r1683047 from trunk:
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 [Wed, 16 Sep 2015 13:33:12 +0000 (13:33 +0000)]
Merge r1701436 from trunk:
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 [Wed, 16 Sep 2015 13:32:21 +0000 (13:32 +0000)]
Merge r1701545 from trunk:
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 [Wed, 16 Sep 2015 13:31:45 +0000 (13:31 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703402 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Sep 2015 13:31:17 +0000 (13:31 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703401 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 15 Sep 2015 14:44:41 +0000 (14:44 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703215 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 15 Sep 2015 14:36:14 +0000 (14:36 +0000)]
Propose mod_slotmem_shm/mpm_winnt fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703205 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 14 Sep 2015 21:14:21 +0000 (21:14 +0000)]
Update easy proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703060 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 14 Sep 2015 20:26:16 +0000 (20:26 +0000)]
Easy proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1703053 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 13 Sep 2015 16:51:49 +0000 (16:51 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1702794 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 13 Sep 2015 16:50:53 +0000 (16:50 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1702793 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sat, 12 Sep 2015 15:50:07 +0000 (15:50 +0000)]
update mod_ssl transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1702646 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sat, 12 Sep 2015 15:42:40 +0000 (15:42 +0000)]
link to the OpenSSL 1.0.2 version of the SSL_CONF_cmd man page
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1702644 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 10 Sep 2015 19:32:52 +0000 (19:32 +0000)]
Andy Wang says lots of fishy things here
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1702312 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 9 Sep 2015 14:09:22 +0000 (14:09 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1702021 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 9 Sep 2015 14:07:35 +0000 (14:07 +0000)]
Applies patch from info@mathijs.info to use 2.4 authz syntax.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1702020 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 9 Sep 2015 02:37:49 +0000 (02:37 +0000)]
propose old trunk patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701892 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 8 Sep 2015 11:10:16 +0000 (11:10 +0000)]
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 [Tue, 8 Sep 2015 11:07:37 +0000 (11:07 +0000)]
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701771 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 7 Sep 2015 18:08:52 +0000 (18:08 +0000)]
updated http2 backport proposal with own branch reference
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701656 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 7 Sep 2015 06:54:54 +0000 (06:54 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701559 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 7 Sep 2015 06:07:32 +0000 (06:07 +0000)]
Update proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701550 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 6 Sep 2015 21:47:45 +0000 (21:47 +0000)]
vote for alternative fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701534 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 6 Sep 2015 21:28:35 +0000 (21:28 +0000)]
remove old flavor of ALPN proposal, new ALPN/Protols is now proposed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701529 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 6 Sep 2015 21:25:14 +0000 (21:25 +0000)]
some easy votes/promotes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701528 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 6 Sep 2015 06:10:29 +0000 (06:10 +0000)]
Add CHANGES entry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701442 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 6 Sep 2015 02:08:32 +0000 (02:08 +0000)]
autoindex fix w/o mod_mime and mod_dir
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701437 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 5 Sep 2015 17:04:34 +0000 (17:04 +0000)]
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701411 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 5 Sep 2015 17:04:13 +0000 (17:04 +0000)]
*) 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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701410 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 5 Sep 2015 17:02:41 +0000 (17:02 +0000)]
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701409 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 5 Sep 2015 17:02:03 +0000 (17:02 +0000)]
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701408 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 5 Sep 2015 17:01:10 +0000 (17:01 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701407 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 5 Sep 2015 17:00:27 +0000 (17:00 +0000)]
ok
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701406 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 5 Sep 2015 16:58:48 +0000 (16:58 +0000)]
Merge r1695170 from trunk:
Avoid a crash when lacking correct DB access permissions. PR 57868.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701405 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 5 Sep 2015 16:58:11 +0000 (16:58 +0000)]
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701404 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 5 Sep 2015 06:39:49 +0000 (06:39 +0000)]
Fix typo (r1701349 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701351 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 4 Sep 2015 11:26:27 +0000 (11:26 +0000)]
Fix commits URLs ('r' prefix).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701217 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 4 Sep 2015 11:06:44 +0000 (11:06 +0000)]
updated backport proposal for protocols+mod_h2, updated patches
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1701210 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 2 Sep 2015 14:09:42 +0000 (14:09 +0000)]
proposed backport of mod_h2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1700829 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 2 Sep 2015 11:09:34 +0000 (11:09 +0000)]
updated protocols patch with latest changes and the missing NPN removal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1700766 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 1 Sep 2015 09:56:05 +0000 (09:56 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1700462 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 1 Sep 2015 09:49:46 +0000 (09:49 +0000)]
Vote, comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1700458 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 1 Sep 2015 09:34:31 +0000 (09:34 +0000)]
Easy proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1700447 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 1 Sep 2015 09:11:45 +0000 (09:11 +0000)]
Update proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1700429 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 28 Aug 2015 21:21:41 +0000 (21:21 +0000)]
Move proposal to PATCHES/ISSUES THAT ARE BEING WORKED
Remove Eric vote as the patch will be tweaked.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1698419 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 28 Aug 2015 18:01:53 +0000 (18:01 +0000)]
vote for memcache change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1698388 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 28 Aug 2015 17:54:29 +0000 (17:54 +0000)]
backport http://svn.apache.org/r1695583 from trunk:
mod_dir: when we bail out of fixups, make sure Content-Type is not still
httpd/unix-directory. This only happens when the generator sets
no content-type which is more common w/ no DefaultType in 2.4.
Submitted By: covener
Reviewed By: ylavic, niq
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1698384 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 28 Aug 2015 12:55:53 +0000 (12:55 +0000)]
pull proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1698327 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 27 Aug 2015 23:02:03 +0000 (23:02 +0000)]
add FallbackResource / PR58292 fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1698240 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 27 Aug 2015 12:26:58 +0000 (12:26 +0000)]
adding changeset for ap_array_index start parameter and ap_array_contains function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1698137 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 27 Aug 2015 11:50:45 +0000 (11:50 +0000)]
Withdraw mod_proxy_balancer proposal (reverted).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1698124 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 27 Aug 2015 11:25:09 +0000 (11:25 +0000)]
adding r1698116 to core-protocols.patch to clarify new api
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1698117 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 27 Aug 2015 08:57:30 +0000 (08:57 +0000)]
added r1693918 to change list for protocols backport, updated core-protocols.patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1698094 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 26 Aug 2015 13:37:18 +0000 (13:37 +0000)]
proposing Protocols patch for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1697931 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 26 Aug 2015 13:36:34 +0000 (13:36 +0000)]
arg, reverting the merge info
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1697930 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 26 Aug 2015 13:34:10 +0000 (13:34 +0000)]
proposing Protocols patch for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1697928 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 24 Aug 2015 10:39:17 +0000 (10:39 +0000)]
Add warning about reaching the balancer[-member] growth limit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1697353 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 24 Aug 2015 10:05:53 +0000 (10:05 +0000)]
Still +1 with the new change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1697348 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 24 Aug 2015 07:46:52 +0000 (07:46 +0000)]
* Add patch for better cleanup and reset vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1697324 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 24 Aug 2015 07:40:33 +0000 (07:40 +0000)]
* Comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1697322 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 22 Aug 2015 16:47:39 +0000 (16:47 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1697100 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 22 Aug 2015 16:40:39 +0000 (16:40 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1697099 13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Fri, 21 Aug 2015 23:05:42 +0000 (23:05 +0000)]
Status review: vote, promote, comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1697067 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 21 Aug 2015 16:18:33 +0000 (16:18 +0000)]
Update SubstituteInheritBefore proposal to v5.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1697021 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 21 Aug 2015 13:38:09 +0000 (13:38 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1696976 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 21 Aug 2015 13:32:51 +0000 (13:32 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1696970 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 21 Aug 2015 12:53:10 +0000 (12:53 +0000)]
Propose fix for PR 58024.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1696962 13f79535 -47bb-0310-9956-
ffa450edef68