]>
granicus.if.org Git - apache/log
Eric Covener [Sun, 10 May 2015 15:38:45 +0000 (15:38 +0000)]
sync note with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1678567 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 8 May 2015 15:41:35 +0000 (15:41 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1678386 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 8 May 2015 15:40:32 +0000 (15:40 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1678385 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 8 May 2015 15:14:03 +0000 (15:14 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1678375 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 8 May 2015 15:12:05 +0000 (15:12 +0000)]
apply change from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1678373 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 8 May 2015 11:17:07 +0000 (11:17 +0000)]
So far, looks OK. Revised patch applies cleanly and completely to 2.4 HEAD
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1678333 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 7 May 2015 16:28:38 +0000 (16:28 +0000)]
Merge r1585609 from trunk:
Allow Require expr to work when the expression is quoted.
For example as appears in our documentation:
Require expr "%{TIME_HOUR} -ge 9 && %{TIME_HOUR} -le 17"
PR: 56235
Submitted by: breser
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1678236 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 7 May 2015 16:28:19 +0000 (16:28 +0000)]
Merge r1677462 from trunk:
mod_dav: Avoid doing the walk on a COPY source for handling preconditions if
there are no preconditions provided.
* modules/dav/main/util.c:
(dav_validate_request): avoid validating locks and ETags when there are
no If headers providing them on a resource we aren't modifying.
Submitted by: breser
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1678235 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 7 May 2015 16:27:39 +0000 (16:27 +0000)]
i ProxySCGIInternalRedirect with alternate response header
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1678234 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 7 May 2015 16:26:43 +0000 (16:26 +0000)]
Merge r1676085 from trunk:
consistently output SSLCertificateChainFile deprecation warnings
Submitted by: kbrand
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1678233 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 7 May 2015 16:25:55 +0000 (16:25 +0000)]
Merge r1664133, r1643284, r1621417 from trunk:
* Fix typo in error message
mpm_event(opt): zero is immutable.
Fix printf format spotted by cppcheck.
Untested.
Submitted by: rpluem, ylavic, jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1678232 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 7 May 2015 15:18:48 +0000 (15:18 +0000)]
Propose real HEAD responses with zero C-L fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1678228 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 7 May 2015 13:21:02 +0000 (13:21 +0000)]
Vote hence promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1678191 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 7 May 2015 12:00:14 +0000 (12:00 +0000)]
a few votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1678172 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 7 May 2015 10:38:26 +0000 (10:38 +0000)]
easy vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1678161 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 7 May 2015 06:12:23 +0000 (06:12 +0000)]
Easy proposals (synch with trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1678132 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Sun, 3 May 2015 18:14:48 +0000 (18:14 +0000)]
* STATUS: Nominate r1677462
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1677466 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Sun, 3 May 2015 18:10:18 +0000 (18:10 +0000)]
* STATUS: Vote for PR 56235 nomination.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1677465 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 3 May 2015 16:35:52 +0000 (16:35 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1677447 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 3 May 2015 16:34:52 +0000 (16:34 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1677446 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 2 May 2015 16:40:21 +0000 (16:40 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1677333 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 2 May 2015 16:39:20 +0000 (16:39 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1677332 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 1 May 2015 18:59:36 +0000 (18:59 +0000)]
Follow up to r1677187.
Add compatibility note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1677211 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 1 May 2015 17:03:35 +0000 (17:03 +0000)]
Merge r1675533 from trunk:
mod_log_config: Add %M format to output request duration in milliseconds.
Submitted by: breser
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1677187 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 1 May 2015 17:02:08 +0000 (17:02 +0000)]
Merge r1675103 from trunk:
If a directory exists but no indexes can be resolved, the fallback resource
should be attempted first before giving up.
Submitted By: Jack <tjerk.meesters gmail.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@
1677186 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 1 May 2015 17:01:21 +0000 (17:01 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1677185 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 1 May 2015 17:00:19 +0000 (17:00 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1677184 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 1 May 2015 16:54:54 +0000 (16:54 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1677181 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 1 May 2015 16:53:13 +0000 (16:53 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1677180 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 1 May 2015 11:57:08 +0000 (11:57 +0000)]
Fix typo. PR57879
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1677117 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Fri, 1 May 2015 04:10:58 +0000 (04:10 +0000)]
merge r1677096 from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1677097 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 30 Apr 2015 08:31:57 +0000 (08:31 +0000)]
Fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1676925 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 29 Apr 2015 20:48:17 +0000 (20:48 +0000)]
Working on it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1676855 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 29 Apr 2015 20:13:08 +0000 (20:13 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1676844 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 29 Apr 2015 02:09:22 +0000 (02:09 +0000)]
merge r1676654 from trunk
The increased use of UuidCreate() in APR 1.5.2+ introduces an unresolved
reference to UuidCreate() to these support applications that link with
apr-1.lib and do not already link rpcrt4.lib.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1676655 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 26 Apr 2015 16:49:30 +0000 (16:49 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1676125 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 26 Apr 2015 16:46:14 +0000 (16:46 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1676124 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 26 Apr 2015 07:38:25 +0000 (07:38 +0000)]
remove mod_ssl proposals which have been in the STALLED category for 20+ months
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1676090 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 26 Apr 2015 07:16:35 +0000 (07:16 +0000)]
adjust link to SSL_CONF_cmd man page on www.openssl.org, again
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1676088 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 26 Apr 2015 07:03:31 +0000 (07:03 +0000)]
Merge r1650047 from trunk:
Add support for extracting subjectAltName entries of type
rfc822Name and dNSName into SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n
variables.
* docs/manual/mod/mod_ssl.xml: add SSL_*_SAN_*_n entries to the
environment variables table
* modules/ssl/ssl_engine_kernel.c: in ssl_hook_Fixup, add extraction
of subjectAltName entries for the "StdEnvVars" case
* modules/ssl/ssl_engine_vars.c: add support for retrieving the
SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n variables, either with
individual on-demand lookup (ssl_var_lookup_ssl_cert_san),
or with full-list extraction to the environment ("StdEnvVars")
* modules/ssl/ssl_private.h: add modssl_var_extract_san_entries prototype
* modules/ssl/ssl_util_ssl.c: implement SSL_X509_getSAN and
SSL_ASN1_STRING_to_utf8 helper functions, with factoring out common
code from SSL_X509_getIDs and SSL_X509_NAME_ENTRY_to_string where
suitable. Limit SSL_X509_getSAN to the two most common subjectAltName
entry types appearing in user or server certificates (i.e., rfc822Name
and dNSName), for the time being.
* modules/ssl/ssl_util_ssl.h: add SSL_ASN1_STRING_to_utf8
and SSL_X509_getSAN prototypes
Proposed by: kbrand
Reviewed by: ylavic, druggeri
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1676087 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 26 Apr 2015 06:48:31 +0000 (06:48 +0000)]
promote, and add a tiny mod_ssl proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1676086 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 25 Apr 2015 18:56:23 +0000 (18:56 +0000)]
Votes all around
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1676054 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Sat, 25 Apr 2015 00:38:00 +0000 (00:38 +0000)]
* STATUS: Nominate r1675533.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1675986 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 24 Apr 2015 19:41:21 +0000 (19:41 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1675938 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 23 Apr 2015 23:16:19 +0000 (23:16 +0000)]
mod_proxy_scgi: ProxySCGIInternalRedirect with alternate response header
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1675733 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 23 Apr 2015 00:28:24 +0000 (00:28 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1675525 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 23 Apr 2015 00:22:05 +0000 (00:22 +0000)]
Grammar improvements in performance tuning doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1675524 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Wed, 22 Apr 2015 23:58:49 +0000 (23:58 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1675523 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Apr 2015 19:08:29 +0000 (19:08 +0000)]
Merge r1675455 from trunk:
fix syntax
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1675456 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Apr 2015 17:50:43 +0000 (17:50 +0000)]
Merge r1675441 from trunk:
no --with-perl since 1.3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1675442 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Apr 2015 17:44:49 +0000 (17:44 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1675439 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Apr 2015 17:44:42 +0000 (17:44 +0000)]
Merge r1675436 from trunk:
add a prominent caveat about the effect of caching.
PR55089
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1675438 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Apr 2015 17:27:13 +0000 (17:27 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1675433 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Apr 2015 17:26:46 +0000 (17:26 +0000)]
Merge r1675426, r1675429 from trunk:
PR57778
document legacy AddType/ForceType magic types as Handler names
for the curious.
typoes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1675432 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 22 Apr 2015 17:10:17 +0000 (17:10 +0000)]
Applies (updated) patch from bz56214 from Javier Llorente. Updates
spanish translations of error documents.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1675421 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 21 Apr 2015 12:25:58 +0000 (12:25 +0000)]
propose fallbackresource PR
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1675104 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Tue, 21 Apr 2015 00:53:04 +0000 (00:53 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1675016 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Tue, 21 Apr 2015 00:49:14 +0000 (00:49 +0000)]
Grammar improvements in performance tuning doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1675015 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Mon, 20 Apr 2015 23:55:40 +0000 (23:55 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1675007 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Apr 2015 15:18:24 +0000 (15:18 +0000)]
comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674923 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Apr 2015 15:17:02 +0000 (15:17 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674922 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Apr 2015 15:14:16 +0000 (15:14 +0000)]
Merge r1666468, r1666618, r1674697 from trunk:
mpm_event: Allow for timer events duplicates.
Meanwhile ap[r]_skiplist_add()...
mpm_event: follow up to r1666468.
We only need one compare function for add semantic with apr_skiplist_insert()
and unique timers (pointers). It also should work with apr_skiplist_remove()
and apr_skiplist_find(), be they used some day.
mpm_event: follow up to r1666468 and r1666618.
We don't need to return 0 in the compare function, but for debugging purpose
which we could implement later if necessary (in a separate function).
For now, keep the function simple as in 2.4.x to ease backport, and add a
comment about why we never return 0 here.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674921 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Apr 2015 15:12:59 +0000 (15:12 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674920 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Apr 2015 15:12:34 +0000 (15:12 +0000)]
ok
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674919 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Apr 2015 13:13:59 +0000 (13:13 +0000)]
comment before vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674838 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 19 Apr 2015 22:14:34 +0000 (22:14 +0000)]
Comment on r1656259.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674703 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 19 Apr 2015 21:13:27 +0000 (21:13 +0000)]
Comment on r1674697.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674699 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 19 Apr 2015 19:04:15 +0000 (19:04 +0000)]
Add CHANGES for r1674659 and r1674660.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674670 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 19 Apr 2015 18:57:44 +0000 (18:57 +0000)]
Correct merge error in r1673860 and r1673871:
move CHANGES entries to correct version.
Use "mod_ssl" instead of "ssl".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674667 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 19 Apr 2015 18:24:30 +0000 (18:24 +0000)]
high latency chat via STATUS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674664 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 19 Apr 2015 18:18:10 +0000 (18:18 +0000)]
backport question/vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674663 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 19 Apr 2015 18:10:06 +0000 (18:10 +0000)]
comment/question
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674662 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 19 Apr 2015 18:06:05 +0000 (18:06 +0000)]
Merge r1674632 from trunk:
mod_proxy_wstunnel: Bypass the handler while the connection is not
upgraded to WebSocket, so that other modules can possibly take over
the leading HTTP requests.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674661 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 19 Apr 2015 18:05:15 +0000 (18:05 +0000)]
Merge r1671397, r1672466, r1672564 from trunk:
Add output for "?auto" version of server-status
to proxy status, mod_ssl session cache info,
mod_cache_socache and the status hook of the
individual socache implementations.
Followon to r1671397 for proxy server-status
in auto mode:
- don't show HTML legend
- Show correct worker name
More followon to r1671397 for proxy server-status
in auto mode:
- remove remaining HTML markup
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674660 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 19 Apr 2015 18:04:32 +0000 (18:04 +0000)]
Merge r1671396, r1672289, r1672453 from trunk:
Add more data to "?auto" view of server-status.
Although mod_status source code calls this the
"short_report", the docs and the API flag call
it "Machine Readable" resp. "STAT_OPT_AUTO".
So IMHO the data shown should be on par with
the html version.
Followon to r1671396:
Remove unwanted redundant output introduced
by that commit.
Followon to r1671396: add misiing newline in
new server-status output.
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674659 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 19 Apr 2015 18:03:38 +0000 (18:03 +0000)]
Merge r1646282 from trunk:
* Fix If-Match handling:
- We need to fail if we do NOT match.
- ETag comparison only makes sense if we have an ETag
PR: 57358
Submitted by: Kunihiko Sakamoto <ksakamoto google.com>
Reviewed by: rpluem
Submitted by: rpluem
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674658 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 19 Apr 2015 18:02:17 +0000 (18:02 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674657 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 19 Apr 2015 18:01:20 +0000 (18:01 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674656 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 19 Apr 2015 18:00:08 +0000 (18:00 +0000)]
Merge r1520445, r1672985, r1672989, r1673769 from trunk:
Add a warning if protocol given in SSLProtocol or SSLProxyProtocol will override other parameters given in the same directive.
This could be a missing + or - prefix.
PR 52820
Tweak log message
Add CHANGES entry before backport proposal
Follow-up to r1520445:
Tweak error message for clarity
Submitted by: jailletc36, trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674655 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 19 Apr 2015 17:58:48 +0000 (17:58 +0000)]
Merge r1674606 from trunk:
Fix duplicated APLOGNOs from r1661067 and r1661448.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674653 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 19 Apr 2015 16:48:45 +0000 (16:48 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674644 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 19 Apr 2015 16:47:30 +0000 (16:47 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674643 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 19 Apr 2015 16:15:47 +0000 (16:15 +0000)]
APLOGNO goodness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674637 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 19 Apr 2015 16:13:40 +0000 (16:13 +0000)]
quick votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674636 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 19 Apr 2015 16:12:06 +0000 (16:12 +0000)]
New proposals.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674635 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 19 Apr 2015 15:17:34 +0000 (15:17 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674630 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 19 Apr 2015 11:55:25 +0000 (11:55 +0000)]
Fix doc as spotted by Falco Schwarz in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674612 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Apr 2015 16:20:00 +0000 (16:20 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674533 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Apr 2015 16:18:47 +0000 (16:18 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674532 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 17 Apr 2015 20:32:10 +0000 (20:32 +0000)]
rebuild docs with meta element enabled
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674394 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 17 Apr 2015 19:54:17 +0000 (19:54 +0000)]
backport http://svn.apache.org/r1674382
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674387 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 17 Apr 2015 19:53:26 +0000 (19:53 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674386 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 17 Apr 2015 06:03:39 +0000 (06:03 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674218 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 16 Apr 2015 18:30:52 +0000 (18:30 +0000)]
Don't match just .cgi or ..cgi or ...cgi, etc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674131 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 16 Apr 2015 18:29:46 +0000 (18:29 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674129 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 16 Apr 2015 18:21:23 +0000 (18:21 +0000)]
Applies fix recommended in bz56346
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674127 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 16 Apr 2015 14:59:48 +0000 (14:59 +0000)]
Rebuild a crapload of xdocs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674086 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 16 Apr 2015 14:48:09 +0000 (14:48 +0000)]
Update proposal (client_failed) for mod_proxy_ajp.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674080 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 16 Apr 2015 11:48:57 +0000 (11:48 +0000)]
minor capitalization tweaks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674048 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 16 Apr 2015 05:45:41 +0000 (05:45 +0000)]
Add r1673769 to a proposal (tweak error message)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1674006 13f79535 -47bb-0310-9956-
ffa450edef68