]>
granicus.if.org Git - apache/log
Jim Jagielski [Mon, 27 Oct 2014 12:50:05 +0000 (12:50 +0000)]
Merge r1629372, r1629485, r1629519 from trunk:
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>
Follow up to r1629372: ensure compatibily with OpenSSL < 1.0 (sk_OPENSSL_STRING_value).
Follow up to r1629372 and r1629485: ensure compatibily with OpenSSL < 1.0 (sk_OPENSSL_STRING_[num|value|pop] macros).
Submitted by: kbrand, ylavic, ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634529 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Oct 2014 12:48:24 +0000 (12:48 +0000)]
Merge r1629508 from trunk:
mod_cache_socache: Change average object size
hint from 32 bytes to 2048 bytes.
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634528 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Oct 2014 12:47:47 +0000 (12:47 +0000)]
Merge r1629507, r1629652 from trunk:
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.
Silence build warning about missing prototype.
Followup to r1629507.
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634527 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Oct 2014 12:46:45 +0000 (12:46 +0000)]
Merge r1629577 from trunk:
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
Submitted by: jkaluza
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634526 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Oct 2014 12:45:34 +0000 (12:45 +0000)]
Merge r1626050 from trunk:
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
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634525 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Oct 2014 12:44:16 +0000 (12:44 +0000)]
Merge r1628924 from trunk:
mod_substitute: Restrict configuration in .htaccess to
FileInfo as documented.
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634524 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Oct 2014 12:43:46 +0000 (12:43 +0000)]
Merge r1628919, r1628950 from trunk:
mod_substitute: Make maximum line length configurable.
Add docs for new directive SubstituteMaxLineLength
in mod_substitute.
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634523 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Oct 2014 12:42:37 +0000 (12:42 +0000)]
Merge r1628104, r1628918 from trunk:
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.
Add CHANGES for r1628104.
(mod_substitue: Fix memory limitation in case of
regexp plus flatten.)
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634522 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Oct 2014 12:41:31 +0000 (12:41 +0000)]
Merge r1633730 from trunk:
add OCSP Stapling configuration, disabled by default
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634521 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Oct 2014 12:40:34 +0000 (12:40 +0000)]
Merge r1621367, r1621372, r1625952 from trunk:
PR53218
Allow for longer worker names and make truncation a non-fatal
error...
Correct loglevel.
oops... prepend 0
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634520 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Oct 2014 12:38:40 +0000 (12:38 +0000)]
Merge r1527509 from trunk:
mod_dav: set r->status_line in dav_error_response.
It's used as argument in next ap_rvputs call. PR 55426.
Submitted by: jkaluza
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634519 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Oct 2014 12:35:54 +0000 (12:35 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634518 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Oct 2014 12:35:19 +0000 (12:35 +0000)]
votes for backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634517 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 27 Oct 2014 00:56:19 +0000 (00:56 +0000)]
EBCDIC fix for mod_proxy_connect
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634426 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sat, 25 Oct 2014 18:24:15 +0000 (18:24 +0000)]
vote + promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634241 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sat, 25 Oct 2014 18:23:07 +0000 (18:23 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634240 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 25 Oct 2014 17:50:19 +0000 (17:50 +0000)]
add mod_cache proposal, log some votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634238 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 25 Oct 2014 13:13:00 +0000 (13:13 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634225 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 25 Oct 2014 13:12:20 +0000 (13:12 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634224 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 23 Oct 2014 12:01:13 +0000 (12:01 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1633797 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 23 Oct 2014 12:00:31 +0000 (12:00 +0000)]
Merge r1632454,
1633731 ,
1633793 from trunk:
* Add how-to guide for OCSP Stapling
* add hint on discovering that OCSP Stapling cache is too small
* trying to enable OCSP Stapling without certificate chain
(and add 2.4.x-specific hint about the path on the cache)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1633796 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 23 Oct 2014 05:31:08 +0000 (05:31 +0000)]
Proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1633742 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 23 Oct 2014 01:41:59 +0000 (01:41 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1633732 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Oct 2014 16:32:07 +0000 (16:32 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1632819 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Oct 2014 16:30:37 +0000 (16:30 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1632818 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 18 Oct 2014 09:13:18 +0000 (09:13 +0000)]
Propose fixes for more (unlikely) accesses to freed memory.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1632744 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 18 Oct 2014 06:57:40 +0000 (06:57 +0000)]
Merge r1599486 from trunk
mod_proxy_http: Avoid (unlikely) access to freed memory.
Submitted by: ylavic
Reviewed by: ylavic, jorton, rjung
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1632736 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 16 Oct 2014 21:42:45 +0000 (21:42 +0000)]
Merge r1610813 from trunk:
http_protocol: fix logic in ap_method_list_(add|remove) in order:
- to correctly reset bits
- not to modify the 'method_mask' bitfield unnecessarily
Submitted by: jailletc36
Reviewed by: jailletc36, ylavic, rjung
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1632440 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 16 Oct 2014 21:33:54 +0000 (21:33 +0000)]
Merge
1621373 from trunk:
mod_slotmem: Increase log level for some originally debug messages.
Submitted by: jim
Reviewed by: jim, ylavic, rjung
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1632437 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 15 Oct 2014 10:07:08 +0000 (10:07 +0000)]
Propose trivial mod_substitute changes
due to review of backport proposal by Christophe.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1631985 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 15 Oct 2014 08:47:26 +0000 (08:47 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1631972 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 14 Oct 2014 21:10:56 +0000 (21:10 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1631889 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 14 Oct 2014 21:08:26 +0000 (21:08 +0000)]
merge r1631885 from trunk:
very minor improvements to OCSP-related doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1631887 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 14 Oct 2014 08:56:57 +0000 (08:56 +0000)]
Keep SECURITY entries at the top
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1631685 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 13 Oct 2014 19:25:01 +0000 (19:25 +0000)]
Merge r1631516 from trunk:
the hard-coded limit on LimitRequestLine has been gone since 2.1.x, see r819480
and r102840. PR57009
Submitted By: Ed Lu
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1631517 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 11 Oct 2014 21:18:45 +0000 (21:18 +0000)]
Merge r1613682 from trunk:
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/branches/2.4.x@
1631119 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 11 Oct 2014 21:12:18 +0000 (21:12 +0000)]
Merge r1612466 from trunk:
mod_macro: Remove APLOG_NOERRNO. Add some APLOGNO. Fix some alignment.
Submitted by: jailletc36
Reviewed by: jailletc36, rjung, covener
backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1631118 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Oct 2014 15:18:40 +0000 (15:18 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1631059 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Oct 2014 15:17:43 +0000 (15:17 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1631057 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sat, 11 Oct 2014 09:12:17 +0000 (09:12 +0000)]
propose mod_ssl OCSP stapling info fix (PR 54357)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1631030 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Thu, 9 Oct 2014 10:50:01 +0000 (10:50 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1630367 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Thu, 9 Oct 2014 10:47:38 +0000 (10:47 +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@
1630364 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 6 Oct 2014 18:31:39 +0000 (18:31 +0000)]
Fix link
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1629731 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 6 Oct 2014 14:39:59 +0000 (14:39 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1629673 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Mon, 6 Oct 2014 06:11:50 +0000 (06:11 +0000)]
Propose r1629577.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1629578 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Mon, 6 Oct 2014 05:45:39 +0000 (05:45 +0000)]
update Japanese translation for r1628085
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1629575 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 5 Oct 2014 13:09:14 +0000 (13:09 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1629489 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 5 Oct 2014 13:06:01 +0000 (13:06 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1629488 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 5 Oct 2014 13:00:42 +0000 (13:00 +0000)]
promotions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1629487 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Oct 2014 14:15:05 +0000 (14:15 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1629399 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Oct 2014 14:13:50 +0000 (14:13 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1629398 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 4 Oct 2014 10:50:14 +0000 (10:50 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1629371 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 3 Oct 2014 20:42:09 +0000 (20:42 +0000)]
Easy proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1629316 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 3 Oct 2014 17:43:54 +0000 (17:43 +0000)]
Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1629271 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 3 Oct 2014 17:11:26 +0000 (17:11 +0000)]
Backport of r1629239, r1629244,
1629250 :
Adjust docs for renaming of mod_example
to mod_example_hooks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1629262 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 3 Oct 2014 16:58:50 +0000 (16:58 +0000)]
Backport of r1629235:
mod_example_hooks: 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/branches/2.4.x@
1629259 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 2 Oct 2014 11:54:47 +0000 (11:54 +0000)]
mod_substitute proposals.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1628951 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 28 Sep 2014 17:14:42 +0000 (17:14 +0000)]
Fix syntax highlight
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1628085 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 26 Sep 2014 11:00:14 +0000 (11:00 +0000)]
Merge r1624234 from trunk:
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
Submitted by: jkaluza
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1627749 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 26 Sep 2014 10:59:00 +0000 (10:59 +0000)]
Merge r1619297, r1621806 from trunk:
Missing va_end spotted by cppcheck
Silent some cppcheck warnings.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1627747 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 26 Sep 2014 10:57:50 +0000 (10:57 +0000)]
Merge r1619835, r1620461 from trunk:
don't let handlers start with r->status = 304 during a failed revalidation
PR56881
Fix typo in comment.
Submitted by: covener, rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1627745 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 26 Sep 2014 10:56:39 +0000 (10:56 +0000)]
Merge r1624349 from trunk:
mod_status should honor remote_ip as documented
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1627744 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 26 Sep 2014 10:43:23 +0000 (10:43 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1627741 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Wed, 24 Sep 2014 16:19:28 +0000 (16:19 +0000)]
vote for mod_status: honor mod_remoteip
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1627359 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Wed, 24 Sep 2014 08:45:56 +0000 (08:45 +0000)]
vote for mod_status: honor mod_remoteip.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1627257 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Sep 2014 17:09:22 +0000 (17:09 +0000)]
versions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1626841 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Sep 2014 17:07:37 +0000 (17:07 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1626840 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Fri, 19 Sep 2014 13:29:12 +0000 (13:29 +0000)]
Merge r1618851 from trunk: mod_authz_core: Allow <AuthzProviderAlias>'es
to be seen from auth stanzas under virtual hosts. PR 56870.
Submitted by: covener
Reviewed/backported by: jkaluza
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1626207 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Fri, 19 Sep 2014 13:22:09 +0000 (13:22 +0000)]
Merge r1618851 from trunk: mod_authz_core: Allow <AuthzProviderAlias>'es
to be seen from auth stanzas under virtual hosts. PR 56870. [Eric Covener]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1626203 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Fri, 19 Sep 2014 13:07:43 +0000 (13:07 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1626200 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 18 Sep 2014 12:15:06 +0000 (12:15 +0000)]
number format
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1625955 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 18 Sep 2014 12:14:54 +0000 (12:14 +0000)]
backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1625954 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 18 Sep 2014 12:07:41 +0000 (12:07 +0000)]
backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1625947 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Wed, 17 Sep 2014 11:56:05 +0000 (11:56 +0000)]
Propose mod_systemd and socket activation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1625531 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 16 Sep 2014 01:33:21 +0000 (01:33 +0000)]
Merge r1625196 from trunk:
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/branches/2.4.x@
1625199 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Sep 2014 14:18:06 +0000 (14:18 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1624744 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Sep 2014 14:16:56 +0000 (14:16 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1624743 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Thu, 11 Sep 2014 13:12:25 +0000 (13:12 +0000)]
Propose r1624234.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1624280 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 6 Sep 2014 15:09:30 +0000 (15:09 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1622872 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 6 Sep 2014 15:08:40 +0000 (15:08 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1622871 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 5 Sep 2014 14:21:41 +0000 (14:21 +0000)]
Merge r1617018 from trunk:
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.
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1622708 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 5 Sep 2014 14:20:27 +0000 (14:20 +0000)]
Merge r1611978, r1612068 from trunk:
Add missing APLOGNO.
Refactor to keep APLOGNO on the same line as ap_log_error, when applicable.
Add missing APLOGNO.
Refactor some lines to keep APLOGNO on the same line as ap_log_error, when applicable.
Split lines longer than 80.
Improve alignment.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1622706 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 5 Sep 2014 14:19:29 +0000 (14:19 +0000)]
Merge r1597642, r1608999, r1605207, r1610366, r1610353, r1611871 from trunk:
Rename module name in doxygen + partly revert r832442 which skipped doxygen doc generation for 'mod_watchdog.h'
s/apr_pstrndup/apr_pstrmemdup/ to save a few cycles
Use ap_remove_input_filter_byhandle instead of duplicating the code.
Remove some 'register' in variable declaration.
Remove some 'register' in variable declaration.
Save a few cycles by calling 'apr_isalnum' instead of 'apr_isalpha' and 'apr_isdigit'.
Do not use deprecated define.
No change in generated code because MODULE_MAGIC_NUMBER is defined as:
#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1622705 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 5 Sep 2014 14:17:53 +0000 (14:17 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1622704 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 5 Sep 2014 14:16:57 +0000 (14:16 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1622703 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 5 Sep 2014 12:33:16 +0000 (12:33 +0000)]
Backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1622691 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 4 Sep 2014 11:23:26 +0000 (11:23 +0000)]
Revoke backport proposal for now, not API compatible.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1622462 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 4 Sep 2014 09:21:16 +0000 (09:21 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1622429 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 3 Sep 2014 21:13:06 +0000 (21:13 +0000)]
fix PR reference
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1622359 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 3 Sep 2014 16:18:40 +0000 (16:18 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1622294 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 3 Sep 2014 16:16:41 +0000 (16:16 +0000)]
Merges some corrections from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1622292 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 1 Sep 2014 14:45:03 +0000 (14:45 +0000)]
Proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1621812 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 31 Aug 2014 16:09:08 +0000 (16:09 +0000)]
Merge r1618541 from trunk:
Avoid useless warning message when parsing a section guarded by <IfDefine foo> if $(foo) is used within the section.
PR 56503
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1621603 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 31 Aug 2014 16:08:33 +0000 (16:08 +0000)]
Merge r1618401 from trunk:
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
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1621602 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 31 Aug 2014 16:07:45 +0000 (16:07 +0000)]
Merge r1615289, r1620324 from trunk:
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.
Switch preference for headers, Transfer-Encoding
first, Content-Length second.
Addition to r1615289.
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1621601 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 31 Aug 2014 16:06:36 +0000 (16:06 +0000)]
Merge r1615026 from trunk:
Turn some APR_BUCKET_REMOVE(e)+apr_bucket_destroy(e) into the equivalent apr_bucket_delete(e) to reduce code verbosity
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1621600 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/branches/2.4.x@
1621588 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 31 Aug 2014 01:28:37 +0000 (01:28 +0000)]
mention weird looking ^xx formats in mod_log_config backported as
part of the trailers fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1621552 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 30 Aug 2014 20:08:36 +0000 (20:08 +0000)]
Fix PR number
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1621534 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 30 Aug 2014 13:14:48 +0000 (13:14 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1621457 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log