]> granicus.if.org Git - apache/log
apache
7 years agoVote, promote.
Yann Ylavic [Sat, 30 Sep 2017 19:13:22 +0000 (19:13 +0000)]
Vote, promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1810231 13f79535-47bb-0310-9956-ffa450edef68

7 years agoVote + promote
Luca Toscano [Sat, 30 Sep 2017 11:26:48 +0000 (11:26 +0000)]
Vote + promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1810197 13f79535-47bb-0310-9956-ffa450edef68

7 years agoVote mod_http2 1.10.12
Steffen Land [Fri, 29 Sep 2017 17:23:46 +0000 (17:23 +0000)]
Vote mod_http2 1.10.12

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1810139 13f79535-47bb-0310-9956-ffa450edef68

7 years agoPropose
Luca Toscano [Fri, 29 Sep 2017 16:26:01 +0000 (16:26 +0000)]
Propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1810135 13f79535-47bb-0310-9956-ffa450edef68

7 years agofixed embarassing vi artefact
Stefan Eissing [Fri, 29 Sep 2017 16:15:28 +0000 (16:15 +0000)]
fixed embarassing vi artefact

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1810134 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the 2.4.x branch:
Stefan Eissing [Fri, 29 Sep 2017 16:14:21 +0000 (16:14 +0000)]
On the 2.4.x branch:

mod_http2: propose backport to v1.10.12

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1810133 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRFC8081, new font/ registry as pointed out by Steffen (backports r1810121)
William A. Rowe Jr [Fri, 29 Sep 2017 15:10:51 +0000 (15:10 +0000)]
RFC8081, new font/ registry as pointed out by Steffen (backports r1810121)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1810122 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRepair copy/paste error noted by Steffen
William A. Rowe Jr [Fri, 29 Sep 2017 14:42:34 +0000 (14:42 +0000)]
Repair copy/paste error noted by Steffen

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1810116 13f79535-47bb-0310-9956-ffa450edef68

7 years agoWe no longer bundle APR at all, I don't know that many of these
William A. Rowe Jr [Thu, 28 Sep 2017 17:30:27 +0000 (17:30 +0000)]
We no longer bundle APR at all, I don't know that many of these
licenses belong in *this* project repository.

But APR no longer bundles expat at all, making two of those
licenses very archaic - and note they did not reflect the current
LICENSE file contents of the component.

Opinions on leaving it up to repos/asf/apr/apr/trunk/LICENSE
to document other licenses on their project, since we simply are
a consumer of another component, and no longer bundle that?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1810016 13f79535-47bb-0310-9956-ffa450edef68

7 years agoDuplicate mod_watchdog.h to include/
William A. Rowe Jr [Thu, 28 Sep 2017 17:17:42 +0000 (17:17 +0000)]
Duplicate mod_watchdog.h to include/

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1810012 13f79535-47bb-0310-9956-ffa450edef68

7 years agoVote.
Yann Ylavic [Thu, 28 Sep 2017 13:28:22 +0000 (13:28 +0000)]
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809991 13f79535-47bb-0310-9956-ffa450edef68

7 years agoThis source and build file are text
William A. Rowe Jr [Wed, 27 Sep 2017 19:52:32 +0000 (19:52 +0000)]
This source and build file are text

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809913 13f79535-47bb-0310-9956-ffa450edef68

7 years agoThis file contains text
William A. Rowe Jr [Wed, 27 Sep 2017 19:50:00 +0000 (19:50 +0000)]
This file contains text

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809911 13f79535-47bb-0310-9956-ffa450edef68

7 years agosvn:keywords = LastChangedRevision
André Malo [Wed, 27 Sep 2017 16:28:44 +0000 (16:28 +0000)]
svn:keywords = LastChangedRevision

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809882 13f79535-47bb-0310-9956-ffa450edef68

7 years agosvn:eol-style = native
André Malo [Wed, 27 Sep 2017 16:26:19 +0000 (16:26 +0000)]
svn:eol-style = native

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809880 13f79535-47bb-0310-9956-ffa450edef68

7 years agoupdate transformations
André Malo [Wed, 27 Sep 2017 15:57:47 +0000 (15:57 +0000)]
update transformations

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809870 13f79535-47bb-0310-9956-ffa450edef68

