]>
granicus.if.org Git - apache/log
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
Rich Bowen [Wed, 15 Apr 2015 20:59:47 +0000 (20:59 +0000)]
Correct a regex so that it doesn't match the file named '.cgi'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673957 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 15 Apr 2015 20:53:58 +0000 (20:53 +0000)]
Resolves bz55123 - spaces around emdashes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673953 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 20:10:22 +0000 (20:10 +0000)]
clarify, fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673946 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 19:56:29 +0000 (19:56 +0000)]
inadvertent change in
1673940
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673942 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 19:51:44 +0000 (19:51 +0000)]
Merge r1634120 from trunk:
* Use the correct server name for SNI in case the backend SSL connection itself
is established via a proxy server.
PR: 57139
Submitted by: Szabolcs Gyurko <szabolcs gyurko.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673941 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 19:49:31 +0000 (19:49 +0000)]
Merge r1666297 from trunk:
ssl_util: Fix possible crash (free => OPENSSL_free) and error path leaks when
checking the server certificate constraints (SSL_X509_getBC()).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673940 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 18:39:23 +0000 (18:39 +0000)]
compat info pointed out by Christophe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673924 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 18:06:04 +0000 (18:06 +0000)]
Merge r1652955, r1652985, r1652989 from trunk:
PR 57379: If mod_cgi and mod_cgid get installed,
use IfModule for MPM to LoadModule mod_cgi for
prefork and mod_cgid for all other MPMs.
Previously when combined with --enable-load-all-modules
both modules were loaded and it was undefined
which one actually handled cgi requests.
Based on a patch by olli hauer <ohauer gmx.de>.
Addition to r1652955: Use "=" in combination
with "test" instead of "==".
Fix indentation and tab use after r1652955.
Submitted By: olli hauer <ohauer gmx.de>
Reviewed By: rjung, ylavic, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673909 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 17:59:42 +0000 (17:59 +0000)]
Merge r1671918, r1673113 from trunk:
allow time to first byte (of response headers)
to be logged by mod_logio.
mod_logio was just a conveninent place to do this
w/o writing a new filter or complicating an existing
important one.
Use 'unsigned int' in bitfield
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673904 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 17:57:18 +0000 (17:57 +0000)]
Backport r1669299 from trunk:
*) mod_proxy_wstunnel: Avoid an empty response by failing with 502 (Bad
Gateway) when no response is ever received from the backend.
Submitted By: jkaluza
Reviewde By: covener, ylavic, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673902 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 17:55:41 +0000 (17:55 +0000)]
Merge r1673455 from trunk:
mod_ssl: Protect ENGINE_CTRL_CHIL_SET_FORKCHECK macro with a
featue check for libressl.
Submitted by: Stuart Henderson <sthen openbsd.org>
Reviewed by: covener, trawick, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673900 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 17:50:46 +0000 (17:50 +0000)]
mod_proxy_http: Use the "Connection: close" header for requests to
backends not recycling connections (disablereuse), including the default
reverse and forward proxies.
Submitted by: ylavic (and trawick for an old helper function)
Reviewed by: rjung, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673896 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 15 Apr 2015 17:48:11 +0000 (17:48 +0000)]
Note which indexoptions require fancyindexing. resolves bz56985
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673893 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 15 Apr 2015 17:40:00 +0000 (17:40 +0000)]
Moving back event timers duplicates fix to proposals.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673891 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 17:03:44 +0000 (17:03 +0000)]
ask for details on stalled issue
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673874 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Wed, 15 Apr 2015 17:03:08 +0000 (17:03 +0000)]
We need moar emails - format change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673873 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 16:56:22 +0000 (16:56 +0000)]
Merge r1632742, r1634836 from trunk:
mod_buffer: Forward flushed input data immediately and avoid (unlikely)
access to freed memory.
Submitted by: ylavic, jailletc36
Reviewed by: covener, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673871 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Wed, 15 Apr 2015 16:53:25 +0000 (16:53 +0000)]
Flip directives and topics sections after discussion around ordering
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673869 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 16:52:53 +0000 (16:52 +0000)]
doubl-rainbow vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673868 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 16:42:46 +0000 (16:42 +0000)]
Merge r1642847 and r1673155 from trunk so that yesterday's ApacheCon talk is valid:
core: Add CGIPassAuth directive to control whether HTTP authorization
headers are passed to scripts as CGI variables.
PR: 56855
Reviewed by: rjung, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673860 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 15 Apr 2015 16:35:10 +0000 (16:35 +0000)]
Rebuilds Daniel's change to the order of directictives vs topics in
manual docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673855 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Wed, 15 Apr 2015 16:31:50 +0000 (16:31 +0000)]
Adjust template to align page content with table of contents
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673852 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 16:25:47 +0000 (16:25 +0000)]
one pear-flavored drink, one vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673850 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 15:57:55 +0000 (15:57 +0000)]
sorry for crappy comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673842 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 15 Apr 2015 15:53:23 +0000 (15:53 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673839 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 15:50:51 +0000 (15:50 +0000)]
conditional +1 for errorlogprovider
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673835 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 15 Apr 2015 15:48:01 +0000 (15:48 +0000)]
Resolves bz56695 - %O can in fact be zero sometimes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673834 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Apr 2015 15:29:45 +0000 (15:29 +0000)]
Jeff's ajp confusion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673828 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 15 Apr 2015 15:26:08 +0000 (15:26 +0000)]
Applies patch from bz57189, thanks go to Tom Fredrik Blenning. Adds
Norwegin translations of error pages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673826 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 15 Apr 2015 15:02:24 +0000 (15:02 +0000)]
Rebuild core.html and translations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673808 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 15 Apr 2015 15:00:36 +0000 (15:00 +0000)]
As per bz53530, a brief explanation of when you may and must use quotes
in directory paths.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673805 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 Apr 2015 14:50:26 +0000 (14:50 +0000)]
had to move on
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1673795 13f79535 -47bb-0310-9956-
ffa450edef68