]> granicus.if.org Git - apache/log
apache
10 years agoRename docs files for mod_example_hooks.
Rainer Jung [Fri, 3 Oct 2014 15:54:27 +0000 (15:54 +0000)]
Rename docs files for mod_example_hooks.

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

10 years agoFix some comments and log messages: module was
Rainer Jung [Fri, 3 Oct 2014 15:49:28 +0000 (15:49 +0000)]
Fix some comments and log messages: module was
renamed form mod_example to mod_example_hooks long ago.

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

10 years agoAdd docs for new directive SubstituteMaxLineLength
Rainer Jung [Thu, 2 Oct 2014 11:49:43 +0000 (11:49 +0000)]
Add docs for new directive SubstituteMaxLineLength
in mod_substitute.

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

10 years agomod_substitute: Restrict configuration in .htaccess to
Rainer Jung [Thu, 2 Oct 2014 10:22:33 +0000 (10:22 +0000)]
mod_substitute: Restrict configuration in .htaccess to
FileInfo as documented.

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

10 years agomod_substitute: Make maximum line length configurable.
Rainer Jung [Thu, 2 Oct 2014 09:50:24 +0000 (09:50 +0000)]
mod_substitute: Make maximum line length configurable.

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

10 years agoAdd CHANGES for r1628104.
Rainer Jung [Thu, 2 Oct 2014 09:49:35 +0000 (09:49 +0000)]
Add CHANGES for r1628104.
(mod_substitue: Fix memory limitation in case of
regexp plus flatten.)

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

10 years agoAdjust Certificate Transparency support (mod_ssl_ct) to build with/require OpenSSL...
Jeff Trawick [Wed, 1 Oct 2014 20:54:04 +0000 (20:54 +0000)]
Adjust Certificate Transparency support (mod_ssl_ct) to build with/require OpenSSL 1.0.2 Beta 3.

Update notes on missing OpenSSL documentation.

Submitted by: ben (the primary changes), trawick

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

10 years agoreword/reorg/simplify based on recent feedback.
Eric Covener [Wed, 1 Oct 2014 12:40:58 +0000 (12:40 +0000)]
reword/reorg/simplify based on recent feedback.
 - don't worry about how multiple IP addresses map
 - simplify the description of why you might use an IP address in <virtualhost
 - move the note below the last paragraph

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

10 years agoab: Use only one connection to determine working destination socket address.
Jan Kaluža [Tue, 30 Sep 2014 10:39:41 +0000 (10:39 +0000)]
ab: Use only one connection to determine working destination socket address.

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

10 years agomod_substitute: Fix memory limitation in case of
Rainer Jung [Sun, 28 Sep 2014 21:38:33 +0000 (21:38 +0000)]
mod_substitute: Fix memory limitation in case of
regexp plus flatten.

The maxlen argument of ap_varbuf_regsub() is unsigned.
Passing in "AP_SUBST_MAX_LINE_LENGTH - vb.strlen"
in case vb.strlen got to big didn't result in the
expected error but instead was handled as a very big
maxlen.

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

10 years agoFix syntax highlight
Christophe Jaillet [Sun, 28 Sep 2014 17:14:21 +0000 (17:14 +0000)]
Fix syntax highlight

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

10 years agobackported
Jim Jagielski [Fri, 26 Sep 2014 11:01:27 +0000 (11:01 +0000)]
backported

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

10 years agomod_cgi: log cgi script stderr to ScriptLog, use APLOGNO for log_scripterror
Jan Kaluža [Tue, 23 Sep 2014 11:14:09 +0000 (11:14 +0000)]
mod_cgi: log cgi script stderr to ScriptLog, use APLOGNO for log_scripterror
errors.

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

10 years agoab: try all destination socket addresses returned by apr_sockaddr_info_get
Jan Kaluža [Tue, 23 Sep 2014 07:12:54 +0000 (07:12 +0000)]
ab: try all destination socket addresses returned by apr_sockaddr_info_get
instead of failing on first one when not available.

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

10 years agouse actual error code in AH00779
Eric Covener [Sat, 20 Sep 2014 10:59:30 +0000 (10:59 +0000)]
use actual error code in AH00779

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

10 years agoImprove CHANGES description
Christophe Jaillet [Thu, 18 Sep 2014 21:06:23 +0000 (21:06 +0000)]
Improve CHANGES description

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