7 years agoFix proposal in STATUS
Luca Toscano [Wed, 27 Sep 2017 05:59:34 +0000 (05:59 +0000)]
Fix proposal in STATUS

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809808 13f79535-47bb-0310-9956-ffa450edef68

7 years agoPropose
Christophe Jaillet [Wed, 27 Sep 2017 05:56:08 +0000 (05:56 +0000)]
Propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809807 13f79535-47bb-0310-9956-ffa450edef68

7 years agoPropose
Christophe Jaillet [Wed, 27 Sep 2017 05:49:08 +0000 (05:49 +0000)]
Propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809806 13f79535-47bb-0310-9956-ffa450edef68

7 years agoAnd we are 2.4.29-dev
Jim Jagielski [Mon, 25 Sep 2017 12:05:46 +0000 (12:05 +0000)]
And we are 2.4.29-dev

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809610 13f79535-47bb-0310-9956-ffa450edef68

7 years agoGet ready to tag 2.4.28
Jim Jagielski [Mon, 25 Sep 2017 12:04:03 +0000 (12:04 +0000)]
Get ready to tag 2.4.28

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809608 13f79535-47bb-0310-9956-ffa450edef68

7 years agoDocs xforms
Jim Jagielski [Sun, 24 Sep 2017 13:16:16 +0000 (13:16 +0000)]
Docs xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809515 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRebuild.
Lucien Gentis [Sat, 23 Sep 2017 16:13:35 +0000 (16:13 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809440 13f79535-47bb-0310-9956-ffa450edef68

7 years agoXML update.
Lucien Gentis [Sat, 23 Sep 2017 16:12:53 +0000 (16:12 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809439 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge r1802875 from trunk:
Yann Ylavic [Fri, 22 Sep 2017 10:55:22 +0000 (10:55 +0000)]
Merge r1802875 from trunk:

event: Avoid possible blocking in the listener thread when shutting down
connections. PR 60956.

start_lingering_close_nonblocking() now puts connections in defer_linger_chain
which is emptied by any worker thread (all atomically) after its usual work,
hence any possibly blocking flush and lingering close run outside the listener.

The listener may create a dedicated worker if it fills defer_linger_chain or
while it's not empty, calling push2worker with a NULL cs.

The state machine in process_socket() is slighly modified to be able to enter
with CONN_STATE_LINGER directly w/o clogging_input_filters to interfer.

New abort_socket_nonblocking() allows to reset connections when nonblocking is
required and we can't do much about the connection anymore, nor we want the
system to linger on its own after close().

Many thanks to Stefan Priebe for his heavy testing on many event's changes!

Submitted by: ylavic
Reviewed by: ylavic, jim, icing

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809299 13f79535-47bb-0310-9956-ffa450edef68

7 years agovote and promote
Stefan Eissing [Fri, 22 Sep 2017 08:38:29 +0000 (08:38 +0000)]
vote and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809278 13f79535-47bb-0310-9956-ffa450edef68

7 years agoevent changes test OK on 2.4
Jim Jagielski [Thu, 21 Sep 2017 10:13:41 +0000 (10:13 +0000)]
event changes test OK on 2.4

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809142 13f79535-47bb-0310-9956-ffa450edef68

7 years agoPropose fix for PR 60956.
Yann Ylavic [Tue, 19 Sep 2017 16:57:53 +0000 (16:57 +0000)]
Propose fix for PR 60956.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808915 13f79535-47bb-0310-9956-ffa450edef68

7 years agonor corrections.--Cette ligne, et les suivantes ci-dessous, seront ignorées--
Lucien Gentis [Tue, 19 Sep 2017 16:48:11 +0000 (16:48 +0000)]
nor corrections.--Cette ligne, et les suivantes ci-dessous, seront ignorées--

M    manual/caching.xml.fr

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808912 13f79535-47bb-0310-9956-ffa450edef68

7 years agopropose T&R
Jim Jagielski [Tue, 19 Sep 2017 14:25:50 +0000 (14:25 +0000)]
propose T&R

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808889 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge r1808780 from trunk:
Jim Jagielski [Tue, 19 Sep 2017 10:18:43 +0000 (10:18 +0000)]
Merge r1808780 from trunk:

mod_speling/PR 38923: don't embed Referer in link in error page.

Submitted by: niq
Reviewed by: niq, ylavic, elukey

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808856 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge r1805188, r1805190, r1805206, r1808723 from trunk:
Jim Jagielski [Tue, 19 Sep 2017 10:17:40 +0000 (10:17 +0000)]
Merge r1805188, r1805190, r1805206, r1808723 from trunk:

loadfactor now decimal

Umm. This is C :)

Fix remaining lint from ms capability for hchecks.

format typo

Reviewed by: jim, humbedooh, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808855 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge r1729235, r1730079, r1801665 from trunk:
Jim Jagielski [Tue, 19 Sep 2017 10:15:00 +0000 (10:15 +0000)]
Merge r1729235, r1730079, r1801665 from trunk:

Exclude MPM modules from automatic LoadModule
enabling when configure was called with
-enable-load-all-modules. The default MPM
should still get enabled automatically.

Use different variables to track normal
modules and MPMs during build.

Normal modules and MPMs follow different
rules in the config, e.g. we are only
allowed to have one active LoadModule
for an MPM in the config.

As a side effect, LoadModule for MPMs
will now come before LoadModule for
the normal modules.

Makefile.in: fix MPM_MODULES typo
Submitted by: rjung, jchampion
Reviewed by: jchampion, icing, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808854 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge r1808008, r1808085 from trunk:
Jim Jagielski [Tue, 19 Sep 2017 10:14:01 +0000 (10:14 +0000)]
Merge r1808008, r1808085 from trunk:

htdigest: prevent buffer overflow when strings in lines are too long.

Reported by: Hanno Böck
PR: 61511

Update CHANGES after r1808008
Submitted by: elukey
Reviewed by: elukey, icing, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808853 13f79535-47bb-0310-9956-ffa450edef68

7 years agoVote + Promote
Luca Toscano [Tue, 19 Sep 2017 09:14:56 +0000 (09:14 +0000)]
Vote + Promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808847 13f79535-47bb-0310-9956-ffa450edef68

7 years agoCVE-2017-9798 disclosed, amend CHANGES entry for
Yann Ylavic [Mon, 18 Sep 2017 21:54:15 +0000 (21:54 +0000)]
CVE-2017-9798 disclosed, amend CHANGES entry for
https://svn.apache.org/r1807754

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808787 13f79535-47bb-0310-9956-ffa450edef68

7 years agoVote.
Yann Ylavic [Mon, 18 Sep 2017 21:43:49 +0000 (21:43 +0000)]
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808784 13f79535-47bb-0310-9956-ffa450edef68

7 years agopropose backport
Nick Kew [Mon, 18 Sep 2017 21:35:43 +0000 (21:35 +0000)]
propose backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808783 13f79535-47bb-0310-9956-ffa450edef68

7 years agoComment.
Yann Ylavic [Mon, 18 Sep 2017 17:15:45 +0000 (17:15 +0000)]
Comment.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808749 13f79535-47bb-0310-9956-ffa450edef68

7 years agoVote, promote.
Yann Ylavic [Mon, 18 Sep 2017 16:55:13 +0000 (16:55 +0000)]
Vote, promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808743 13f79535-47bb-0310-9956-ffa450edef68

7 years agoNot really a blocker, I just saw too much weirdness with floats ;)
Yann Ylavic [Mon, 18 Sep 2017 16:40:44 +0000 (16:40 +0000)]
Not really a blocker, I just saw too much weirdness with floats ;)
Looks fine here though.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808742 13f79535-47bb-0310-9956-ffa450edef68

7 years agoit's an older code, but it checks out...
Daniel Gruno [Mon, 18 Sep 2017 15:02:58 +0000 (15:02 +0000)]
it's an older code, but it checks out...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808728 13f79535-47bb-0310-9956-ffa450edef68

7 years agolbfactr patch v2
Jim Jagielski [Mon, 18 Sep 2017 14:20:59 +0000 (14:20 +0000)]
lbfactr patch v2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808724 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge r1801594 from trunk:
Jim Jagielski [Mon, 18 Sep 2017 13:05:46 +0000 (13:05 +0000)]
Merge r1801594 from trunk:

Add logic to read the Upgrade header and use it in the response.
Use we you are proxying to a server that has multiple upgrade on the same IP/Port.
PR 61142

Submitted by: jfclere
Reviewed by: jfclere, jim, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808698 13f79535-47bb-0310-9956-ffa450edef68

7 years agoprettify.js: update the js with the new Directives
Luca Toscano [Fri, 15 Sep 2017 12:23:53 +0000 (12:23 +0000)]
prettify.js: update the js with the new Directives

Replaced the old list with what currently found in
https://httpd.apache.org/docs/current/mod/directives.html

This should allow a better highlight of new directives
like the mod_http2's ones

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808454 13f79535-47bb-0310-9956-ffa450edef68

7 years agovote
Stefan Eissing [Tue, 12 Sep 2017 08:37:54 +0000 (08:37 +0000)]
vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808087 13f79535-47bb-0310-9956-ffa450edef68

7 years agoProposed backport of r1808008
Luca Toscano [Tue, 12 Sep 2017 08:18:06 +0000 (08:18 +0000)]
Proposed backport of r1808008

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808086 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRebuild.
Lucien Gentis [Sat, 9 Sep 2017 13:25:22 +0000 (13:25 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807902 13f79535-47bb-0310-9956-ffa450edef68

7 years agoXML updates.
Lucien Gentis [Sat, 9 Sep 2017 13:24:01 +0000 (13:24 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807898 13f79535-47bb-0310-9956-ffa450edef68

7 years agoNo CHANGES entry for a new feature?
Yann Ylavic [Fri, 8 Sep 2017 14:55:05 +0000 (14:55 +0000)]
No CHANGES entry for a new feature?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807775 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge r1745039 from trunk:
Yann Ylavic [Fri, 8 Sep 2017 14:53:47 +0000 (14:53 +0000)]
Merge r1745039 from trunk:

include the scheme in the error message about missing a
mod_proxy_submodule (mod_proxy_$usually_a_scheme)

Submitted by: covener
Reviewed by: jim, ylavic, icing

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807773 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge r1799435, r1799437, r1805206, r1805322 from trunk:
Yann Ylavic [Fri, 8 Sep 2017 14:51:44 +0000 (14:51 +0000)]
Merge r1799435, r1799437, r1805206, r1805322 from trunk:

Allow WatchdogInterval to be sub 1 second

Allow finer control over hcheck intervals... minimum is whatever
the watchdog slice is.

Fix remaining lint from ms capability for hchecks.

userland change = we now are OK w/ ms

Submitted by: jim
Reviewed by: jim, covener, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807772 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge r1803420, r1803454, r1804090 from trunk:
Yann Ylavic [Fri, 8 Sep 2017 14:36:31 +0000 (14:36 +0000)]
Merge r1803420, r1803454, r1804090 from trunk:

mod_http2: version bump, partial fix for stream response getting stuck, see https://github.com/icing/mod_h2/issues/143

mod_http2: signalling produce IO before waiting on beam buffer to drain.

mod_http2: non-dev version for backport

Submitted by: icing
Reviewed/backported by: icing, steffenal, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807771 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge r1793922, r1793923 from trunk:
Yann Ylavic [Fri, 8 Sep 2017 14:14:41 +0000 (14:14 +0000)]
Merge r1793922, r1793923 from trunk:

Add an Override Class Index

This page pulls in directives that declare an <override> element and
groups them by class. The documentation for each class comes from
overrides.xml. Any undocumented classes are flagged with a boilerplate
fallback text (this situation is only likely to occur with a misspelling
or otherwise invalid <override> somewhere else in the documentation).

override index: clarify this doc's purpose

Based on feedback by elukey.
Submitted by: jchampion
Reviewed by: jchampion, jim, icing

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807765 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge r1802845 from trunk:
Yann Ylavic [Fri, 8 Sep 2017 14:05:38 +0000 (14:05 +0000)]
Merge r1802845 from trunk:

Make sure updatelbstatus() is NULL

Submitted by: jim
Reviewed by: jim, covener, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807763 13f79535-47bb-0310-9956-ffa450edef68

7 years agoFollow up to r1807761: CHANGES entry.
Yann Ylavic [Fri, 8 Sep 2017 14:01:07 +0000 (14:01 +0000)]
Follow up to r1807761: CHANGES entry.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807762 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge r1780441, r1780470, r1795928 from trunk:
Yann Ylavic [Fri, 8 Sep 2017 13:56:59 +0000 (13:56 +0000)]
Merge r1780441, r1780470, r1795928 from trunk:

buildconf: allow configuration without APR sources

Previously we required copying the APR (and APR-util) source code into
srclib or some other location on disk in order to build httpd directly
from source. This is annoying if you're on a distribution that already
has the required files in its APR dev packages.

Practically speaking, if you're not building an official distribution
tarball, you only need the following files:

1) config.guess
2) config.sub
3) find_apr.m4
4) find_apu.m4
5) PrintPath

