]>
granicus.if.org Git - apache/log
Stefan Eissing [Fri, 29 Jan 2016 10:05:47 +0000 (10:05 +0000)]
regresssions as test parse debug log
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727507 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 29 Jan 2016 09:57:58 +0000 (09:57 +0000)]
disable any openssl use until configure fix is backported, linking gets messed up when multiple places have openssl
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727505 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 29 Jan 2016 09:22:55 +0000 (09:22 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727503 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 29 Jan 2016 09:21:19 +0000 (09:21 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727502 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 28 Jan 2016 20:42:24 +0000 (20:42 +0000)]
Backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727434 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 28 Jan 2016 16:44:36 +0000 (16:44 +0000)]
proposing APACHE_CHECK_OPENSSL twice invocation fix for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727403 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 28 Jan 2016 16:29:47 +0000 (16:29 +0000)]
backport of r1718514,
1721313
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727399 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 28 Jan 2016 16:21:27 +0000 (16:21 +0000)]
missed author
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727397 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 28 Jan 2016 16:19:10 +0000 (16:19 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727396 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 28 Jan 2016 16:13:54 +0000 (16:13 +0000)]
backport of r1723122,
1723143
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727393 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 28 Jan 2016 16:12:23 +0000 (16:12 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727392 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 28 Jan 2016 14:58:06 +0000 (14:58 +0000)]
Some backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727371 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 28 Jan 2016 12:12:21 +0000 (12:12 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727320 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 28 Jan 2016 12:10:40 +0000 (12:10 +0000)]
Merge r1727317 from trunk:
Update Perl FCGI examples to work with current version of module
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727318 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 27 Jan 2016 20:43:19 +0000 (20:43 +0000)]
Proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727187 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 27 Jan 2016 06:28:33 +0000 (06:28 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726942 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 27 Jan 2016 06:25:33 +0000 (06:25 +0000)]
Fix typo spotted by noodl in online doc + synch with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726941 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 26 Jan 2016 14:34:57 +0000 (14:34 +0000)]
mod_http2: merge r1726798 from trunk.
Fix warnings:
modules/http2/h2_util.c|174| warning: suggest parentheses around ‘+’ in operand of ‘&’
modules/http2/h2_util.c|176| warning: suggest parentheses around ‘+’ in operand of ‘&’
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726801 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 23 Jan 2016 14:40:11 +0000 (14:40 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726403 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 23 Jan 2016 14:39:09 +0000 (14:39 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726402 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 22 Jan 2016 15:32:09 +0000 (15:32 +0000)]
per ML feedback, make setHandler expression interp
implicit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726234 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 21 Jan 2016 20:17:14 +0000 (20:17 +0000)]
Fix typo in comment (s/patterm/pattern/).
Backport of r1726086 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726087 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 21 Jan 2016 18:45:54 +0000 (18:45 +0000)]
Fix typo in comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726061 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 Jan 2016 16:52:58 +0000 (16:52 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726020 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 Jan 2016 16:52:20 +0000 (16:52 +0000)]
Merge r1724857 from trunk:
*) mod_proxy_fcgi: Suppress HTTP error 503 and message 01075,
"Error dispatching request", when the cause appears to be
the client closing the connection.
PR58118.
Submitted By: Tobias Adolph <adolph lrz.de>
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@
1726019 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 Jan 2016 16:51:13 +0000 (16:51 +0000)]
Merge r1724847, r1725516 from trunk:
flush errors are TRACE1 in the core output filter now.
Remove APLOGNO after moving log message to
TRACE1 in r1724847.
Submitted by: covener, rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726018 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 Jan 2016 16:49:48 +0000 (16:49 +0000)]
Merge r1724656 from trunk:
*) mod_rewrite: Avoid looping on relative substitutions that
result in the same filename we started with. PR 58854.
[Eric Covener]
Previously, the comparison of old and new filename happened before
some prefixes might be added.
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726016 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 21 Jan 2016 13:17:42 +0000 (13:17 +0000)]
propsing ssl timeout fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725942 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 20 Jan 2016 18:04:33 +0000 (18:04 +0000)]
prep
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725768 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 19 Jan 2016 15:58:23 +0000 (15:58 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725554 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 19 Jan 2016 13:42:03 +0000 (13:42 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725518 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 19 Jan 2016 13:41:15 +0000 (13:41 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725517 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Jan 2016 12:58:52 +0000 (12:58 +0000)]
Merge r1723567 from trunk:
Add common extension "m4a" for MPEG 4 Audio to
mime.types.
As a reference see Wikipedia:
https://en.wikipedia.org/wiki/MPEG-4_Part_14#.MP4_versus_.M4A
PR: 57895
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725509 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Jan 2016 12:57:16 +0000 (12:57 +0000)]
Merge r1719257 from trunk:
Do not use the magic string "directory". Use the corresponding global variable as in all other places of the module.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725508 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Jan 2016 12:56:57 +0000 (12:56 +0000)]
Merge r1719252, r1719254, r1719255, r1720996 from trunk:
Use 'ap_array_str_contains' to simplify code.
Use 'ap_array_str_contains' to simplify code.
Use 'ap_array_str_contains' to simplify code.
Use 'ap_array_str_contains' to simplify code.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725507 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Jan 2016 12:56:11 +0000 (12:56 +0000)]
Merge r1719018, r1719189, r1719190 from trunk:
Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable in order to save a few cycles.
Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable in order to save a few cycles.
Fix some minor style issue.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725506 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Jan 2016 12:55:38 +0000 (12:55 +0000)]
Merge r1719016 from trunk:
There is no need to duplicate some memory here, the 'path' given to ap_parse_htaccess is never modified.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725504 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Jan 2016 12:55:14 +0000 (12:55 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725503 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Jan 2016 12:54:29 +0000 (12:54 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725502 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 19 Jan 2016 12:51:21 +0000 (12:51 +0000)]
updated changes after mod_http2 backport from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725500 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 18 Jan 2016 19:33:27 +0000 (19:33 +0000)]
no check for openssl until fix from trunk is backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725326 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 18 Jan 2016 16:22:57 +0000 (16:22 +0000)]
mod_http2 v1.2.2 from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725301 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 17 Jan 2016 23:45:07 +0000 (23:45 +0000)]
sethandler expr=backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725153 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 17 Jan 2016 17:58:48 +0000 (17:58 +0000)]
Merge r1725106 from trunk:
clarify a butchered sentence about missing ServerName, which
is a regular early step in "my directive didn't do anything".
This describes ap_get_local_host()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725108 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 17 Jan 2016 16:47:46 +0000 (16:47 +0000)]
Merge r1725102 from trunk:
update syntax to allow for non-FQDN domains or IP addresses in ServerName.
Since UseCanonicalName defaults to OFF, name-based vhosts isn't really an
"additional" purpose of a ServerName. Also update the syntax to not insist
on an FQDN -- generally the ServerName needs to be something the client
and server can both resolve, but it's not required to be an FQDN or even
a domain name.
Leave the example as www.example.com
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725104 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 15 Jan 2016 18:46:38 +0000 (18:46 +0000)]
another pass of votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1724869 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 15 Jan 2016 16:53:31 +0000 (16:53 +0000)]
two quick proposals for flush error severity
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1724858 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 14 Jan 2016 17:09:48 +0000 (17:09 +0000)]
add rewrite fix, vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1724657 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 12 Jan 2016 16:31:35 +0000 (16:31 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1724281 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 12 Jan 2016 16:15:51 +0000 (16:15 +0000)]
Distinguish between 'deflate' and 'gzip' encoding.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1724274 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 12 Jan 2016 16:11:24 +0000 (16:11 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1724271 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 12 Jan 2016 16:07:51 +0000 (16:07 +0000)]
Applying Luca's patch from bz 58744
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1724267 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 11 Jan 2016 13:50:39 +0000 (13:50 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1724025 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 11 Jan 2016 06:34:28 +0000 (06:34 +0000)]
re-build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1723981 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 11 Jan 2016 06:32:09 +0000 (06:32 +0000)]
Fix doc as spotted by A. Gh. in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1723980 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 9 Jan 2016 16:04:49 +0000 (16:04 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1723860 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 9 Jan 2016 16:03:47 +0000 (16:03 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1723859 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 7 Jan 2016 15:10:42 +0000 (15:10 +0000)]
Propose.
Although mime.types as part of conf is underneath
"docs", it is probably safer to vote on it and not
rely on CTR for documentation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1723570 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 6 Jan 2016 11:55:08 +0000 (11:55 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1723289 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 4 Jan 2016 06:52:53 +0000 (06:52 +0000)]
Happy new year to all :)
Here are a few easy proposals to synch 2.4 and trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722792 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 3 Jan 2016 07:34:59 +0000 (07:34 +0000)]
Fix compatibiliy note for the GlobalLog directive
(r1722703 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722704 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 2 Jan 2016 17:04:28 +0000 (17:04 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722642 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 2 Jan 2016 17:03:37 +0000 (17:03 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722641 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sat, 2 Jan 2016 06:25:20 +0000 (06:25 +0000)]
update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722611 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sat, 2 Jan 2016 06:23:34 +0000 (06:23 +0000)]
update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by: Orhan Berent <berent belgeler.gen.tr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722610 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sat, 2 Jan 2016 05:13:50 +0000 (05:13 +0000)]
fixed typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722608 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 1 Jan 2016 21:31:05 +0000 (21:31 +0000)]
Update XForms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722589 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 1 Jan 2016 20:59:28 +0000 (20:59 +0000)]
Happy New Year 2016
Backport of r1722572 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722573 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 30 Dec 2015 14:52:50 +0000 (14:52 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722341 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 30 Dec 2015 14:48:41 +0000 (14:48 +0000)]
Merge r1599535, r1721685 from trunk:
add GlobalLog directive to allow a diagnostic log to be inherited
by all virtual hosts, even if they define their own logs.
Submitted By: Edward Lu <Chaosed0 gmail.com>
Committed by: covener
document GlobalLog
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722340 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 30 Dec 2015 14:46:33 +0000 (14:46 +0000)]
Merge r1722137 from trunk:
Don't allow bad value to be updated
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722338 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 Dec 2015 16:40:18 +0000 (16:40 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722184 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 29 Dec 2015 16:27:41 +0000 (16:27 +0000)]
vote baby!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722182 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 29 Dec 2015 16:27:11 +0000 (16:27 +0000)]
Merge r1715255 from trunk:
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722181 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 29 Dec 2015 16:26:41 +0000 (16:26 +0000)]
Merge r1715567, r1715568, r1715570, r1715571, r1715572, r1715576, r1715581, r1715582, r1715583, r1715584, r1715585 from trunk:
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Add a blank line between functions.
Remove some useless 'return' statements.
Fix style and alignment.
Remove some useless 'return' statements.
Fix style.
Remove some useless 'return' statements.
Add a blank line between functions.
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722180 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 29 Dec 2015 16:25:04 +0000 (16:25 +0000)]
Merge r1719967 from trunk:
mod_ssl: fix build with openssl < 0.9.8m (missing semicolon).
Reported by: Petr Gajdos <pgajdos suse.cz>
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722179 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 29 Dec 2015 15:45:27 +0000 (15:45 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722161 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 29 Dec 2015 15:41:44 +0000 (15:41 +0000)]
propose GlobalLog since it was requested in a user PR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722158 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 29 Dec 2015 14:20:15 +0000 (14:20 +0000)]
backport req.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722139 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 28 Dec 2015 18:52:02 +0000 (18:52 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1721981 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 28 Dec 2015 18:45:44 +0000 (18:45 +0000)]
Merge r1721978 from trunk:
add a mod_headers condition clause expression example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1721979 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 28 Dec 2015 18:27:27 +0000 (18:27 +0000)]
Merge r1721975 from trunk:
PR58764: python example for sha1 password hashes
Submitted By: Dave Hall <skwashd gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1721976 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 28 Dec 2015 18:24:39 +0000 (18:24 +0000)]
Merge r1721973 from trunk:
PR58761: developer doc improvements.
Submitted By: Luca Toscano
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1721974 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 28 Dec 2015 18:00:40 +0000 (18:00 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1721964 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 28 Dec 2015 17:58:56 +0000 (17:58 +0000)]
Formatting of example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1721962 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 28 Dec 2015 12:51:53 +0000 (12:51 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1721911 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 28 Dec 2015 12:28:54 +0000 (12:28 +0000)]
CHANGES: move entry to the right/effective version.
r1715014 somehow put it in 2.4.17, whereas it was really backported in 2.4.18.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1721907 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 16 Dec 2015 06:40:35 +0000 (06:40 +0000)]
Yup, doh - and rebutt a non-starter
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1720297 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Tue, 15 Dec 2015 16:05:59 +0000 (16:05 +0000)]
Vote and comment on trivial mod_ssl fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1720186 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 15 Dec 2015 13:05:05 +0000 (13:05 +0000)]
Propose r1720129
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1720150 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 14 Dec 2015 17:28:56 +0000 (17:28 +0000)]
Propose trivial (build) fix for mod_ssl with openssl < 0.9.8m.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1719968 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 12 Dec 2015 14:38:24 +0000 (14:38 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1719693 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 12 Dec 2015 14:37:26 +0000 (14:37 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1719692 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 8 Dec 2015 20:30:55 +0000 (20:30 +0000)]
And we are 2.4.19-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718694 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 8 Dec 2015 20:29:31 +0000 (20:29 +0000)]
Get ready to tag 2.4.18
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718692 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 8 Dec 2015 16:47:01 +0000 (16:47 +0000)]
Add an alert for module developers that this subset (specifically,
only the recently added 2.4.17 Protocol API's) may still be in flux,
until the group has concensus on the API behavior.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718645 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 8 Dec 2015 13:36:57 +0000 (13:36 +0000)]
merge from trunk:removing HTTP_HEADER output filter on upgraded connections, so timeouts do not send http/1.1 responses any more
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718600 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 8 Dec 2015 13:30:30 +0000 (13:30 +0000)]
Comment about ap_request_has_body() check for Upgrade.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718595 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 8 Dec 2015 13:22:38 +0000 (13:22 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718589 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 8 Dec 2015 13:08:13 +0000 (13:08 +0000)]
Merge r1718569 from trunk.
h2_from_h1: To avoid any further confusion, r->err_headers should be cleared
once merged into r->headers_out.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718586 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log