]> granicus.if.org Git - apache/log
apache
9 years agoRevert r1672014 - doesn't work as advertised (would break configs
Kaspar Brand [Wed, 15 Apr 2015 15:53:00 +0000 (15:53 +0000)]
Revert r1672014 - doesn't work as advertised (would break configs
where the per-vhost log level is different from the global level)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673838 13f79535-47bb-0310-9956-ffa450edef68

9 years agoResolves bz56695 - %O can in fact be zero sometimes.
Rich Bowen [Wed, 15 Apr 2015 15:47:42 +0000 (15:47 +0000)]
Resolves bz56695 - %O can in fact be zero sometimes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673833 13f79535-47bb-0310-9956-ffa450edef68

9 years agoApplies patch from bz57189, thanks go to Tom Fredrik Blenning. Adds
Rich Bowen [Wed, 15 Apr 2015 15:23:27 +0000 (15:23 +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/trunk@1673825 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild HTML from various changes yesterday.
Rich Bowen [Wed, 15 Apr 2015 15:02:08 +0000 (15:02 +0000)]
Rebuild HTML from various changes yesterday.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673807 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild
Rich Bowen [Wed, 15 Apr 2015 15:01:25 +0000 (15:01 +0000)]
Rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673806 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAs per bz53530, a brief explanation of when you may and must use quotes
Rich Bowen [Wed, 15 Apr 2015 14:59:51 +0000 (14:59 +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/trunk@1673804 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFollow-up to r1520445:
Jeff Trawick [Wed, 15 Apr 2015 13:55:46 +0000 (13:55 +0000)]
Follow-up to r1520445:

Tweak error message for clarity

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673769 13f79535-47bb-0310-9956-ffa450edef68

9 years agoQuote filesystem paths.
Ken Coar [Wed, 15 Apr 2015 06:36:51 +0000 (06:36 +0000)]
Quote filesystem paths.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673658 13f79535-47bb-0310-9956-ffa450edef68

9 years agoPut individual items in quotation marks.
Ken Coar [Wed, 15 Apr 2015 06:31:40 +0000 (06:31 +0000)]
Put individual items in quotation marks.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673657 13f79535-47bb-0310-9956-ffa450edef68

9 years agoPut quotation marks around the <Location> path.
Ken Coar [Wed, 15 Apr 2015 06:29:14 +0000 (06:29 +0000)]
Put quotation marks around the <Location> path.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673656 13f79535-47bb-0310-9956-ffa450edef68

9 years agoA little syntax fixup, and put quotation marks around
Ken Coar [Wed, 15 Apr 2015 06:10:07 +0000 (06:10 +0000)]
A little syntax fixup, and put quotation marks around
patterns and expressions.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673653 13f79535-47bb-0310-9956-ffa450edef68

9 years agoQuote DocumentRoot filesystem paths.
Ken Coar [Wed, 15 Apr 2015 06:04:39 +0000 (06:04 +0000)]
Quote DocumentRoot filesystem paths.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673652 13f79535-47bb-0310-9956-ffa450edef68

9 years agoDon't use &quot; in code.
Ken Coar [Wed, 15 Apr 2015 06:01:00 +0000 (06:01 +0000)]
Don't use &quot; in code.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673651 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFollowing up on BZ 53530.. putting quotation marks around
Ken Coar [Tue, 14 Apr 2015 23:35:26 +0000 (23:35 +0000)]
Following up on BZ 53530.. putting quotation marks around
arbitrary-text, complex, and/or filesystem directive arguments.
More to do..

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673582 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild HTML docs
Rich Bowen [Tue, 14 Apr 2015 19:39:38 +0000 (19:39 +0000)]
Rebuild HTML docs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673538 13f79535-47bb-0310-9956-ffa450edef68

9 years agoClarify order of operations - some variables aren't accessible to If.
Rich Bowen [Tue, 14 Apr 2015 19:37:47 +0000 (19:37 +0000)]
Clarify order of operations - some variables aren't accessible to If.
See bz 53349 for context.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673535 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild HTML
Rich Bowen [Tue, 14 Apr 2015 19:22:27 +0000 (19:22 +0000)]
Rebuild HTML

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673530 13f79535-47bb-0310-9956-ffa450edef68

9 years agoClarifies (I hope) what RewriteRule patterns are matched against. See
Rich Bowen [Tue, 14 Apr 2015 19:19:01 +0000 (19:19 +0000)]
Clarifies (I hope) what RewriteRule patterns are matched against. See
bz53153 for context.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673528 13f79535-47bb-0310-9956-ffa450edef68

9 years agorebuild
Rich Bowen [Tue, 14 Apr 2015 19:08:14 +0000 (19:08 +0000)]
rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673523 13f79535-47bb-0310-9956-ffa450edef68

9 years agoClarify regex so that it matches /icons or /icons/ but not /iconsFOO (as
Rich Bowen [Tue, 14 Apr 2015 19:03:00 +0000 (19:03 +0000)]
Clarify regex so that it matches /icons or /icons/ but not /iconsFOO (as
per bz53483

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673517 13f79535-47bb-0310-9956-ffa450edef68

9 years agoClarifies FilesMatch and LocationMatch examples, as per bz53483
Rich Bowen [Tue, 14 Apr 2015 18:39:15 +0000 (18:39 +0000)]
Clarifies FilesMatch and LocationMatch examples, as per bz53483

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673498 13f79535-47bb-0310-9956-ffa450edef68

9 years agorebuild html docs
Rich Bowen [Tue, 14 Apr 2015 18:25:58 +0000 (18:25 +0000)]
rebuild html docs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673490 13f79535-47bb-0310-9956-ffa450edef68

9 years agoClarifies both the regular expression and the explanation of it, to
Rich Bowen [Tue, 14 Apr 2015 18:19:57 +0000 (18:19 +0000)]
Clarifies both the regular expression and the explanation of it, to
avoid unintentionally matching other things. (See bz 53483)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673487 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild
Rich Bowen [Tue, 14 Apr 2015 17:20:42 +0000 (17:20 +0000)]
Rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673475 13f79535-47bb-0310-9956-ffa450edef68

9 years agoHTML encoding
Rich Bowen [Tue, 14 Apr 2015 17:12:00 +0000 (17:12 +0000)]
HTML encoding

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673472 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAdd "pre-compressed content" recipe, as per
Rich Bowen [Tue, 14 Apr 2015 17:06:10 +0000 (17:06 +0000)]
Add "pre-compressed content" recipe, as per
https://bz.apache.org/bugzilla/show_bug.cgi?id=51336

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673470 13f79535-47bb-0310-9956-ffa450edef68

9 years agolibressl fix for removed ENGINE_CTRL_CHIL_SET_FORKCHECK
Eric Covener [Tue, 14 Apr 2015 15:56:30 +0000 (15:56 +0000)]
libressl fix for removed ENGINE_CTRL_CHIL_SET_FORKCHECK

Submitted By: Stuart Henderson <sthen openbsd.org>
Commited By: covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673455 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRemove some spaces between some return statements and ';' + fix a strange formating...
Christophe Jaillet [Tue, 14 Apr 2015 06:03:13 +0000 (06:03 +0000)]
Remove some spaces between some return statements  and ';' + fix a strange formating in a 'for' loop

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673368 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix CGIPassAuth built-in directive documentation,
Jeff Trawick [Mon, 13 Apr 2015 10:50:02 +0000 (10:50 +0000)]
Fix CGIPassAuth built-in directive documentation,
Get compatibility line in doc ready for backport

Pointed out by: rjung (who perhaps wasn't so positive about the eventual 2.4.x release)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673155 13f79535-47bb-0310-9956-ffa450edef68

9 years agoUse 'unsigned int' in bitfield
Christophe Jaillet [Mon, 13 Apr 2015 05:59:26 +0000 (05:59 +0000)]
Use 'unsigned int' in bitfield

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673113 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAdd CHANGES entry before backport proposal
Christophe Jaillet [Sun, 12 Apr 2015 07:52:22 +0000 (07:52 +0000)]
Add CHANGES entry before backport proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672989 13f79535-47bb-0310-9956-ffa450edef68

9 years agoTweak log message
Christophe Jaillet [Sun, 12 Apr 2015 06:57:07 +0000 (06:57 +0000)]
Tweak log message

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672985 13f79535-47bb-0310-9956-ffa450edef68

9 years agoTypo.
Lucien Gentis [Sat, 11 Apr 2015 16:38:34 +0000 (16:38 +0000)]
Typo.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672890 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_proxy_wstunnel isn't limited to Unix
Jeff Trawick [Fri, 10 Apr 2015 20:35:59 +0000 (20:35 +0000)]
mod_proxy_wstunnel isn't limited to Unix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672757 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMore followon to r1671397 for proxy server-status
Rainer Jung [Fri, 10 Apr 2015 06:55:48 +0000 (06:55 +0000)]
More followon to r1671397 for proxy server-status
in auto mode:
- remove remaining HTML markup

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672564 13f79535-47bb-0310-9956-ffa450edef68

9 years agoomit the period after the example lest it get copied
Jeff Trawick [Thu, 9 Apr 2015 20:41:12 +0000 (20:41 +0000)]
omit the period after the example lest it get copied

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672483 13f79535-47bb-0310-9956-ffa450edef68

9 years agoSetEnv doesn't work for proxy-scgi-pathinfo
Jeff Trawick [Thu, 9 Apr 2015 20:38:17 +0000 (20:38 +0000)]
SetEnv doesn't work for proxy-scgi-pathinfo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672480 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFollowon to r1671397 for proxy server-status
Rainer Jung [Thu, 9 Apr 2015 19:20:14 +0000 (19:20 +0000)]
Followon to r1671397 for proxy server-status
in auto mode:
- don't show HTML legend
- Show correct worker name

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672466 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFollowon to r1671396: add misiing newline in
Rainer Jung [Thu, 9 Apr 2015 18:59:43 +0000 (18:59 +0000)]
Followon to r1671396: add misiing newline in
new server-status output.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672453 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFollowon to r1671396:
Rainer Jung [Thu, 9 Apr 2015 10:54:26 +0000 (10:54 +0000)]
Followon to r1671396:
Remove unwanted redundant output introduced
by that commit.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672289 13f79535-47bb-0310-9956-ffa450edef68

9 years agoUNSET the VirtualHost's LogLevel just before calling ap_merge_log_config(),
Kaspar Brand [Wed, 8 Apr 2015 07:33:39 +0000 (07:33 +0000)]
UNSET the VirtualHost's LogLevel just before calling ap_merge_log_config(),
to make sure that the DEFAULT_LOGLEVEL (APLOG_WARNING) is also in effect
when ap_process_config_tree() in main.c:main() walks through the
VirtualHost sections.

See https://mail-archives.apache.org/mod_mbox/httpd-dev/201404.mbox/%3C535CC85B.80501%40velox.ch%3E
for one case this is addressing. This reverts the change from r1024427 on
the one hand, but still ensures correct LogLevel merging on the other hand.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672014 13f79535-47bb-0310-9956-ffa450edef68

9 years agoallow time to first byte (of response headers)
Eric Covener [Tue, 7 Apr 2015 19:01:16 +0000 (19:01 +0000)]
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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671918 13f79535-47bb-0310-9956-ffa450edef68

9 years agoCHANGES: remove entries merged into 2.4.x.
Yann Ylavic [Sun, 5 Apr 2015 19:22:24 +0000 (19:22 +0000)]
CHANGES: remove entries merged into 2.4.x.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671419 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAdd output for "?auto" version of server-status
Rainer Jung [Sun, 5 Apr 2015 13:54:22 +0000 (13:54 +0000)]
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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671397 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAdd more data to "?auto" view of server-status.
Rainer Jung [Sun, 5 Apr 2015 13:34:01 +0000 (13:34 +0000)]
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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671396 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFollowup to r1670431, 1670432, 1670440
Rainer Jung [Sun, 5 Apr 2015 13:12:38 +0000 (13:12 +0000)]
Followup to r1670431, 16704321670440
and 1670738: update max APLOGNO number.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671394 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMention the cmake/OpenSSL compatibility issue
Jeff Trawick [Sun, 5 Apr 2015 01:10:37 +0000 (01:10 +0000)]
Mention the cmake/OpenSSL compatibility issue

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671364 13f79535-47bb-0310-9956-ffa450edef68

9 years agoNot that hard to explain...
William A. Rowe Jr [Thu, 2 Apr 2015 01:50:45 +0000 (01:50 +0000)]
Not that hard to explain...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670805 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix issue w/ deterministic ordering and string comparison of "http/1.1." and "h2"
Jim Jagielski [Wed, 1 Apr 2015 17:18:59 +0000 (17:18 +0000)]
Fix issue w/ deterministic ordering and string comparison of "http/1.1." and "h2"

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670738 13f79535-47bb-0310-9956-ffa450edef68

9 years agohttp: Add support for RFC2324/RFC7168.
Graham Leggett [Wed, 1 Apr 2015 10:03:56 +0000 (10:03 +0000)]
http: Add support for RFC2324/RFC7168.

Sample implementation: http://people.apache.org/~minfrin/mod_teapot.c

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670594 13f79535-47bb-0310-9956-ffa450edef68

9 years ago* ssl_array_index is only used by code inside the HAVE_TLS_ALPN. So silence warnings...
Ruediger Pluem [Wed, 1 Apr 2015 08:34:31 +0000 (08:34 +0000)]
* ssl_array_index is only used by code inside the HAVE_TLS_ALPN. So silence warnings if don't have it.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670578 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAnd the lognos
Jim Jagielski [Tue, 31 Mar 2015 19:23:11 +0000 (19:23 +0000)]
And the lognos

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670440 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRevert r1670436.
Rainer Jung [Tue, 31 Mar 2015 19:20:02 +0000 (19:20 +0000)]
Revert r1670436.
Patch was already applied, Jim was quicker.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670439 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFollowup to r1670397+r1670434: even more ALPN goodness.
Rainer Jung [Tue, 31 Mar 2015 19:15:32 +0000 (19:15 +0000)]
Followup to r1670397+r1670434: even more ALPN goodness.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670436 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMore ALPN goodness
Jim Jagielski [Tue, 31 Mar 2015 19:12:08 +0000 (19:12 +0000)]
More ALPN goodness

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670434 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFollowup to r1670397: add missing APLOGNO.
Rainer Jung [Tue, 31 Mar 2015 19:09:12 +0000 (19:09 +0000)]
Followup to r1670397: add missing APLOGNO.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670432 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAdd missing APLOGNOs by running
Rainer Jung [Tue, 31 Mar 2015 19:07:11 +0000 (19:07 +0000)]
Add missing APLOGNOs by running
docs/log-message-tags/update-log-msg-tags.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670431 13f79535-47bb-0310-9956-ffa450edef68

9 years agoALPN support, based on mod_spdy/mod_h2 patch set
Jim Jagielski [Tue, 31 Mar 2015 17:12:51 +0000 (17:12 +0000)]
ALPN support, based on mod_spdy/mod_h2 patch set

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670397 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sat, 28 Mar 2015 15:08:14 +0000 (15:08 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669784 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML update.
Lucien Gentis [Sat, 28 Mar 2015 15:07:31 +0000 (15:07 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669783 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sat, 28 Mar 2015 15:04:42 +0000 (15:04 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669781 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Sat, 28 Mar 2015 15:02:50 +0000 (15:02 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669780 13f79535-47bb-0310-9956-ffa450edef68

9 years agoCorrect MS-DOS check-in crap on text files
William A. Rowe Jr [Fri, 27 Mar 2015 20:46:11 +0000 (20:46 +0000)]
Correct MS-DOS check-in crap on text files

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669682 13f79535-47bb-0310-9956-ffa450edef68

9 years agos/apr_pstrndup/apr_pstrmemdup/ when applicable
Christophe Jaillet [Thu, 26 Mar 2015 22:12:14 +0000 (22:12 +0000)]
s/apr_pstrndup/apr_pstrmemdup/ when applicable

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669461 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_proxy_wstunnel: Avoid an empty response by failing with 502 (Bad Gateway)
Yann Ylavic [Thu, 26 Mar 2015 09:07:54 +0000 (09:07 +0000)]
mod_proxy_wstunnel: Avoid an empty response by failing with 502 (Bad Gateway)
when no response is ever received from the backend.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669299 13f79535-47bb-0310-9956-ffa450edef68

9 years agoCHANGES: follow up to r1669289.
Yann Ylavic [Thu, 26 Mar 2015 08:28:20 +0000 (08:28 +0000)]
CHANGES: follow up to r1669289.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669292 13f79535-47bb-0310-9956-ffa450edef68

9 years agocore_filters: restore/disable TCP_NOPUSH option after non-blocking sendfile.
Yann Ylavic [Thu, 26 Mar 2015 08:15:32 +0000 (08:15 +0000)]
core_filters: restore/disable TCP_NOPUSH option after non-blocking sendfile.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669289 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild
Rich Bowen [Wed, 25 Mar 2015 18:39:32 +0000 (18:39 +0000)]
Rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669202 13f79535-47bb-0310-9956-ffa450edef68

9 years agoSuggestion to see mod_substitute, as per
Rich Bowen [Wed, 25 Mar 2015 18:36:16 +0000 (18:36 +0000)]
Suggestion to see mod_substitute, as per
http://httpd.apache.org/docs/2.2/mod/mod_ext_filter.html#comment_3822

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669200 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_proxy_{connect,wstunnel}: follow up to r1657636.
Yann Ylavic [Wed, 25 Mar 2015 15:00:37 +0000 (15:00 +0000)]
mod_proxy_{connect,wstunnel}: follow up to r1657636.
Since rv is not used as an apr_status_t in the loop (it's logging is done by
proxy_{connect,wstunnel}_transfer() when necessary/relevent), use a boolean
instead to avoid the ugly ORs between APR error codes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669130 13f79535-47bb-0310-9956-ffa450edef68

9 years agobackported
Eric Covener [Tue, 24 Mar 2015 13:12:42 +0000 (13:12 +0000)]
backported

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1668882 13f79535-47bb-0310-9956-ffa450edef68

9 years agobackported
Eric Covener [Tue, 24 Mar 2015 13:11:51 +0000 (13:11 +0000)]
backported

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1668881 13f79535-47bb-0310-9956-ffa450edef68

9 years agoxform
Eric Covener [Tue, 24 Mar 2015 13:06:33 +0000 (13:06 +0000)]
xform

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1668876 13f79535-47bb-0310-9956-ffa450edef68

9 years agoclose tag
Eric Covener [Tue, 24 Mar 2015 13:06:12 +0000 (13:06 +0000)]
close tag

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1668875 13f79535-47bb-0310-9956-ffa450edef68

9 years agotrunkify
Eric Covener [Tue, 24 Mar 2015 13:04:07 +0000 (13:04 +0000)]
trunkify

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1668871 13f79535-47bb-0310-9956-ffa450edef68

9 years ago* mod_lua: fix compilation with lua-5.3
Jan Kaluža [Tue, 24 Mar 2015 09:13:12 +0000 (09:13 +0000)]
* mod_lua: fix compilation with lua-5.3

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1668827 13f79535-47bb-0310-9956-ffa450edef68

9 years agocore: follow up to r1668532: always initialize optional_fn pointers in ap_create_scor...
Yann Ylavic [Mon, 23 Mar 2015 08:52:47 +0000 (08:52 +0000)]
core: follow up to r1668532: always initialize optional_fn pointers in ap_create_scoreboard().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1668553 13f79535-47bb-0310-9956-ffa450edef68

9 years agocore: follow up to r1668532: CHANGES entry.
Yann Ylavic [Mon, 23 Mar 2015 08:15:24 +0000 (08:15 +0000)]
core: follow up to r1668532: CHANGES entry.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1668535 13f79535-47bb-0310-9956-ffa450edef68

9 years agocore: Initialize scoreboard's used optional functions on graceful restarts to
Yann Ylavic [Mon, 23 Mar 2015 08:07:18 +0000 (08:07 +0000)]
core: Initialize scoreboard's used optional functions on graceful restarts to
avoid a crash when relocation occurs.  PR 57177.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1668532 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sun, 22 Mar 2015 14:12:09 +0000 (14:12 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1668377 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML update.
Lucien Gentis [Sun, 22 Mar 2015 14:11:00 +0000 (14:11 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1668376 13f79535-47bb-0310-9956-ffa450edef68

9 years ago* mod_proxy: Allow setting options to globally defined balancer from
Jan Kaluža [Thu, 19 Mar 2015 11:29:55 +0000 (11:29 +0000)]
* mod_proxy: Allow setting options to globally defined balancer from
  ProxyPass used in VirtualHost. Balancers are now merged using the new
  merge_balancers method which merges the balancers options.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1667707 13f79535-47bb-0310-9956-ffa450edef68

9 years ago* mod_access_compat, mod_authz_host: Handle '#' character.
Jan Kaluža [Thu, 19 Mar 2015 07:46:35 +0000 (07:46 +0000)]
* mod_access_compat, mod_authz_host: Handle '#' character.
For mod_access_compat, disable '#' in hostname completely.
For mod_authz_host, treat '#' as a comment and ignore everything after that.
This allows better handling of admin errors like
'Require host localhost# Add example.com later'.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1667676 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFollowup to r1667385, my sandbox was out of date.
Eric Covener [Tue, 17 Mar 2015 20:13:39 +0000 (20:13 +0000)]
Followup to r1667385, my sandbox was out of date.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1667386 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRetry ENOENT like ECONNREFUSED, but only near a server restart.
Eric Covener [Tue, 17 Mar 2015 20:12:19 +0000 (20:12 +0000)]
Retry ENOENT like ECONNREFUSED, but only near a server restart.

PR57685

Submitted By: Edward Lu
Committed By: covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1667385 13f79535-47bb-0310-9956-ffa450edef68

9 years agocore: Cleanup the request soon/even if some output filter fails to
Yann Ylavic [Mon, 16 Mar 2015 13:52:39 +0000 (13:52 +0000)]
core: Cleanup the request soon/even if some output filter fails to
handle the EOR bucket.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666998 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sat, 14 Mar 2015 16:28:53 +0000 (16:28 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666710 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Sat, 14 Mar 2015 16:27:54 +0000 (16:27 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666709 13f79535-47bb-0310-9956-ffa450edef68

9 years agompm_motorz: follow up to r1666482.
Yann Ylavic [Sat, 14 Mar 2015 00:09:32 +0000 (00:09 +0000)]
mpm_motorz: follow up to r1666482.
We only need one compare function for add semantic with apr_skiplist_insert()
and unique timers (pointers). It also works with apr_skiplist_remove() and
apr_skiplist_find().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666619 13f79535-47bb-0310-9956-ffa450edef68

9 years agompm_event: follow up to r1666468.
Yann Ylavic [Sat, 14 Mar 2015 00:06:21 +0000 (00:06 +0000)]
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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666618 13f79535-47bb-0310-9956-ffa450edef68

9 years ago.gdbinit: Add dump_skiplist.
Yann Ylavic [Fri, 13 Mar 2015 23:59:42 +0000 (23:59 +0000)]
.gdbinit: Add dump_skiplist.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666617 13f79535-47bb-0310-9956-ffa450edef68

9 years agowork w/ apr_skiplist_insert()
Jim Jagielski [Fri, 13 Mar 2015 15:27:36 +0000 (15:27 +0000)]
work w/ apr_skiplist_insert()

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666482 13f79535-47bb-0310-9956-ffa450edef68

9 years agompm_event: Allow for timer events duplicates.
Yann Ylavic [Fri, 13 Mar 2015 14:47:50 +0000 (14:47 +0000)]
mpm_event: Allow for timer events duplicates.
Meanwhile ap[r]_skiplist_add()...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666468 13f79535-47bb-0310-9956-ffa450edef68

9 years agoChoose "-D" instead of "-d" for the rotatelogs
Rainer Jung [Fri, 13 Mar 2015 12:24:17 +0000 (12:24 +0000)]
Choose "-D" instead of "-d" for the rotatelogs
option that creates the path to the log file.

I want to use "-d" for another directory related
option next where (I think) the "directory" "d"
makes more sense.

"-d" has not yet been backported, so changing
to "-D" is not a real compatibility issue.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666417 13f79535-47bb-0310-9956-ffa450edef68

9 years agoSmall changes to rotatelogs:
Rainer Jung [Fri, 13 Mar 2015 12:15:40 +0000 (12:15 +0000)]
Small changes to rotatelogs:
- add "-n num" to help text
- clarify in help text, that "program is invoked"
  is the "-p" case
- prevent crash with "-v" (verbose) if no
  "-p prog" is used
- add one space for formatting

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666415 13f79535-47bb-0310-9956-ffa450edef68

9 years ago* mod_ssl: fix small memory leak in ssl_init_server_certs when ECDH is used.
Jan Kaluža [Fri, 13 Mar 2015 07:32:46 +0000 (07:32 +0000)]
* mod_ssl: fix small memory leak in ssl_init_server_certs when ECDH is used.
SSL_CTX_set_tmp_ecdh increases reference count, so we have to call EC_KEY_free,
otherwise eckey will not be freed.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666363 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAvoid a potential integer underflow in the lock timeout value sent back to a client...
Christophe Jaillet [Fri, 13 Mar 2015 07:21:10 +0000 (07:21 +0000)]
Avoid a potential integer underflow in the lock timeout value sent back to a client. The answer to a LOCK request could be an extremly large integer if the time needed to lock the resource was longer that the requested timeout given in the LOCK request. In such a case, we now answer "Second-0".  PR55420

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666361 13f79535-47bb-0310-9956-ffa450edef68

9 years agossl_util: Fix possible crash (free => OPENSSL_free) and error path leaks when
Yann Ylavic [Thu, 12 Mar 2015 20:50:09 +0000 (20:50 +0000)]
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/trunk@1666297 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix doc as spotted by Sven in online doc
Christophe Jaillet [Wed, 11 Mar 2015 22:10:59 +0000 (22:10 +0000)]
Fix doc as spotted by Sven in online doc

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666025 13f79535-47bb-0310-9956-ffa450edef68

9 years agoCHANGES: remove backported entries.
Yann Ylavic [Wed, 11 Mar 2015 00:42:08 +0000 (00:42 +0000)]
CHANGES: remove backported entries.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1665747 13f79535-47bb-0310-9956-ffa450edef68