1 and 2 come from automake. 3 and 4 are included in some distributions'
(e.g. Debian's) development packages for APR/-util. That leaves
PrintPath, which has not changed meaningfully in over a decade and is
checked in completely here.

Passing an apr-config executable to buildconf's --with-apr option will
now enable a mode in which the above files (minus PrintPath) are copied
from their respective homes, removing the need for APR sources on disk.
Otherwise, if a source tree is passed, the current behavior is retained
and all of the above files are copied from APR directly.

buildconf: add --help for the new behavior

buildconf's behavior is a little complicated (and was made more so with
apr-config mode), so add some self-documentation.

buildconf: check in APR[-util] m4 macros

Suggestion by wrowe. These files haven't changed in years; since we need
them anyway, check them in directly. buildconf will still copy over the
latest versions during setup, and SVN will tell us if there are any
changes.

Submitted by: jchampion
Reviewed by: jchampion, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807761 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge r1807655 from trunk:
Yann Ylavic [Fri, 8 Sep 2017 13:13:11 +0000 (13:13 +0000)]
Merge r1807655 from trunk:

core: Disallow Methods' registration at run time (.htaccess), they may be
used only if registered at init time (httpd.conf).

Calling ap_method_register() in children processes is not the right scope
since it won't be shared for all requests.