10 years agoContent-Length header should always be interpreted as a decimal.
Christophe Jaillet [Thu, 18 Sep 2014 21:01:40 +0000 (21:01 +0000)]
Content-Length header should always be interpreted as a decimal.
Leading 0  could be erroneously considered as an octal value. PR 56598.
[Chris Card <ctcard hotmail com>]

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

10 years agoConcat string at compile time when possible.
Christophe Jaillet [Thu, 18 Sep 2014 19:06:52 +0000 (19:06 +0000)]
Concat string at compile time when possible.
Doing so, sometimes also give the opportunity to turn a 'ap_fputstrs' into a 'ap_fputs'.
PR 53741

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

10 years agoprepend 0
Jim Jagielski [Thu, 18 Sep 2014 12:14:05 +0000 (12:14 +0000)]
prepend 0

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

10 years agooops... prepend 0
Jim Jagielski [Thu, 18 Sep 2014 12:10:54 +0000 (12:10 +0000)]
oops... prepend 0

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

10 years agoFix a cmake compatiblity issue related to quoting with cmake 2.8.12
Jeff Trawick [Tue, 16 Sep 2014 01:21:24 +0000 (01:21 +0000)]
Fix a cmake compatiblity issue related to quoting with cmake 2.8.12
and later.

PR: 56615
Submitted by: Chuck Liu <cliu81 gmail.com>, trawick

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

10 years agoRebuil.
Lucien Gentis [Sat, 13 Sep 2014 14:46:55 +0000 (14:46 +0000)]
Rebuil.

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

10 years agoXML update.
Lucien Gentis [Sat, 13 Sep 2014 14:46:04 +0000 (14:46 +0000)]
XML update.

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

10 years agomod_status should honor remote_ip as documented
Jim Jagielski [Thu, 11 Sep 2014 17:53:48 +0000 (17:53 +0000)]
mod_status should honor remote_ip as documented

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

10 years agoSECURITY (CVE-2014-3581): Fix a mod_cache NULL pointer deference
Jan Kaluža [Thu, 11 Sep 2014 09:18:38 +0000 (09:18 +0000)]
SECURITY (CVE-2014-3581): Fix a mod_cache NULL pointer deference
in Content-Type handling.

mod_cache: Avoid a crash when Content-Type has an empty value. PR56924.

Submitted By: Mark Montague <mark catseye.org>
Reviewed By: Jan Kaluza

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

10 years agoRebuild.
Lucien Gentis [Sat, 6 Sep 2014 15:01:15 +0000 (15:01 +0000)]
Rebuild.

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

10 years agoXML update.
Lucien Gentis [Sat, 6 Sep 2014 14:58:55 +0000 (14:58 +0000)]
XML update.

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

10 years agoab: increase request and response header size to 8192 bytes,
Jan Kaluža [Thu, 4 Sep 2014 10:52:24 +0000 (10:52 +0000)]
ab: increase request and response header size to 8192 bytes,
fix potential buffer-overflow in Server: header handling.

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

10 years agoRebuild
Rich Bowen [Wed, 3 Sep 2014 15:57:07 +0000 (15:57 +0000)]
Rebuild

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

10 years agoRebuild 'advanced' doc
Rich Bowen [Wed, 3 Sep 2014 15:48:01 +0000 (15:48 +0000)]
Rebuild 'advanced' doc

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

10 years agoNote to self
Rich Bowen [Wed, 3 Sep 2014 15:44:37 +0000 (15:44 +0000)]
Note to self

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

10 years agoRemove example that doesn't actually work
Rich Bowen [Wed, 3 Sep 2014 15:43:27 +0000 (15:43 +0000)]
Remove example that doesn't actually work

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

10 years agoTypo
Rich Bowen [Wed, 3 Sep 2014 15:42:48 +0000 (15:42 +0000)]
Typo

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

10 years agoSilent some cppcheck warnings.
Christophe Jaillet [Mon, 1 Sep 2014 14:40:01 +0000 (14:40 +0000)]
Silent some cppcheck warnings.

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

10 years agoFix NetWare build: set NLM version with commandline option
Guenter Knauf [Sun, 31 Aug 2014 13:16:11 +0000 (13:16 +0000)]
Fix NetWare build: set NLM version with commandline option
instead of linker def file due to bug with mwldnlm linker
where patch version > 26 is ignored from def file.

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

