]>
granicus.if.org Git - apache/log
Lucien Gentis [Mon, 28 Aug 2017 11:03:03 +0000 (11:03 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1806426 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Fri, 25 Aug 2017 19:59:24 +0000 (19:59 +0000)]
Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1806222 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Wed, 23 Aug 2017 21:51:30 +0000 (21:51 +0000)]
Vote and suggest
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805966 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 22 Aug 2017 11:10:14 +0000 (11:10 +0000)]
And these backports look, and test, good. +1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805754 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 21 Aug 2017 13:45:11 +0000 (13:45 +0000)]
Rebuil.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805632 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 21 Aug 2017 13:44:27 +0000 (13:44 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805631 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 19 Aug 2017 07:17:10 +0000 (07:17 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805489 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Aug 2017 18:39:58 +0000 (18:39 +0000)]
lgtm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805456 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Aug 2017 18:38:44 +0000 (18:38 +0000)]
syslog vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805455 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Aug 2017 18:37:34 +0000 (18:37 +0000)]
format change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805454 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 18 Aug 2017 08:50:03 +0000 (08:50 +0000)]
Merged.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805391 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 18 Aug 2017 08:49:42 +0000 (08:49 +0000)]
Merge
1805099 from trunk:
Fix ProxyAddHeaders merging.
* modules/proxy/mod_proxy.h:
Add add_forwarded_headers_set field to proxy_dir_conf.
* modules/proxy/mod_proxy.c (create_proxy_dir_config):
Initialize add_forwarded_headers_set.
(add_proxy_http_headers): Set it.
(merge_proxy_dir_config): Merge add_forwarded_headers correctly.
Reviewed by: jorton, rpluem, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805390 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 18 Aug 2017 06:24:08 +0000 (06:24 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805366 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 17 Aug 2017 18:59:32 +0000 (18:59 +0000)]
Tested and voted on proposals... Will try to do LibreSSL this
weekend.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805327 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 17 Aug 2017 18:54:48 +0000 (18:54 +0000)]
2 backport proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805326 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Aug 2017 16:51:15 +0000 (16:51 +0000)]
create +1 vote line
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805224 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Aug 2017 16:50:29 +0000 (16:50 +0000)]
Merge r1713043, r1802305, r1802309 from trunk:
Save a few bytes in conf pool when processing 'Define'.
+ some minor style issues
+ split long lines
Be explicit and safe (const) with the strings stored in ap_server_config_defines.
Follow up to r1713043.
ap_server_config_defines and ap_server_{pre,post}_read_config are arrays of
*const* strings (must not change after being inserted), make it explicit.
Submitted by: jailletc36, ylavic, ylavic
Reviewed by: ylavic, jorton, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805223 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Aug 2017 16:49:12 +0000 (16:49 +0000)]
Merge r1618555 from trunk:
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).
Submitted by: jkaluza
Reviewed by: ylavic, jorton, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805222 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Aug 2017 16:48:29 +0000 (16:48 +0000)]
Merge r1789220, r1792675 from trunk:
core: Disallow multiple Listen on the same IP:port when listener buckets
are configured (ListenCoresBucketsRatio > 0), consistently with the single
bucket case (default), thus fixing the leak of the corresponding socket
descriptors on graceful restart.
Follow up to r1789220.
Document the implicit behaviour of ListenCoresBucketsRatio when multiple
Listen-ers are configured on the same IP:port.
Submitted by: ylavic
Reviewed by: ylavic, jim, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805221 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Aug 2017 16:46:44 +0000 (16:46 +0000)]
promote those w/ 3 +1s
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805219 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Aug 2017 16:45:52 +0000 (16:45 +0000)]
Votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805218 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 16 Aug 2017 05:34:07 +0000 (05:34 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805138 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 15 Aug 2017 17:56:41 +0000 (17:56 +0000)]
Votes*N, propose*1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805109 13f79535 -47bb-0310-9956-
ffa450edef68
Steffen Land [Sun, 6 Aug 2017 10:26:43 +0000 (10:26 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1804229 13f79535 -47bb-0310-9956-
ffa450edef68
Steffen Land [Sun, 6 Aug 2017 10:14:35 +0000 (10:14 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1804228 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 4 Aug 2017 10:21:05 +0000 (10:21 +0000)]
mod_http2: backport proposal added
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1804091 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 4 Aug 2017 01:23:59 +0000 (01:23 +0000)]
lost backport of log entry improvement
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1804066 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 1 Aug 2017 15:41:54 +0000 (15:41 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803660 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 1 Aug 2017 15:40:48 +0000 (15:40 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803659 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sun, 30 Jul 2017 06:44:16 +0000 (06:44 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803404 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sun, 30 Jul 2017 06:43:41 +0000 (06:43 +0000)]
update for sync with English docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803403 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 29 Jul 2017 23:32:39 +0000 (23:32 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803399 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 28 Jul 2017 17:49:44 +0000 (17:49 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803316 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 28 Jul 2017 17:48:16 +0000 (17:48 +0000)]
Merge r1803313 from trunk:
cross link some balancer directives across proxy mods
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803315 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 28 Jul 2017 09:30:39 +0000 (09:30 +0000)]
Documentation update: part 2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803260 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 28 Jul 2017 09:29:46 +0000 (09:29 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803259 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 28 Jul 2017 09:29:20 +0000 (09:29 +0000)]
mod_proxy*.xml: improve connection reuse documentation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803258 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 24 Jul 2017 17:21:41 +0000 (17:21 +0000)]
extended warning catch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802846 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 22 Jul 2017 15:33:12 +0000 (15:33 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802705 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 22 Jul 2017 15:32:19 +0000 (15:32 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802704 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 19 Jul 2017 21:03:21 +0000 (21:03 +0000)]
Withdraw my mod_proxy_fcgi backport proposal
There has been some discussion over IRC about
possible performance issues with the current
code in certain scenarios (like a simple echo
FCGI backend that returns data as it comes in).
Jacob is working on a different solution, waiting
for his feedback before proceeding any further.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802431 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 19 Jul 2017 15:09:53 +0000 (15:09 +0000)]
Propose syslog backport re: PR 60525
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802402 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 18 Jul 2017 21:02:08 +0000 (21:02 +0000)]
update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802339 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 18 Jul 2017 21:00:43 +0000 (21:00 +0000)]
Merge r1802336 from trunk:
UDS does support reuse
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802337 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 18 Jul 2017 19:44:44 +0000 (19:44 +0000)]
Agreement between example and explanation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802328 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 18 Jul 2017 15:22:00 +0000 (15:22 +0000)]
Easy proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802310 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 17 Jul 2017 13:54:46 +0000 (13:54 +0000)]
Merge r1762580, r1762701, r1762702, r1762718, r1762723, r1762742, r1762743, r1774538, r1779354 from trunk:
event: use atomics for *timeout_queue->total since it's updated concurrently,
and move TO_QUEUE_*() macros to functions.
event: add/remove from/to the pollset outside of the critical sections.
We don't need external locking since it's created with APR_POLLSET_THREADSAFE,
hence reduce those sections to the lowest cycles possible.
A spinlock may be interesting instead of the mutex now, we won't block and the
TO_QUEUE_*() and process_timeout_queue() operations are fast...
event: follow up to r1762701: update log tag.
event: avoid unnecessary listener/polling wake ups (context switches) by using
apr_pollset_wakeup(), when implemented, to signal the listener according to the
next timers or timeout queues expiry (updated at insert and maintenance time).
Follow up to r1762718: CHANGES entry.
event: follow up to r1762718.
We still need to kill kept-alive connections in normal/expiry processing if
the workers are busy or dying.
event: follow up to r1762718 and r1762742: put de condition where it belongs.
event: follow up to r1762718.
On graceful shutdown/restart, kill kept-alive connections before poll()ing
again, avoiding to wait for their "normal" timers (before being woken up)
when they remain the last handled connections.
event: follow up to r1762701.
Keep QUEUE_APPEND()+pollset_add() or QUEUE_REMOVE()+pollset_remove() atomic.
Otherwise when a worker adds an entry in some queue (e.g. KA, lingering), it
might race with the listener in the time between the mutex is released and the
pollset is updated; meanwhile the listener might process the queue and find an
entry no yet in its pollset.
For the lingering queue, the entry could then have been used after its pool
destroyed.
Submitted by: ylavic
Reviewed by: ylavic, icing, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802146 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 17 Jul 2017 13:44:30 +0000 (13:44 +0000)]
Merge r1754164, r1801994, r1801995 from trunk:
mod_proxy_wstunnel: we want to detect whether some response was sent to
the client when forwarding data from the backend to the client, not the
reverse.
Follow up to r1754164: CHANGES entry.
Follow up to r1801994: CHANGES' PR reference.
Submitted by: ylavic
Reviewed by: ylavic, jchampion, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802144 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 17 Jul 2017 13:43:19 +0000 (13:43 +0000)]
promotes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802143 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 17 Jul 2017 13:42:32 +0000 (13:42 +0000)]
some votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802142 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 17 Jul 2017 13:41:36 +0000 (13:41 +0000)]
Note release date for 2.4.27
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802141 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 17 Jul 2017 11:06:52 +0000 (11:06 +0000)]
Credits.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802129 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 17 Jul 2017 10:32:45 +0000 (10:32 +0000)]
Add CHANGES' security entries for 2.4.27.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802121 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 16 Jul 2017 16:15:28 +0000 (16:15 +0000)]
Propose backport of r1802040
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802077 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Fri, 14 Jul 2017 23:05:16 +0000 (23:05 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801999 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 14 Jul 2017 22:32:08 +0000 (22:32 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801997 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Wed, 12 Jul 2017 00:41:44 +0000 (00:41 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801668 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Tue, 11 Jul 2017 12:15:34 +0000 (12:15 +0000)]
Propose fix for PR 61142
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801602 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Mon, 10 Jul 2017 18:06:28 +0000 (18:06 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801507 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 10 Jul 2017 14:17:22 +0000 (14:17 +0000)]
Point to 2.4.28-dev version of patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801472 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 8 Jul 2017 14:33:25 +0000 (14:33 +0000)]
typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801291 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 6 Jul 2017 17:39:58 +0000 (17:39 +0000)]
And we are 2.4.28-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801086 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 6 Jul 2017 17:37:42 +0000 (17:37 +0000)]
Get ready to tag 2.4.27
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801084 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 6 Jul 2017 16:25:24 +0000 (16:25 +0000)]
make COMPATIBILITY entries explicit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801080 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 6 Jul 2017 16:12:52 +0000 (16:12 +0000)]
more meat re: lua compatibility "break"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801079 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Thu, 6 Jul 2017 15:48:51 +0000 (15:48 +0000)]
CHANGES: note mod_lua compatibility break
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801074 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 6 Jul 2017 12:58:22 +0000 (12:58 +0000)]
Merge r1800978 from trunk:
On the trunk:
mod_http2: Simplify ready queue, less memory and better performance. Update
mod_http2 version to 1.10.7.
Submitted by: icing
Reviewed by: icing, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801045 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 6 Jul 2017 12:54:37 +0000 (12:54 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801044 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 6 Jul 2017 09:24:27 +0000 (09:24 +0000)]
vote on http2 backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801001 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 6 Jul 2017 09:02:30 +0000 (09:02 +0000)]
propose backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800997 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 6 Jul 2017 00:04:41 +0000 (00:04 +0000)]
Fix negotiation type parsing to be strict about "*", "*/*" and "type/*"
comparisons.
Submitted by: wrowe, Robert Święcki <robert swiecki.net>
Backports: r1800917
Reviewed by: wrowe, jim, jchampion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800956 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 6 Jul 2017 00:02:54 +0000 (00:02 +0000)]
SECURITY: CVE-2017-9788: Uninitialized memory reflection in mod_auth_digest.
The value placeholder in [Proxy-]Authorization headers type 'Digest' was not
initialized or reset before or between successive key=value assignments by
mod_auth_digest. Providing an initial key with no '=' assignment could reflect
the stale value of uninitialized pool memory used by the prior request, leading
to leakage of potentially confidential information, and a segfault.
Submitted by: wrowe
Backports: r1800919
Reviewed by: wrowe, jim, jchampion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800955 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Wed, 5 Jul 2017 23:38:31 +0000 (23:38 +0000)]
Vote/promote another.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800952 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Wed, 5 Jul 2017 19:57:40 +0000 (19:57 +0000)]
Vote/promote one.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800940 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 5 Jul 2017 19:55:21 +0000 (19:55 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800938 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 5 Jul 2017 19:46:35 +0000 (19:46 +0000)]
Two more string parsing oddities for consideration
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800923 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 5 Jul 2017 17:34:47 +0000 (17:34 +0000)]
Mark backported patch
1800173 in commit
1800215
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800903 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 5 Jul 2017 11:51:18 +0000 (11:51 +0000)]
Merge r1800788 from trunk:
Add mod_proxy_hcheck to generated httpd.spec file. PR 60506.
Submitted by: ylavic
Reviewed by: ylavic, rpluem, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800862 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 5 Jul 2017 11:50:49 +0000 (11:50 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800861 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 5 Jul 2017 11:50:35 +0000 (11:50 +0000)]
vote on rpm change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800860 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 5 Jul 2017 06:10:14 +0000 (06:10 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800842 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 4 Jul 2017 22:28:38 +0000 (22:28 +0000)]
mod_lua: Improve compatibility with Lua 5.1, 5.2 and 5.3.
PR58188, PR60831, PR61245.
CTR
The following lua 5.2 and 5.3 compat change
should be checked for runtime correctness
by someone more knowledgeable about lua.
Index: modules/lua/lua_apr.c
--- modules/lua/lua_apr.c (original)
+++ modules/lua/lua_apr.c Tue Jul 4 20:48:43 2017
@@ -82,7 +82,11 @@ static const luaL_Reg lua_table_methods[
int ap_lua_init(lua_State *L, apr_pool_t *p)
{
luaL_newmetatable(L, "Apr.Table");
+#if LUA_VERSION_NUM < 502
luaL_register(L, "apr_table", lua_table_methods);
+#else
+ luaL_newlib(L, lua_table_methods);
+#endif
lua_pushstring(L, "__index");
lua_pushstring(L, "get");
lua_gettable(L, 2);
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800835 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 4 Jul 2017 14:06:02 +0000 (14:06 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800790 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 4 Jul 2017 12:35:11 +0000 (12:35 +0000)]
Merge r1800594 from trunk:
* Do not apply the strict permissions of the temporary file to a possibly
existing passwd file.
This long standing bug was triggered by fixing a bug in APR in r1791029.
PR: 61240
Submitted by: rpluem
Reviewed by: rpluem, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800775 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 4 Jul 2017 12:34:15 +0000 (12:34 +0000)]
SECURITY: CVE-2017-9789: Read after free in mod_http2.
When under stress, closing many connections, the HTTP/2
handling code would sometimes access memory after it has
been freed, resulting in potentially erratic behaviour.
Merge r1800689 from trunk:
Disable and give warning when mpm_prefork is encountered.
The server will continue to work, but HTTP/2 will no longer be negotiated.
Submitted by: icing
Reviewed by: icing, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800774 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 4 Jul 2017 12:33:05 +0000 (12:33 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800773 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 4 Jul 2017 12:32:46 +0000 (12:32 +0000)]
Votes on backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800772 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 4 Jul 2017 11:57:31 +0000 (11:57 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800757 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 4 Jul 2017 06:38:10 +0000 (06:38 +0000)]
* Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800728 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 3 Jul 2017 15:49:30 +0000 (15:49 +0000)]
On the 2.4.x branch:
propose backport of http2/prefork disabling.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800692 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 3 Jul 2017 12:05:20 +0000 (12:05 +0000)]
Note proposed T&R for this Thurs (July 6th)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800658 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 3 Jul 2017 10:22:07 +0000 (10:22 +0000)]
Merge r1800306, r1800393 from trunk:
proxy_fcgi: remove FPM-specific logic
Reverts r1780328, r1780329, and their associated followups, which
incorrectly manipulated SCRIPT_NAME by default. All proxy_fcgi.t
regression tests now pass.
PR: 61202
Partial reversal of r1800306... note virtual scripts in notes
Submitted by: jchampion, jim
Reviewed by: jchampion, jim, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800618 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 2 Jul 2017 21:27:16 +0000 (21:27 +0000)]
vote/promote fcgi
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800578 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 1 Jul 2017 13:42:00 +0000 (13:42 +0000)]
vote on fcgi backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800507 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Fri, 30 Jun 2017 21:52:59 +0000 (21:52 +0000)]
PR61202: add virtual_script note back to backport (un-revert)
Per ML discussion; thanks to Jim for pointing this out.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800472 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Thu, 29 Jun 2017 18:06:49 +0000 (18:06 +0000)]
Propose showstopper.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800307 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 29 Jun 2017 11:31:20 +0000 (11:31 +0000)]
Merge r1551611, r1783765, r1788996, r1788998, r1789000, r1795651 from trunk:
Log a warning when the LDAP authn provider is configured but an AuthLDAPURL
isn't -- IOW, avoid silently skipping a misconfigured [or buggy?] LDAP provider.
Follow up to r1772919: update APLOGNO().
Save a few cycles.
'apr_pstrcatv' can compute the length of the new string for us.
Improve indentation
Group bit field values in order to save some memory.
Add an explicit NULL to initialise a field in an authn_provider structure, as done in all other places. PR 60636
Submitted by: covener, ylavic, jailletc36, jailletc36, jailletc36, jailletc36
Reviewed by: jailletc36, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800268 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 29 Jun 2017 11:29:11 +0000 (11:29 +0000)]
Merge r1735906 from trunk:
Avoid a call to 'prep_walk_cache' if possible, just as in 'ap_if_walk' and 'ap_location_walk'
Submitted by: jailletc36
Reviewed by: jailletc36, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800267 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 29 Jun 2017 00:16:27 +0000 (00:16 +0000)]
Restore single-char field names inadvertantly disallowed in 2.4.25.
Backports: r1800173
PR: 61220
Submitted by: ylavic
Reviewed by: wrowe, jchampion, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800215 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Wed, 28 Jun 2017 21:32:04 +0000 (21:32 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1800206 13f79535 -47bb-0310-9956-
ffa450edef68