Reviewed by: ylavic, covener, icing

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807754 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge r1766998 from trunk:
Yann Ylavic [Fri, 8 Sep 2017 13:10:16 +0000 (13:10 +0000)]
Merge r1766998 from trunk:

Follow up to r1739201.
These APR_TIMEUP special cases are now handled by ap_map_http_request_error().

Reviewed by: jailletc36, jim, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807753 13f79535-47bb-0310-9956-ffa450edef68

7 years agoBackported.
Yann Ylavic [Fri, 8 Sep 2017 13:08:14 +0000 (13:08 +0000)]
Backported.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807752 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge r1803392, r1803396, r1803398 from trunk:
Yann Ylavic [Fri, 8 Sep 2017 12:20:16 +0000 (12:20 +0000)]
Merge r1803392, r1803396, r1803398 from trunk:

mod_ssl: we can't use SSL_COMP_free_compression_methods() if OPENSSL_NO_COMP
is defined.  PR 61206.

Submitted by: Michael Schlenker <msc contact.de>

mod_ssl, ab: compatibility with LibreSSL.  PR 61184.

LibreSSL defines OPENSSL_VERSION_NUMBER = 2.0, but is not compatible with
all of the latest OpenSSL 1.1 API.

Address this by defining MODSSL_USE_OPENSSL_PRE_1_1_API which is true for
anything but OpenSSL >= 1.1 (for now).

