]>
granicus.if.org Git - apache/log
Eric Covener [Sun, 2 Nov 2014 21:01:55 +0000 (21:01 +0000)]
Merge r1636189 from trunk:
add a -in wordlist example, change 'string list' to wordlist so you can jump to the grammar.
leave a hint about line endings (uncommitted change in my tree)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1636190 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 1 Nov 2014 18:01:31 +0000 (18:01 +0000)]
restore SECURITY to top
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1636006 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 1 Nov 2014 17:59:01 +0000 (17:59 +0000)]
committed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1636003 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 1 Nov 2014 17:58:49 +0000 (17:58 +0000)]
Merge r1634425 from trunk:
When using EBCDIC encoding, HTTPS through ProxyPass and ProxyRemote doesn't
work correctly. PR 57092
Submitted By: Edward Lu
Reviewed By: covener, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1636002 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 1 Nov 2014 17:57:47 +0000 (17:57 +0000)]
Merge r1634237 from trunk:
fix another case of 304 response sent to an unconditional request
Submitted By: covener
Reviewed By: covener, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1636001 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 1 Nov 2014 15:21:33 +0000 (15:21 +0000)]
Merge r1633031, r1633522, r1633529, r1633530 from trunk
Style fix
Submitted by: jailletc36
Reviewed by: jailletc36, jim, ylavic
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635970 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 1 Nov 2014 09:19:17 +0000 (09:19 +0000)]
Merge r1611858, r1611908, r1611916 from trunk
doc: improve doxygen output for util_ebcdic.h and util_charset.h.
Submitted by: jailletc36
Reviewed by: jailletc36, rjung, ylavic
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635905 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 1 Nov 2014 07:06:46 +0000 (07:06 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635896 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 31 Oct 2014 13:21:28 +0000 (13:21 +0000)]
propose errordoc fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635763 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Fri, 31 Oct 2014 09:41:44 +0000 (09:41 +0000)]
Propose r1622450 and r1626978.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635741 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 30 Oct 2014 18:33:08 +0000 (18:33 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635581 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 30 Oct 2014 17:34:43 +0000 (17:34 +0000)]
merge r1635558 from trunk:
show a bit more of openssl's -status display
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635559 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 30 Oct 2014 14:31:21 +0000 (14:31 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635513 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 30 Oct 2014 14:30:28 +0000 (14:30 +0000)]
merge r1635510 from trunk:
more hints for OCSP Stapling:
* when a different cache mechanism is used...
* testing that your server sends an OCSP response
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635512 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 29 Oct 2014 11:58:36 +0000 (11:58 +0000)]
fix typo in "mod_ssl"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1635105 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 28 Oct 2014 19:00:50 +0000 (19:00 +0000)]
Merge r1631983 from trunk:
mod_substitute: no real functional change, but:
- define default for maximum line length
indepenent of MAX_STRING_LEN
- Clarify line length check with a comment
- add supported 'b' suffix to directive
description
Submitted by: rjung
Reviewed by: jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634948 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Oct 2014 10:32:46 +0000 (10:32 +0000)]
Split suggested by Christophe done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634839 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Oct 2014 09:57:06 +0000 (09:57 +0000)]
Work on split suggested by Christophe.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634829 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Oct 2014 09:55:23 +0000 (09:55 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634827 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 28 Oct 2014 07:04:49 +0000 (07:04 +0000)]
Note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634800 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 28 Oct 2014 06:47:58 +0000 (06:47 +0000)]
Fix compatibility note + rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634793 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 27 Oct 2014 23:22:57 +0000 (23:22 +0000)]
Merge r1634736 from trunk:
Remove commented-out SSLStaplingForceURL at global scope.
Global or not, its use is specialized and those that need it won't need a sample,
and others may be confused.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1634737 13f79535 -47bb-0310-9956-
ffa450edef68
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
projects / apache / log