]>
granicus.if.org Git - apache/log
Jim Jagielski [Mon, 12 Jan 2015 13:34:53 +0000 (13:34 +0000)]
Merge r1601291, r1601630 from trunk:
mod_proxy: Shutdown (eg. SSL close notify) the backend connection
before closing.
mod_proxy: follow up to r1601291.
Since deferred_write_pool is needed by the core_output_filter and is a subpool
of the connection, shutdown in a pre_cleanup of the connection's pool to avoid
a freed memory access (SEGV).
Reported By: takashi
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651080 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jan 2015 13:32:18 +0000 (13:32 +0000)]
Merge r1601919, r1650061 from trunk:
mod_ssl: dump SSL IO/state for the write side of the connection(s), like reads.
mod_ssl: follow up to r1601919.
Likewise when set from SNI callback.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651078 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jan 2015 13:31:16 +0000 (13:31 +0000)]
Merge r1601184, r1601274, r1601185 from trunk:
mod_ssl: Ensure that the SSL close notify alert is flushed to the client.
PR54998.
Submitted By: Tim Kosse <tim.kosse filezilla-project.org>, ylavic
Committed By: ylavic
mod_ssl: SSL_smart_shutdown(): follow up to r1601184.
Use SSL_get_wbio() to comply with OPENSSL_NO_SSL_INTERN.
Stop SSL shutdown loop when flush fails.
mpm_event[opt]: Send the SSL close notify alert when the KeepAliveTimeout
expires. PR54998.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651077 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 11 Jan 2015 19:45:59 +0000 (19:45 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650956 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 10 Jan 2015 17:29:43 +0000 (17:29 +0000)]
vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650773 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 9 Jan 2015 21:33:12 +0000 (21:33 +0000)]
Merge r1640495, r1644031 from trunk
* mod_proxy_fcgi: Ignore body data from backend for 304 responses. PR 57198.
Submitted by: jkaluza
Reviewed by: jkaluza, ylavic, covener
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650677 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 9 Jan 2015 20:51:03 +0000 (20:51 +0000)]
Merge r1630947, r1645670 from trunk
* mod_ssl: Check if we are having an SSL connection before looking up SSL
related variables during expression evaluation to avoid a crash.
If not return NULL as ssl_var_lookup_ssl does by default. PR 57070
Submitted by: rpluem
Reviewed by: jailletc36, ylavic, covener
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650659 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 9 Jan 2015 20:37:50 +0000 (20:37 +0000)]
Merge r1644503 from trunk
* mod_proxy_ajp: Fix handling of the default port (8009) in the
ProxyPass and <Proxy> configurations. PR 57259.
Submitted by: ylavic
Reviewed by: ylavic, jim, covener
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650655 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 9 Jan 2015 20:26:06 +0000 (20:26 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650648 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Jan 2015 16:25:54 +0000 (16:25 +0000)]
Add copy and paste typo fix to proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650323 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Jan 2015 16:07:03 +0000 (16:07 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650319 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Jan 2015 16:05:53 +0000 (16:05 +0000)]
Add some easy votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650318 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Jan 2015 15:45:34 +0000 (15:45 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650313 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 7 Jan 2015 14:24:03 +0000 (14:24 +0000)]
Update mod_ssl's IO/state dump proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1650063 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 14:02:18 +0000 (14:02 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1649337 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 14:01:33 +0000 (14:01 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1649336 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 13:58:17 +0000 (13:58 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1649335 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 13:52:00 +0000 (13:52 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1649334 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 3 Jan 2015 15:39:40 +0000 (15:39 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1649213 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 3 Jan 2015 15:38:43 +0000 (15:38 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1649212 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 2 Jan 2015 14:32:27 +0000 (14:32 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1649044 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 2 Jan 2015 11:49:24 +0000 (11:49 +0000)]
Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1649004 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 2 Jan 2015 11:44:40 +0000 (11:44 +0000)]
PR 48460: Improve/correct mod_proxy_ajp docs.
Backport of r1649001 from trunk (CTR).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1649003 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 1 Jan 2015 15:30:56 +0000 (15:30 +0000)]
Regenerate xforms after s/2014/2015/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1648855 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 1 Jan 2015 13:55:29 +0000 (13:55 +0000)]
Happy New Year 2015
Backport of r1648840from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1648845 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 31 Dec 2014 15:40:44 +0000 (15:40 +0000)]
propose split-logfile bugfix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1648720 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Tue, 30 Dec 2014 18:04:32 +0000 (18:04 +0000)]
Fix comment errors in mod_proxy_fcgi.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1648559 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 29 Dec 2014 21:07:33 +0000 (21:07 +0000)]
propose proxypassreverse fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1648434 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 29 Dec 2014 17:37:05 +0000 (17:37 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1648396 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 29 Dec 2014 17:29:59 +0000 (17:29 +0000)]
propose continuation/long line fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1648395 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sun, 28 Dec 2014 19:48:28 +0000 (19:48 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1648247 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 28 Dec 2014 14:58:31 +0000 (14:58 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1648213 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 28 Dec 2014 14:57:41 +0000 (14:57 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1648212 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sun, 28 Dec 2014 13:51:49 +0000 (13:51 +0000)]
Adjust proposal to be copypasta-ready for CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1648203 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sun, 28 Dec 2014 13:48:50 +0000 (13:48 +0000)]
Propose mod_autoindex fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1648202 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 22 Dec 2014 00:44:19 +0000 (00:44 +0000)]
Merge r1647229 from trunk:
some tweaks for no ServerName from PR57384
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1647230 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 21 Dec 2014 16:54:46 +0000 (16:54 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1647173 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 21 Dec 2014 16:54:03 +0000 (16:54 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1647172 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 21 Dec 2014 15:33:08 +0000 (15:33 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1647157 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 21 Dec 2014 15:32:10 +0000 (15:32 +0000)]
fix link and anchor
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1647155 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 19 Dec 2014 01:12:19 +0000 (01:12 +0000)]
vote&promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1646602 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 18 Dec 2014 23:15:08 +0000 (23:15 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1646571 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Thu, 18 Dec 2014 10:06:58 +0000 (10:06 +0000)]
Propose ap_errorlog_provider and mod_journald.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1646425 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 18 Dec 2014 06:58:12 +0000 (06:58 +0000)]
Fix example as spotted in a comment in online doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1646393 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 17 Dec 2014 09:21:08 +0000 (09:21 +0000)]
CHANGES entry for r1642858 and r1645936.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1646179 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 16 Dec 2014 13:07:03 +0000 (13:07 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1645937 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 16 Dec 2014 13:06:48 +0000 (13:06 +0000)]
Merge r1642868 from trunk:
mpm_event: follow up to r1639614 (trunk) and r1642858 (2.4.x).
Notify suspend in any case when starting lingering close (blocking),
and outside the lingering queue's critical section.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1645936 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 16 Dec 2014 13:06:19 +0000 (13:06 +0000)]
Merge r1641077, r1641095 from trunk:
mod_ssl: Fix recognition of OCSP stapling responses that are encoded
improperly or too large.
The one byte "ok" flag stored with the response was accounted for in
the wrong condition.
follow up to r1641077:
one bug was traded for another in r1641077; track the response
length and the cached object length separately to avoid such
confusion
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1645935 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 16 Dec 2014 13:05:23 +0000 (13:05 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1645933 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 16 Dec 2014 13:04:57 +0000 (13:04 +0000)]
some votes on tested backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1645932 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 16 Dec 2014 08:19:26 +0000 (08:19 +0000)]
Propose r1644031, comment on ScriptLog patch (r1626978).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1645877 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 16 Dec 2014 07:13:29 +0000 (07:13 +0000)]
Fix command line parameters as spotted in a comment in the online doc.
Thx alfonz.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1645865 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 16 Dec 2014 07:07:52 +0000 (07:07 +0000)]
Update proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1645861 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 15 Dec 2014 05:44:48 +0000 (05:44 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1645565 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 14 Dec 2014 06:59:49 +0000 (06:59 +0000)]
Be a bit more consistant on how PR are written
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1645423 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Dec 2014 17:23:33 +0000 (17:23 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1645327 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Dec 2014 17:22:12 +0000 (17:22 +0000)]
Typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1645326 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 10 Dec 2014 18:48:27 +0000 (18:48 +0000)]
Propose PR 57259 fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1644506 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 10 Dec 2014 18:20:27 +0000 (18:20 +0000)]
Propose PR 57334 fix and a debug goodie.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1644501 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 9 Dec 2014 23:57:50 +0000 (23:57 +0000)]
Merge r1644245
Added include path for Windows build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1644247 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Dec 2014 14:54:18 +0000 (14:54 +0000)]
Propose PR 56823 and PR 57328 fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1643831 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Dec 2014 14:46:19 +0000 (14:46 +0000)]
Vote/promote OCSP fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1643829 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 7 Dec 2014 16:01:12 +0000 (16:01 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1643692 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 7 Dec 2014 16:00:26 +0000 (16:00 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1643691 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 7 Dec 2014 15:57:44 +0000 (15:57 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1643689 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 7 Dec 2014 15:56:04 +0000 (15:56 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1643688 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 6 Dec 2014 15:45:34 +0000 (15:45 +0000)]
ap_log_data() et al?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1643544 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 6 Dec 2014 14:15:18 +0000 (14:15 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1643534 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 6 Dec 2014 14:14:15 +0000 (14:14 +0000)]
Merge r1643531 from trunk:
Move some tweaked/re-tested recipes from https://wiki.apache.org/httpd/RewriteQueryString into the
extended doc for mod_rewrite.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1643532 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 5 Dec 2014 22:28:02 +0000 (22:28 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1643458 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 5 Dec 2014 22:08:24 +0000 (22:08 +0000)]
validate xml
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1643445 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 5 Dec 2014 20:24:53 +0000 (20:24 +0000)]
Fix typo + correctly spell this poor Barbara name, otherwise she will never be able to get access (r1643416)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1643418 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 5 Dec 2014 13:41:31 +0000 (13:41 +0000)]
Merge r1643277 from trunk:
add some hints about using expressions in mod_headers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1643278 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 5 Dec 2014 13:28:31 +0000 (13:28 +0000)]
Merge r1643267 from trunk:
function examples, other flavor of function examples. replace() example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1643268 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 5 Dec 2014 12:23:43 +0000 (12:23 +0000)]
include bug number 55558 in old CHANGES entry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1643256 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 3 Dec 2014 01:32:15 +0000 (01:32 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1643037 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 3 Dec 2014 01:31:37 +0000 (01:31 +0000)]
Merge r1643034 from trunk:
elaborate on per-directory limitations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1643036 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 2 Dec 2014 14:50:32 +0000 (14:50 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642884 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 2 Dec 2014 13:50:29 +0000 (13:50 +0000)]
Propose follow up to r1642858.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642869 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 2 Dec 2014 13:18:26 +0000 (13:18 +0000)]
off by one
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642865 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Dec 2014 12:50:59 +0000 (12:50 +0000)]
Merge r1642499 from trunk:
*) SECURITY: CVE-2014-8109 (cve.mitre.org)
mod_lua: Fix handling of the Require line when a LuaAuthzProvider is
used in multiple Require directives with different arguments.
PR57204 [Edward Lu <Chaosed0 gmail.com>]
Submitted By: Edward Lu
Committed By: covener
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642861 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Dec 2014 12:49:42 +0000 (12:49 +0000)]
Merge r1638879, r1640031 from trunk:
avoid dereferencing a recently apr_pool_clear()'ed event_conn_state_t *cs
in several paths where ptrans is being recycled at the end of a request.
event, eventopt: follow up to r1638879 and r1639960.
Clear the pool in ap_push_pool() before recycling.
Submitted by: covener, ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642859 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Dec 2014 12:48:41 +0000 (12:48 +0000)]
Merge r1639614 from trunk:
don't call notify_suspend() in a worker thread after
start_lingering_close_common may have put the socket back
into the pollset.
If it becomes readable too quickly, cs can be
free'ed or accessed concurrently.
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642858 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Dec 2014 12:48:24 +0000 (12:48 +0000)]
Merge r1635645 from trunk:
mod_proxy_connect: Don't issue AH02447 on sockets hangups, let the read
determine whether it is a normal close or a real error. PR 57168.
Abort the client or backend connection on polling errors, but don't forcibly
abort the client side at the end (the core filters will do that otherwise
when necessary), so that lingering close and SSL shutdown can occur on normal
close.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642857 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Dec 2014 12:47:58 +0000 (12:47 +0000)]
Merge r1635644 from trunk:
mod_proxy_wstunnel: abort backend connection on polling error to avoid
further processing (lingering close, SSL shutdown).
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642856 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Dec 2014 12:47:22 +0000 (12:47 +0000)]
Merge r1640040, r1640042 from trunk:
mod_proxy_fcgi, mod_authnz_fcgi: stop reading the response and issue an error
when parsing or forwarding the response fails.
Follow up to r1640040: CHANGES entry.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642855 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Dec 2014 12:45:12 +0000 (12:45 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642854 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Dec 2014 12:44:32 +0000 (12:44 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642853 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Dec 2014 12:43:23 +0000 (12:43 +0000)]
Merge r1635428 from trunk:
core: Do not match files when using DirectoryMatch. PR41867.
Submitted by: jkaluza
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642852 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Dec 2014 12:42:39 +0000 (12:42 +0000)]
Merge r1638073 from trunk:
* server/scoreboard.c: Check for child_num < 0 also in ap_update_child_status
and ap_update_child_status_from_conn. PR 56767.
Submitted by: jkaluza
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642851 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Dec 2014 12:42:12 +0000 (12:42 +0000)]
Merge r1638072 from trunk:
mod_auth_basic: Fix comment mentioning 403 instead of 401.
Submitted by: jkaluza
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642850 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 1 Dec 2014 13:21:29 +0000 (13:21 +0000)]
Votes, promotions, and comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642678 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 30 Nov 2014 18:23:20 +0000 (18:23 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642593 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 30 Nov 2014 18:22:58 +0000 (18:22 +0000)]
Merge r1642590 from trunk:
use an actual list since we're gong to the trouble to use -in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642592 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 30 Nov 2014 18:19:48 +0000 (18:19 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642589 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 30 Nov 2014 18:17:33 +0000 (18:17 +0000)]
Merge r1642581, r1642584 from trunk:
even out some whitespace
add a few more examples per feedback
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642587 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 30 Nov 2014 01:43:52 +0000 (01:43 +0000)]
propose mild mod_lua CVE
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642500 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 29 Nov 2014 23:18:15 +0000 (23:18 +0000)]
propose rewrite usability feature
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642485 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Nov 2014 17:47:19 +0000 (17:47 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642457 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Nov 2014 17:46:40 +0000 (17:46 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1642456 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log