Proposed by: Bernard Spil <brnrd freebsd.org>
Reviewed by: ylavic

Follow up to r1803396: CHANGES entry.

Reviewed by: ylavic, jim, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807734 13f79535-47bb-0310-9956-ffa450edef68

7 years agovote and promote
Stefan Eissing [Fri, 8 Sep 2017 12:14:48 +0000 (12:14 +0000)]
vote and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807732 13f79535-47bb-0310-9956-ffa450edef68

7 years agoreverting prev commit with unwanted rev numbers on top dir
Stefan Eissing [Fri, 8 Sep 2017 12:12:43 +0000 (12:12 +0000)]
reverting prev commit with unwanted rev numbers on top dir

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807731 13f79535-47bb-0310-9956-ffa450edef68

7 years agovote and promote
Stefan Eissing [Fri, 8 Sep 2017 12:11:13 +0000 (12:11 +0000)]
vote and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807730 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge r1784318 from trunk:
Yann Ylavic [Fri, 8 Sep 2017 10:17:21 +0000 (10:17 +0000)]
Merge r1784318 from trunk:

 Support use of optional "tag" in syslog entries. Streamline the patch.
 PR 60525.

Submitted by: jim
Reviewed by: rpluem, jim, mrumph

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807707 13f79535-47bb-0310-9956-ffa450edef68