10 years agothese are backported
Eric Covener [Sun, 31 Aug 2014 01:29:41 +0000 (01:29 +0000)]
these are backported

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

10 years agoPR56729: mod_reqtimeout gets confused when it sees a read via
Eric Covener [Sat, 30 Aug 2014 12:59:44 +0000 (12:59 +0000)]
PR56729: mod_reqtimeout gets confused when it sees a read via
check_pipeline() just before a slow HTTP response completes.

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

10 years agoFix sscanf format spotted by cppcheck.
Christophe Jaillet [Sat, 30 Aug 2014 06:51:11 +0000 (06:51 +0000)]
Fix sscanf format spotted by cppcheck.
Improve alignment.
Untested.

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

10 years agoFix printf format spotted by cppcheck.
Christophe Jaillet [Sat, 30 Aug 2014 06:45:09 +0000 (06:45 +0000)]
Fix printf format spotted by cppcheck.
Untested.

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

10 years agoMight as well make it 256 and be done w/ it. The extra bytes are
Jim Jagielski [Fri, 29 Aug 2014 20:39:22 +0000 (20:39 +0000)]
Might as well make it 256 and be done w/ it. The extra bytes are
moot nowaways.

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

10 years agoThese are more than debug errors...
Jim Jagielski [Fri, 29 Aug 2014 19:42:54 +0000 (19:42 +0000)]
These are more than debug errors...

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

10 years agoCorrect loglevel.
Jim Jagielski [Fri, 29 Aug 2014 19:42:34 +0000 (19:42 +0000)]
Correct loglevel.

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

10 years agoPR53218
Jim Jagielski [Fri, 29 Aug 2014 19:17:45 +0000 (19:17 +0000)]
PR53218
Allow for longer worker names and make truncation a non-fatal
error...

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

10 years agoMake up-to-date
Jim Jagielski [Wed, 27 Aug 2014 16:37:24 +0000 (16:37 +0000)]
Make up-to-date

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

10 years agoOmitted from r1620926 in error.
Joe Orton [Wed, 27 Aug 2014 16:12:08 +0000 (16:12 +0000)]
Omitted from r1620926 in error.

Add API to support TLS channel bindings with mod_ssl.

* modules/ssl/mod_ssl.h: Define ssl_get_tls_cb.

* modules/ssl/ssl_engine_vars.c (ssl_get_tls_cb): New function.

Submitted by: Simo Sorce <simo redhat.com>

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

10 years agoAdd API to support TLS channel bindings with mod_ssl.
Joe Orton [Wed, 27 Aug 2014 16:11:17 +0000 (16:11 +0000)]
Add API to support TLS channel bindings with mod_ssl.

* modules/ssl/mod_ssl.h: Define ssl_get_tls_cb.

* modules/ssl/ssl_engine_vars.c (ssl_get_tls_cb): New function.

Submitted by: Simo Sorce <simo redhat.com>

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

10 years agoworker MPM: Fix null-dereference crash when using -DFOREGROUND with worker MPM
Jan Kaluža [Tue, 26 Aug 2014 11:05:37 +0000 (11:05 +0000)]
worker MPM: Fix null-dereference crash when using -DFOREGROUND with worker MPM

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

10 years agoFix typo in comment.
Rainer Jung [Mon, 25 Aug 2014 21:32:43 +0000 (21:32 +0000)]
Fix typo in comment.

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

10 years agoSwitch preference for headers, Transfer-Encoding
Rainer Jung [Mon, 25 Aug 2014 13:44:03 +0000 (13:44 +0000)]
Switch preference for headers, Transfer-Encoding
first, Content-Length second.

Addition to r1615289.

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

10 years agofix props and update transformation
André Malo [Sat, 23 Aug 2014 20:36:25 +0000 (20:36 +0000)]
fix props and update transformation

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

10 years agoxform
Eric Covener [Sat, 23 Aug 2014 11:36:37 +0000 (11:36 +0000)]
xform

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

10 years agoremove incorrect compat info from trunk
Eric Covener [Sat, 23 Aug 2014 11:33:35 +0000 (11:33 +0000)]
remove incorrect compat info from trunk

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

10 years agoRebuild.
Lucien Gentis [Sat, 23 Aug 2014 11:15:56 +0000 (11:15 +0000)]
Rebuild.

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

