]>
granicus.if.org Git - apache/log
Jean-Frederic Clere [Wed, 19 Aug 2015 11:46:23 +0000 (11:46 +0000)]
keep the C89-ers happy. Submitted by Norm (normw@gknw.net).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1696565 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 18 Aug 2015 19:50:08 +0000 (19:50 +0000)]
cosmetic: match case style to all previous
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1696490 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Tue, 18 Aug 2015 18:48:34 +0000 (18:48 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1696481 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Tue, 18 Aug 2015 18:44:50 +0000 (18:44 +0000)]
Grammar corrections
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1696480 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Tue, 18 Aug 2015 18:17:38 +0000 (18:17 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1696475 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 18 Aug 2015 15:03:37 +0000 (15:03 +0000)]
reverted late connection creation after encountering concurrency issues on ubuntu
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1696442 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 18 Aug 2015 14:33:55 +0000 (14:33 +0000)]
creating ap_array_index in util, forwarding scheme into request processing, enabling SSL vars only when scheme is not http:, delayed connection creation until task worker assignment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1696428 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 17 Aug 2015 14:02:07 +0000 (14:02 +0000)]
announcing Alt-Svc only on first request per connection, using handler independent hook
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1696279 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 17 Aug 2015 12:54:54 +0000 (12:54 +0000)]
removed unnecessary lingering_close and sbh update on end of protocol upgrade handling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1696266 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 17 Aug 2015 12:45:57 +0000 (12:45 +0000)]
introducing ap_array_index in util, used in protocol and mod_h2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1696264 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 16 Aug 2015 15:58:57 +0000 (15:58 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1696152 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 16 Aug 2015 15:58:03 +0000 (15:58 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1696151 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 15 Aug 2015 22:05:08 +0000 (22:05 +0000)]
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
Stefan Eissing [Fri, 14 Aug 2015 14:07:43 +0000 (14:07 +0000)]
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
Mike Rumph [Fri, 14 Aug 2015 13:56:35 +0000 (13:56 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1695915 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Fri, 14 Aug 2015 13:51:38 +0000 (13:51 +0000)]
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
Mike Rumph [Fri, 14 Aug 2015 13:28:57 +0000 (13:28 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1695904 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 14 Aug 2015 12:56:21 +0000 (12:56 +0000)]
removed H2Engine directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1695885 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 14 Aug 2015 12:16:56 +0000 (12:16 +0000)]
fixes existing protocol missing in selection if not explicitly proposed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1695874 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 13 Aug 2015 19:41:36 +0000 (19:41 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1695765 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 13 Aug 2015 19:36:41 +0000 (19:36 +0000)]
Grammar corrections.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1695762 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 13 Aug 2015 15:33:07 +0000 (15:33 +0000)]
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
Mike Rumph [Thu, 13 Aug 2015 14:11:45 +0000 (14:11 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1695712 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 12 Aug 2015 17:35:47 +0000 (17:35 +0000)]
+ *) mod_dir: Prevent the internal identifier "httpd/unix-directory" from
+ appearing as a Content-Type response header when requests for a directory
+ are rewritten by mod_rewrite. [Eric Covener]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1695583 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 10 Aug 2015 21:31:05 +0000 (21:31 +0000)]
Avoid a crash when lacking correct DB access permissions. PR 57868.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1695170 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Mon, 10 Aug 2015 03:40:24 +0000 (03:40 +0000)]
missed during c89-ifying in r1692432
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1694951 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Mon, 10 Aug 2015 03:30:25 +0000 (03:30 +0000)]
ap_process_request needs exportation for use in mod_h2 on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1694950 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Mon, 10 Aug 2015 00:09:58 +0000 (00:09 +0000)]
remove space after \
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1694936 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sun, 9 Aug 2015 21:33:02 +0000 (21:33 +0000)]
Third try, follows up
1694901 and
1694902
MinGW32 and MSVC both define WIN32
MSVC and Netware do not use autoconf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1694912 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sun, 9 Aug 2015 20:02:02 +0000 (20:02 +0000)]
Add include path for NetWare build.
Submitted by: normw gknw net.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1694903 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sun, 9 Aug 2015 19:47:55 +0000 (19:47 +0000)]
followup to r1694901, it was too greedy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1694902 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sun, 9 Aug 2015 19:21:44 +0000 (19:21 +0000)]
ap_config_auto.h is not used/created in non-Autoconf compilers like MSVC
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1694901 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 3 Aug 2015 20:09:41 +0000 (20:09 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1693964 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 3 Aug 2015 20:09:34 +0000 (20:09 +0000)]
Allow cookies set by mod_rewrite to contain ':' by accepting
';' as an alternate separator. PR47241.
Submitted By: <bugzilla schermesser com>, covener
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1693963 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 3 Aug 2015 15:37:07 +0000 (15:37 +0000)]
Add HTTPD_VERSION and HTTPD_MMN to the variables available with apxs -q
PR58202.
Submitted By: Daniel Shahaf
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1693919 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 3 Aug 2015 15:29:42 +0000 (15:29 +0000)]
c89
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1693918 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 2 Aug 2015 21:12:46 +0000 (21:12 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1693829 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 2 Aug 2015 21:09:47 +0000 (21:09 +0000)]
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
Rich Bowen [Sun, 2 Aug 2015 20:54:23 +0000 (20:54 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1693827 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 2 Aug 2015 20:52:55 +0000 (20:52 +0000)]
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
Kaspar Brand [Sun, 2 Aug 2015 07:32:46 +0000 (07:32 +0000)]
update mod_ssl.html.en transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1693793 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 2 Aug 2015 07:30:45 +0000 (07:30 +0000)]
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
Eric Covener [Thu, 30 Jul 2015 21:23:10 +0000 (21:23 +0000)]
zap some recently backported items
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1693505 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 24 Jul 2015 13:46:08 +0000 (13:46 +0000)]
removed accidental code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1692516 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 24 Jul 2015 12:09:44 +0000 (12:09 +0000)]
new Protocols directive and core API changes to enable protocol switching on HTTP Upgrade or ALPN, implemented in mod_ssl and mod_h2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1692486 13f79535 -47bb-0310-9956-
ffa450edef68
Edward Lu [Thu, 23 Jul 2015 19:20:09 +0000 (19:20 +0000)]
c89-ify http2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1692432 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 22 Jul 2015 14:44:06 +0000 (14:44 +0000)]
renamed H2InitialWindowSize to H2WindowSize, fixed post_read registration to be really first to install necessary response parsing filters
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1692285 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Wed, 22 Jul 2015 12:08:01 +0000 (12:08 +0000)]
mod_ssl: allow enabling of SSLProtocols even though they are disabled by OpenSSL
by default. Show warning in that case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1692258 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 20 Jul 2015 10:13:38 +0000 (10:13 +0000)]
do some property cleanup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1691908 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 19 Jul 2015 12:10:13 +0000 (12:10 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1691820 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 19 Jul 2015 12:06:14 +0000 (12:06 +0000)]
fixup properties
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1691819 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Jul 2015 15:03:06 +0000 (15:03 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1691739 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Jul 2015 15:02:00 +0000 (15:02 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1691738 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Fri, 17 Jul 2015 15:46:19 +0000 (15:46 +0000)]
Arrange the C++ declarations to make my compiler happy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1691592 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 17 Jul 2015 14:52:11 +0000 (14:52 +0000)]
fix for detecting direct mode on a TLS connections
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1691582 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 16 Jul 2015 12:10:00 +0000 (12:10 +0000)]
fix for correct assert
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1691374 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 12 Jul 2015 13:21:14 +0000 (13:21 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1690456 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 12 Jul 2015 13:20:13 +0000 (13:20 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1690455 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Jul 2015 15:55:05 +0000 (15:55 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1690380 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Jul 2015 15:54:00 +0000 (15:54 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1690379 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 11 Jul 2015 05:55:24 +0000 (05:55 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1690353 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 11 Jul 2015 05:51:59 +0000 (05:51 +0000)]
Add a link to perf-scaling.html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1690352 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 11 Jul 2015 04:49:37 +0000 (04:49 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1690344 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 11 Jul 2015 04:39:42 +0000 (04:39 +0000)]
Fix doc as spotted by Matthew in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1690343 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 10 Jul 2015 11:45:46 +0000 (11:45 +0000)]
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
André Malo [Thu, 9 Jul 2015 20:59:23 +0000 (20:59 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1690173 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 9 Jul 2015 18:07:50 +0000 (18:07 +0000)]
s/\<\(\w\+\)\>\s\+\<\1\>/\1/g
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1690137 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 9 Jul 2015 16:07:25 +0000 (16:07 +0000)]
s/a a/a/g
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1690122 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 9 Jul 2015 16:03:29 +0000 (16:03 +0000)]
Rebuild html.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1690121 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 9 Jul 2015 16:01:56 +0000 (16:01 +0000)]
s/the the/the/g
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1690120 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 7 Jul 2015 15:21:20 +0000 (15:21 +0000)]
remove old static ldc->reason
--This line, and those bdelow, will be ignored--
M util_ldap.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1689698 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 7 Jul 2015 14:43:31 +0000 (14:43 +0000)]
stuff unexpected LDAP errors into ldc->reason, not just in trace messages.
fix some enormously long lines introduced recently.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1689694 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 7 Jul 2015 08:54:33 +0000 (08:54 +0000)]
test commit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1689605 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 6 Jul 2015 17:47:50 +0000 (17:47 +0000)]
Fix typo spotted in comment in online doc. [comment #1683)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1689468 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 6 Jul 2015 07:13:57 +0000 (07:13 +0000)]
mod_reqtimeout: follow up to r1621453.
Don't let pipelining checks and keep-alive times interfere
with the timeouts computed for subsequent requests. PR 56729.
With pipelined requests, the log_transaction hook is called when the request
is destroyed, which may happen after a subsequent request is to be handled on
the same connection.
Move the initialization of the "header" state into pre_read_request() instead,
and get rid of the racy log_trasaction hook.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1689325 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 6 Jul 2015 06:30:57 +0000 (06:30 +0000)]
Add missing <code> around a parameter
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1689317 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Jul 2015 14:21:37 +0000 (14:21 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1689164 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Jul 2015 14:20:40 +0000 (14:20 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1689163 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Wed, 1 Jul 2015 18:21:22 +0000 (18:21 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688700 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Wed, 1 Jul 2015 18:16:20 +0000 (18:16 +0000)]
Grammar, spelling, and other minor corrections
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688698 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 1 Jul 2015 14:37:00 +0000 (14:37 +0000)]
mod_authz_dbd: Avoid a crash when lacking correct DB access permissions. PR 57868.
Submitted by: Jose Kahan <jose w3.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688660 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 1 Jul 2015 00:19:59 +0000 (00:19 +0000)]
http: follow up to r1685345.
Be lenient up to 10 (room for 32bit decimals) Bad White Spaces (BWS)
between chunk-size and chunk-ext/CRLF.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688538 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 1 Jul 2015 00:08:44 +0000 (00:08 +0000)]
http: follow up to r1685345, also needed in 2.4.x/2.2.x by r1686271/r1687339.
Handle reentrance of state BODY_CHUNK_CR to avoid AH02901 when we eat BWS
from multiple reads.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688536 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 Jun 2015 15:52:41 +0000 (15:52 +0000)]
Fold in latest changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688475 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 Jun 2015 15:26:16 +0000 (15:26 +0000)]
Fold in git archive master of mod_h2 (latest commit
11905f474e )
from https://github.com/icing/mod_h2 as per software grant.
Since this is a git archive of master (for tracking and IP
provenance history), it includes files that will likely
be removed/renamed/etc...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688474 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 30 Jun 2015 08:40:17 +0000 (08:40 +0000)]
mod_remoteip: Use r->useragent_addr as the root trusted address for verifying.
This fixes issue resulting in setting of bad useragent_ip when internal
redirection has been generated as response to the request (typically as
result of "ErrorDocument 40x").
In this case, the original request has been handled by mod_remoteip and its
useragent_ip has been changed properly, but when internal redirection
to ErrorDocument has been generated later, the mod_remoteip's handler has been
executed again with *the same* c->client_addr as in the original request. If
c->client_addr IP is trusted, this results in bad useragent_ip being set.
When using r->useragent_addr as the root trusted address instead of
c->client_addr, the internal redirection uses the first non-trusted
IP in this particular case, so it won't change the r->useragent_ip during
the internal redirection to ErrorDocument.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688399 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 30 Jun 2015 02:40:09 +0000 (02:40 +0000)]
Net -8 LoC, my usual specialty.
This didn't need to be reinvented; please use established helpers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688343 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 30 Jun 2015 01:31:13 +0000 (01:31 +0000)]
Increase legibility of the max_line_length behavior, and adjust for
the requirement that all members are initialized explicitly due to
the previous patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688341 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 30 Jun 2015 01:29:43 +0000 (01:29 +0000)]
Optimize in all cases that the members are all explicitly initialized.
Useful for 2.2 and 2.4, but trunk will require the subsequent patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688340 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 30 Jun 2015 01:27:42 +0000 (01:27 +0000)]
Very difficult to read, and therefore was wrong.
Assert that the SubstituteInheritBefore option was explicitly toggled,
and do not default in 2.x to this legacy behavior.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688339 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 29 Jun 2015 23:44:28 +0000 (23:44 +0000)]
mod_substitute: follow up to r1687680.
Fix dir config merger 'over'-write, thanks Bill (again).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688331 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 29 Jun 2015 17:52:00 +0000 (17:52 +0000)]
http: follow up to r1484852.
Don't check LimitRequestBody when there is no (more) body.
This fixes an uninitialized use of 'totalread' in ap_http_filter() when either
the remaining or requested number of body bytes is zero, leading to an invalid
computation of bytes received.
Reported by: Michael Kaufmann <mail michael-kaufmann.ch>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688274 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 28 Jun 2015 13:41:05 +0000 (13:41 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688010 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 28 Jun 2015 13:36:16 +0000 (13:36 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688009 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 28 Jun 2015 13:33:28 +0000 (13:33 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688007 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 28 Jun 2015 13:32:47 +0000 (13:32 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688006 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 28 Jun 2015 13:28:16 +0000 (13:28 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688004 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 28 Jun 2015 13:26:26 +0000 (13:26 +0000)]
Typo and XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1688003 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 28 Jun 2015 00:56:09 +0000 (00:56 +0000)]
*) mod_ldap: In some case, LDAP_NO_SUCH_ATTRIBUTE could be returned instead of
an error during a compare operation. [Eric Covener]
+ accompanying trace.
Note: the if/else now matches (don't replace unknown compare errors with
LDAP_NO_SUCH_ATTRIBUTE) the logic just above when pulling comparisons
out of the cache.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1687980 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 26 Jun 2015 15:10:29 +0000 (15:10 +0000)]
mod_proxy: follow up to r1678768.
The resource is not dereferenceable if connection_destructor()
is called from reslist_destroy().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1687783 13f79535 -47bb-0310-9956-
ffa450edef68