7 years agoPromote.
Yann Ylavic [Fri, 8 Sep 2017 10:10:53 +0000 (10:10 +0000)]
Promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807706 13f79535-47bb-0310-9956-ffa450edef68

7 years agoComment, vote and promote.
Yann Ylavic [Fri, 8 Sep 2017 10:08:36 +0000 (10:08 +0000)]
Comment, vote and promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807705 13f79535-47bb-0310-9956-ffa450edef68

7 years agopromote
Eric Covener [Thu, 7 Sep 2017 23:48:18 +0000 (23:48 +0000)]
promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807662 13f79535-47bb-0310-9956-ffa450edef68

7 years agolots of votes
Eric Covener [Thu, 7 Sep 2017 23:47:17 +0000 (23:47 +0000)]
lots of votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807661 13f79535-47bb-0310-9956-ffa450edef68

7 years agoEPASTE
Eric Covener [Thu, 7 Sep 2017 23:40:37 +0000 (23:40 +0000)]
EPASTE

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807660 13f79535-47bb-0310-9956-ffa450edef68

7 years agoPropose.
Yann Ylavic [Thu, 7 Sep 2017 22:46:58 +0000 (22:46 +0000)]
Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807656 13f79535-47bb-0310-9956-ffa450edef68

7 years agoupdate feather to conform with styleguide.
Daniel Gruno [Thu, 7 Sep 2017 11:09:06 +0000 (11:09 +0000)]
update feather to conform with styleguide.
https://apache.org/foundation/press/kit/ApacheFoundation_StyleGuide.pdf

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807588 13f79535-47bb-0310-9956-ffa450edef68

7 years agoAdd suggestions to PROXY protocol proposal
Mike Rumph [Fri, 1 Sep 2017 16:01:52 +0000 (16:01 +0000)]
Add suggestions to PROXY protocol proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1806991 13f79535-47bb-0310-9956-ffa450edef68

7 years agoGenerated doc changes
Mike Rumph [Thu, 31 Aug 2017 17:29:29 +0000 (17:29 +0000)]
Generated doc changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1806830 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRebuild.
Lucien Gentis [Mon, 28 Aug 2017 11:03:53 +0000 (11:03 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1806427 13f79535-47bb-0310-9956-ffa450edef68

7 years agoXML update.
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

7 years agoVote and promote
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

7 years agoVote and suggest
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

7 years agoAnd these backports look, and test, good. +1
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

7 years agoRebuil.
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

7 years agoXML update.
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

7 years agoPropose
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

7 years agolgtm
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

7 years agosyslog vote
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

7 years agoformat change
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

7 years agoMerged.
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

7 years agoMerge 1805099 from trunk:
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

7 years ago* Vote
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

7 years agoTested and voted on proposals... Will try to do LibreSSL this
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

7 years ago2 backport proposals
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

7 years agocreate +1 vote line
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

7 years agoMerge r1713043, r1802305, r1802309 from trunk:
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

7 years agoMerge r1618555 from trunk:
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

7 years agoMerge r1789220, r1792675 from trunk:
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

7 years agopromote those w/ 3 +1s
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

7 years agoVotes
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

7 years ago* Vote
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

7 years agoVotes*N, propose*1.
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

7 years agogit-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1804229 13f79...
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

7 years agovote
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