10 years agoXML update.
Lucien Gentis [Sat, 23 Aug 2014 11:14:08 +0000 (11:14 +0000)]
XML update.

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

10 years agodon't let handlers start with r->status = 304 during a failed revalidation
Eric Covener [Fri, 22 Aug 2014 15:26:27 +0000 (15:26 +0000)]
don't let handlers start with r->status = 304 during a failed revalidation

PR56881

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

10 years agomod_deflate:
Yann Ylavic [Thu, 21 Aug 2014 17:02:00 +0000 (17:02 +0000)]
mod_deflate:
- fix signed/unsigned (int/size_t) comparisons,
- add consume_buffer() to factorize code used multiple times,
- cleanup passed brigade (don't rely on next output filters to do it).

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

10 years agomod_deflate: follow up to r1619444.
Yann Ylavic [Thu, 21 Aug 2014 16:44:10 +0000 (16:44 +0000)]
mod_deflate: follow up to r1619444.

Fix counting of inflated bytes in deflate_in_filter() when asked to flush, since
we now count bytes per inflate() call everywhere, we can't count all the produced
bytes there.

We still need to include all the produced bytes in the brigade.

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

10 years agomod_proxy: add missing APLOGNOs.
Yann Ylavic [Thu, 21 Aug 2014 15:49:54 +0000 (15:49 +0000)]
mod_proxy: add missing APLOGNOs.

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

10 years agomod_deflate: follow up to r1619444.
Yann Ylavic [Thu, 21 Aug 2014 15:48:36 +0000 (15:48 +0000)]
mod_deflate: follow up to r1619444.

Add missing APLOGNO.

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

10 years agoleave a hint while scrolling through inflate() calls
Eric Covener [Thu, 21 Aug 2014 15:39:21 +0000 (15:39 +0000)]
leave a hint while scrolling through inflate() calls

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

10 years agomod_deflate: follow up to r1619383.
Yann Ylavic [Thu, 21 Aug 2014 15:30:14 +0000 (15:30 +0000)]
mod_deflate: follow up to r1619383.

deflate_in_filter():
- use inflated bytes per inflate() call to compute the total output bytes,
- check zlib errors before limits,
- add missing check_ratio() when asked to flush.

deflate_out_filter():
- check ratio after each inflate() call.

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

10 years agoA misplaced check for inflation limits prevented limiting relatively
Eric Covener [Thu, 21 Aug 2014 13:11:15 +0000 (13:11 +0000)]
A misplaced check for inflation limits prevented limiting relatively
small inputs.  PR56872

Submitted By: Edward Lu
Committed By: covener

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

10 years agoMissing va_end spotted by cppcheck
Christophe Jaillet [Thu, 21 Aug 2014 06:56:40 +0000 (06:56 +0000)]
Missing va_end spotted by cppcheck

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

10 years agoFix typo noticed by GilDawson
Christophe Jaillet [Tue, 19 Aug 2014 20:11:56 +0000 (20:11 +0000)]
Fix typo noticed by GilDawson

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

10 years agoPR56870: authzprovideralias-defined authz provier can't be used in a virtualhost
Eric Covener [Tue, 19 Aug 2014 12:44:09 +0000 (12:44 +0000)]
PR56870: authzprovideralias-defined authz provier can't be used in a virtualhost

apply the same workaround from mod_authn_core r1554995 so r->server has our hash.

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

10 years agoFollow up r1617201:
Takashi Sato [Tue, 19 Aug 2014 01:27:38 +0000 (01:27 +0000)]
Follow up r1617201:
Return EPERM if the uid is not root on chroot-ing.

Pointed out by trawick on
<CAKUrXK6EGmG1ZD4+UFZ05yznTe6twOU3n57YeO-Ney-_VV_dCQ@mail.gmail.com>

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

10 years agomod_systemd.xml: delete application/xml property
Jan Kaluža [Mon, 18 Aug 2014 12:56:03 +0000 (12:56 +0000)]
mod_systemd.xml: delete application/xml property

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

10 years agomod_systemd: Use AP_SIG_GRACEFUL instead of SIGWINCH.
Jan Kaluža [Mon, 18 Aug 2014 11:51:01 +0000 (11:51 +0000)]
mod_systemd: Use AP_SIG_GRACEFUL instead of SIGWINCH.

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

10 years agomod_systemd: Add IdleShutdown - number of seconds in idle-state after which
Jan Kaluža [Mon, 18 Aug 2014 10:48:41 +0000 (10:48 +0000)]
mod_systemd: Add IdleShutdown - number of seconds in idle-state after which
httpd is shutdown. This is useful in a combination with socket activation.
Add mod_systemd documentation.

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

10 years agoprefork: Ignore SIGINT in child. This fixes race-condition in signals handling
Jan Kaluža [Mon, 18 Aug 2014 07:43:43 +0000 (07:43 +0000)]
prefork: Ignore SIGINT in child. This fixes race-condition in signals handling
when httpd is runnning on foreground and user hits ctrl+c. In this case, SIGINT
is sent to all children followed by SIGTERM from the main process, which
interrupts the SIGINT handler and leads to inconsistency (process freezes
or crashes).

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

10 years agoAvoid useless warning message when parsing a section guarded by <IfDefine foo> if...
Christophe Jaillet [Mon, 18 Aug 2014 06:08:00 +0000 (06:08 +0000)]
Avoid useless warning message when parsing a section guarded by <IfDefine foo> if $(foo) is used within the section.
PR 56503

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

10 years agomod_proxy_fcgi: Fix faulty logging of large amounts of stderr from the
Jeff Trawick [Sat, 16 Aug 2014 19:15:02 +0000 (19:15 +0000)]
mod_proxy_fcgi: Fix faulty logging of large amounts of stderr from the
application.

PR: 56858
Submitted by: Manuel Mausz <manuel-asf mausz.at>
Reviewed by: trawick

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

10 years ago* support/ab.c: Fix crash caused by integer overflow when printing stats with
Jan Kaluža [Thu, 14 Aug 2014 12:15:31 +0000 (12:15 +0000)]
* support/ab.c: Fix crash caused by integer overflow when printing stats with
lot of requests (for example -n 500000000).

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

10 years agogeteuid is always successful,
Takashi Sato [Mon, 11 Aug 2014 05:06:50 +0000 (05:06 +0000)]
geteuid is always successful,
so remove errno reference.

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

10 years agounixd_drop_privileges and ap_unixd_setup_child are almost the same,
Takashi Sato [Mon, 11 Aug 2014 03:04:21 +0000 (03:04 +0000)]
unixd_drop_privileges and ap_unixd_setup_child are almost the same,
so let's remove the redundant code.

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

10 years agoPR56832 -- mod_ratelimit reports at ERROR level everytime a lower-level filter
Eric Covener [Sat, 9 Aug 2014 21:20:50 +0000 (21:20 +0000)]
PR56832 -- mod_ratelimit reports at ERROR level everytime a lower-level filter
encounters an error. Since the core output filter only emits TRACE1, a higher
level filter shouldn't log the same condition as ERROR.

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

10 years agoSome changes for mod_authnz_fcgi doc.
Mike Rumph [Thu, 7 Aug 2014 00:11:21 +0000 (00:11 +0000)]
Some changes for mod_authnz_fcgi doc.

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

10 years agoGenerated doc changes.
Mike Rumph [Wed, 6 Aug 2014 23:31:12 +0000 (23:31 +0000)]
Generated doc changes.

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

10 years agouse /var/log instead of /var/logs in examples
Eric Covener [Sat, 2 Aug 2014 20:19:17 +0000 (20:19 +0000)]
use /var/log instead of /var/logs in examples

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

10 years agoPR53420: Proxy responses with error status and
Rainer Jung [Sat, 2 Aug 2014 08:24:35 +0000 (08:24 +0000)]
PR53420: Proxy responses with error status and
"ProxyErrorOverride On" hang until proxy timeout.

Regression from 2.2. It was introduced by r912063
in order to fix PR41646.

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

10 years agoTurn some APR_BUCKET_REMOVE(e)+apr_bucket_destroy(e) into the equivalent apr_bucket_d...
Christophe Jaillet [Fri, 1 Aug 2014 04:23:50 +0000 (04:23 +0000)]
Turn some APR_BUCKET_REMOVE(e)+apr_bucket_destroy(e) into the equivalent apr_bucket_delete(e) to reduce code verbosity

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

10 years ago* acinclude.m4 (APACHE_CHECK_SYSTEMD): Actually use $PKGCONFIG, duh.
Joe Orton [Thu, 31 Jul 2014 08:06:22 +0000 (08:06 +0000)]
* acinclude.m4 (APACHE_CHECK_SYSTEMD): Actually use $PKGCONFIG, duh.

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

10 years ago* acinclude.m4 (APACHE_CHECK_SYSTEMD): Check first for libsystemd
Joe Orton [Thu, 31 Jul 2014 08:01:07 +0000 (08:01 +0000)]
* acinclude.m4 (APACHE_CHECK_SYSTEMD): Check first for libsystemd
  with pkg-config since libsystemd-daemon is deprecated upstream.

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

10 years ago* configure.in, acinclude.m4: Move systemd check to APACHE_CHECK_SYSTEMD
Joe Orton [Thu, 31 Jul 2014 07:56:44 +0000 (07:56 +0000)]
* configure.in, acinclude.m4: Move systemd check to APACHE_CHECK_SYSTEMD
  and use pkg-config where available.

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

10 years agoFix typo spotted in comment #2818
Christophe Jaillet [Wed, 30 Jul 2014 04:24:49 +0000 (04:24 +0000)]
Fix typo spotted in comment #2818

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

10 years agoRebuild.
Lucien Gentis [Sat, 26 Jul 2014 17:26:43 +0000 (17:26 +0000)]
Rebuild.

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

10 years agoXML Updates.
Lucien Gentis [Sat, 26 Jul 2014 17:25:07 +0000 (17:25 +0000)]
XML Updates.

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

10 years agoIn 2.4.10, AuthLDAPBindDN might not be used for some LDAP searches, causing
Eric Covener [Sat, 26 Jul 2014 16:59:50 +0000 (16:59 +0000)]
In 2.4.10, AuthLDAPBindDN might not be used for some LDAP searches, causing
LDAP authz failures if AuthLDAPBindDN was able to search through more of
LDAP than web users.

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

10 years agono status during if_walk
Eric Covener [Fri, 25 Jul 2014 22:24:13 +0000 (22:24 +0000)]
no status during if_walk

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

10 years agocall out some variables that aren't set during <if>
Eric Covener [Fri, 25 Jul 2014 22:20:33 +0000 (22:20 +0000)]
call out some variables that aren't set during <if>

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

10 years agomod_proxy_wstunnel: Concurrent websockets messages could be
Eric Covener [Fri, 25 Jul 2014 18:54:03 +0000 (18:54 +0000)]
mod_proxy_wstunnel: Concurrent websockets messages could be
lost or delayed with ProxyWebsocketAsync enabled.

Submitted By: Edward Lu
Committed By: covener

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

10 years agoxform
Eric Covener [Thu, 24 Jul 2014 22:49:07 +0000 (22:49 +0000)]
xform

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

10 years agotwo commenters were confused authnprovideralias
Eric Covener [Thu, 24 Jul 2014 22:45:33 +0000 (22:45 +0000)]
two commenters were confused authnprovideralias
providing special config to authz providers

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

10 years agoMinor mmn bump due to r1612940.
Rainer Jung [Thu, 24 Jul 2014 17:02:03 +0000 (17:02 +0000)]
Minor mmn bump due to r1612940.

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

10 years agoFix syntax error introduced in r1612921.
Rainer Jung [Thu, 24 Jul 2014 07:53:20 +0000 (07:53 +0000)]
Fix syntax error introduced in r1612921.

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

10 years agoRe-introduce check for sufficient PCRE version.
Guenter Knauf [Wed, 23 Jul 2014 21:15:06 +0000 (21:15 +0000)]
Re-introduce check for sufficient PCRE version.

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

10 years agoForgotten file needed for r1612934.
Rainer Jung [Wed, 23 Jul 2014 20:27:32 +0000 (20:27 +0000)]
Forgotten file needed for r1612934.

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

10 years agoNote/update some requirements versions.
Rainer Jung [Wed, 23 Jul 2014 20:02:14 +0000 (20:02 +0000)]
Note/update some requirements versions.

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

10 years agoFix obvious errors. Probably the rest of the
Rainer Jung [Wed, 23 Jul 2014 20:00:50 +0000 (20:00 +0000)]
Fix obvious errors. Probably the rest of the
file is outdated as well.

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

10 years agoAdd compiled and loaded PCRE version numbers
Rainer Jung [Wed, 23 Jul 2014 19:53:22 +0000 (19:53 +0000)]
Add compiled and loaded PCRE version numbers
to "httpd -V" output and to mod_info page.

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