]>
granicus.if.org Git - apache/log
Yann Ylavic [Tue, 7 Oct 2014 16:54:31 +0000 (16:54 +0000)]
core: ensure that MPMs return an error on runtime failure and hence that
httpd's main process also exits with an error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629925 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Oct 2014 15:46:05 +0000 (15:46 +0000)]
mpms: enforce assertion that unreachable code is not reached.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629918 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Oct 2014 15:35:56 +0000 (15:35 +0000)]
core: follow up to r1629909: ap_daemons_to_start can't be lower than 1 (not 0) for prefork either.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629916 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Oct 2014 15:16:02 +0000 (15:16 +0000)]
core: Use process scoreboard to store each child's listener bucket,
and silently adjust the configured number of processes/threads to
be above the computed number of listener buckets (depending on the
CPU cores).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629909 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 6 Oct 2014 23:19:55 +0000 (23:19 +0000)]
log the command-line before invoking the log client
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629785 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 6 Oct 2014 19:25:04 +0000 (19:25 +0000)]
Fix one missed s/tab/space/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629740 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 6 Oct 2014 19:22:32 +0000 (19:22 +0000)]
s/tab/space/
Remove empty lines
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629738 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 6 Oct 2014 19:13:32 +0000 (19:13 +0000)]
Style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629736 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 6 Oct 2014 18:30:32 +0000 (18:30 +0000)]
Fix link
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629730 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 6 Oct 2014 13:39:30 +0000 (13:39 +0000)]
Silence build warning about missing prototype.
Followup to r1629507.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629652 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Mon, 6 Oct 2014 06:07:47 +0000 (06:07 +0000)]
event: Fix worker-listener deadlock in graceful restart caused by get_worker()
allocating new worker after ap_queue_info_term(), but not setting the
have_idle_worker variable. PR 56960.
Submitted By: Zin UDA
Committed By: jkaluza
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629577 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Mon, 6 Oct 2014 05:57:02 +0000 (05:57 +0000)]
event: have_idle_worker must not be cleared in every listener_thread iteration.
Fixes bug when workers were not stopped after graceful restart (introduced in
r1605328).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629576 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Mon, 6 Oct 2014 05:45:03 +0000 (05:45 +0000)]
update Japanese translation for r1628084
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629574 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 5 Oct 2014 18:36:02 +0000 (18:36 +0000)]
Follow up to r1629372 and r1629485: ensure compatibily with OpenSSL < 1.0 (sk_OPENSSL_STRING_[num|value|pop] macros).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629519 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 5 Oct 2014 17:05:21 +0000 (17:05 +0000)]
mod_cache_socache: Change average object size
hint from 32 bytes to 2048 bytes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629508 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 5 Oct 2014 17:00:31 +0000 (17:00 +0000)]
mod_cache_socache: Add cache status to server-status.
The status_hook simply calls the status function of
socache, very much like mod_ssl does for the ssl
session cache.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629507 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 5 Oct 2014 11:41:52 +0000 (11:41 +0000)]
Follow up to r1629372: ensure compatibily with OpenSSL < 1.0 (sk_OPENSSL_STRING_value).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629485 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 5 Oct 2014 07:05:33 +0000 (07:05 +0000)]
Style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629476 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 5 Oct 2014 06:43:45 +0000 (06:43 +0000)]
Style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629472 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 5 Oct 2014 05:48:35 +0000 (05:48 +0000)]
Style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629467 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 4 Oct 2014 20:09:10 +0000 (20:09 +0000)]
More style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629441 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 4 Oct 2014 20:03:06 +0000 (20:03 +0000)]
Style (mostly indent)
remove a useless local variable initialization
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629440 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Oct 2014 14:12:55 +0000 (14:12 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629396 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Oct 2014 14:11:19 +0000 (14:11 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629395 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sat, 4 Oct 2014 10:58:49 +0000 (10:58 +0000)]
Move OCSP stapling information from a per-certificate store
(ex_data attached to an X509 *) to a per-server hash which is
allocated from the pconf pool. Fixes PR 54357, PR 56919 and
a leak with the certinfo_free cleanup function (missing
OCSP_CERTID_free).
* modules/ssl/ssl_util_stapling.c: drop certinfo_free, and add
ssl_stapling_certid_free (used with apr_pool_cleanup_register).
Switch to a stapling_certinfo hash which is keyed by the SHA-1
digest of the certificate's DER encoding, rework ssl_stapling_init_cert
to only store info once per certificate (allocated from the pconf
to the extent possible) and extend the logging.
* modules/ssl/ssl_private.h: adjust prototype for
ssl_stapling_init_cert, replace ssl_stapling_ex_init with
ssl_stapling_certinfo_hash_init
* modules/ssl/ssl_engine_init.c: adjust ssl_stapling_* calls
Based on initial work by Alex Bligh <alex alex.org.uk>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629372 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 3 Oct 2014 16:48:30 +0000 (16:48 +0000)]
Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629257 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 3 Oct 2014 16:25:22 +0000 (16:25 +0000)]
Partial mod_example to mod_example_hooks fix
for korean docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629250 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 3 Oct 2014 16:02:05 +0000 (16:02 +0000)]
Adjust content of some docs file for the old
switch form mod_example to mod_example_hooks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1629244 13f79535 -47bb-0310-9956-
ffa450edef68
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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