]> granicus.if.org Git - apache/log
apache
6 years agoOn the 2.4.x branch:
Stefan Eissing [Sat, 2 Dec 2017 17:51:37 +0000 (17:51 +0000)]
On the 2.4.x branch:

Fixed backport of r1816619 (mod_http2) to have the desired changes and added the version inc as well.

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

6 years agoRebuild
Lucien Gentis [Sat, 2 Dec 2017 14:58:30 +0000 (14:58 +0000)]
Rebuild

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

6 years agoXML update.
Lucien Gentis [Sat, 2 Dec 2017 14:56:48 +0000 (14:56 +0000)]
XML update.

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

6 years agoPropose UWSGI proxy (sub)module backport
Jim Jagielski [Wed, 29 Nov 2017 15:06:31 +0000 (15:06 +0000)]
Propose UWSGI proxy (sub)module backport

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

6 years agoUpdate votes
Jim Jagielski [Wed, 29 Nov 2017 15:01:27 +0000 (15:01 +0000)]
Update votes

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

6 years agoThe updated PROXY protocol support patchset
Jim Jagielski [Wed, 29 Nov 2017 14:59:56 +0000 (14:59 +0000)]
The updated PROXY protocol support patchset

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

6 years agovote mod_http2 v1.10.14 and removed vote mod_md
Steffen Land [Wed, 29 Nov 2017 12:01:25 +0000 (12:01 +0000)]
vote mod_http2 v1.10.14 and removed vote mod_md

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

6 years agopropose
Stefan Eissing [Wed, 29 Nov 2017 09:52:45 +0000 (09:52 +0000)]
propose

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

6 years agoVote mod_md
Steffen Land [Mon, 27 Nov 2017 12:38:10 +0000 (12:38 +0000)]
Vote mod_md

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

6 years agoOn the 2.4.x branch:
Stefan Eissing [Mon, 27 Nov 2017 11:12:28 +0000 (11:12 +0000)]
On the 2.4.x branch:

Updated STATUS proposal for mod_md backporting. New branch for changes available.

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

6 years agodocs: allow Directive and <Directive> names to co-exist in the same page.
Luca Toscano [Sun, 26 Nov 2017 10:21:16 +0000 (10:21 +0000)]
docs: allow Directive and <Directive> names to co-exist in the same page.

This work was done in trunk to allow the new mod_md's directive
names <ManagedDomain> and ManagedDomain in the same doc page (without
triggering any validate-xml/xhtml error). Subsequently this also helped
for SSLPolicy and <SSLPolicy>. All the aforementioned Directives
have not been backported yet, but these commits are needed behorehand to
allow a smoother backport procedure.

I explicitly reverted the changes to sections.xml for this backport since
they mention the above directives, not yet available in 2.4.x and hence
probably confusing for users.

Building the documentation after these changes yield to a no-op as expected.
I also tried to copy mod_md's documentation from trunk and it renders nicely.

Merge r1805189, r1805193, r1805372, r1805376, r1805189, r1806443 from trunk:

synopsis.xsl: do not render two times the same
              directive HTML if more than one
              directive share the same name.

This has happened when mod_md.xml was introduced,
and the following directives shared the same name:
* ManagedDomain
* <ManagedDomain>

With the current code each time that a node needs
to be rendered it will emit a duplicate, ending up
in the above example with 4 sections rather than two.

Uniqueness of sections will be ensured by the HTML
elements ids, to avoid errors before committing for
example (accidental duplicates, etc..).

common|synopsis.xsl: rename directive type=sections id generation

This commits is a follow up of r1805189 and it is meant
to allow directives with the same name but different type
to coexist in the same document without triggering errors
while executing validate-xhtml.

For example: mod_md.xml recently introduced the following:

* ManagedDomain
* <ManagedDomain> (this one is type=section)

In my opinion this is a perfectly valid use case and it should
be allowed/handled correctly by the doc generation process/validation.

In order to avoid clashing the directive ids will get a suffix
called "section" if type=section will be present as param.

Quicklinks, <directive> links have been updated to the new
scheme to avoid dandling pointers in the doc.

Comments/reviews are welcome, if I left something behind
please let me know.

doc xsl/dtd: introduce idtype attribute for directivesynopsis

In r1805193 synopsis.xsl was changed to allow two directives
of different type (like <SSLPolicy> and SSLPolicy) to share
the same name but have different ids (and please validate-xml/xhtml).
The downside of this action was that all the quicklinks to
existing directive sections (like <If>, <VirtualHost>, etc..)
were changed, possibly breaking external clients already
referencing them.

This change introduces a new attribute in the directivesynopsis
DTD, namely 'idtype', that will be appended to 'name'
in the id generation by synopsis.xsl. This will rollback
link names to their previous values and will allow documentators
to fine tune directivesynopsis sections as they need
(for example we have recently introduced mod_md's
ManagedDomain/<ManagedDomain>, and modssl's SSLPolicy/<SSLPolicy>).

This approach seems more precise and less invasive to me.
Of course the name of the attribute can be changed later on
to whatever term would fit best, the main concern for me at
the moment is to restore the trunk documentation to its previous
state.

common.dtd: add idtype attribute to directive

This change completes r1805372 and also fixes
links generation for <ManageDomain> and <SSLPolicy>
in sections.xml

synopsis.xsl: do not render two times the same
              directive HTML if more than one
              directive share the same name.

This has happened when mod_md.xml was introduced,
and the following directives shared the same name:
* ManagedDomain
* <ManagedDomain>

With the current code each time that a node needs
to be rendered it will emit a duplicate, ending up
in the above example with 4 sections rather than two.

Uniqueness of sections will be ensured by the HTML
elements ids, to avoid errors before committing for
example (accidental duplicates, etc..).

synopsis.xsl: fix broken translation builds

This commit is a follow up of r1805189, in which
a new logic was added to allow to repeat a directive
name only if its type is different (like SSLPolicy
and <SSLPolicy>). The change broken french translations
since the $this variable, containing the translated
sections, was not used anymore.

The XPath code could surely be improved, but it seems
more pressing to allow our translators to get back
to their daily work without interference.

build.sh validate-* worked fine, as well as the build.sh fr
translation.

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

6 years agoDocumentation rebuild - part 2
Luca Toscano [Sun, 26 Nov 2017 09:50:43 +0000 (09:50 +0000)]
Documentation rebuild - part 2

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

6 years agoDocumentation rebuild
Luca Toscano [Sun, 26 Nov 2017 00:15:03 +0000 (00:15 +0000)]
Documentation rebuild

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

6 years agoSync with trunk the override suggestions for directives in:
Luca Toscano [Sun, 26 Nov 2017 00:14:09 +0000 (00:14 +0000)]
Sync with trunk the override suggestions for directives in:

mod_authn_socache.xml
mod_logio.xml
mod_ssl.xml

This caused two issues:

1) ./build.sh validate-xhtml failing due to xml validation
   failures for the string "Not applicable".
2) weird categories ('none', 'Not applicable', 'None') in
   overrides.html that don't make much sense.

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

6 years agoRebuild.
Lucien Gentis [Sat, 25 Nov 2017 15:05:13 +0000 (15:05 +0000)]
Rebuild.

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

6 years agoXML update.
Lucien Gentis [Sat, 25 Nov 2017 15:04:00 +0000 (15:04 +0000)]
XML update.

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

6 years agorebuild
Christophe Jaillet [Sat, 25 Nov 2017 11:56:28 +0000 (11:56 +0000)]
rebuild

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

6 years agos/simmilar/similar/ reported in PR 61799
Christophe Jaillet [Sat, 25 Nov 2017 11:43:18 +0000 (11:43 +0000)]
s/simmilar/similar/ reported in PR 61799

Fix layout of <highlight> to synch with trunk

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

6 years agoVote mod_md and aligned entry
Steffen Land [Fri, 24 Nov 2017 10:57:00 +0000 (10:57 +0000)]
Vote mod_md and aligned entry

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

6 years ago+1 on mod_ssl part & out of time.
Joe Orton [Thu, 23 Nov 2017 16:01:59 +0000 (16:01 +0000)]
+1 on mod_ssl part & out of time.

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

6 years agoOn the 2.4.x branch:
Stefan Eissing [Thu, 23 Nov 2017 15:23:53 +0000 (15:23 +0000)]
On the 2.4.x branch:

proposals for backporting mod_md and related, necessary mod_ssl changes.

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

6 years agoRebuild.
Lucien Gentis [Sat, 18 Nov 2017 15:14:56 +0000 (15:14 +0000)]
Rebuild.

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

6 years agoXML update.
Lucien Gentis [Sat, 18 Nov 2017 15:14:13 +0000 (15:14 +0000)]
XML update.

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

6 years agoMerge r1815480 from trunk:
Eric Covener [Thu, 16 Nov 2017 16:46:10 +0000 (16:46 +0000)]
Merge r1815480 from trunk:

address comment about substitution syntax

http://httpd.apache.org/docs/trunk/mod/mod_substitute.html#comment_7147

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

6 years agoMerge r1813643 from trunk:
Jim Jagielski [Mon, 13 Nov 2017 13:33:14 +0000 (13:33 +0000)]
Merge r1813643 from trunk:

mod_macro: fix usability of globally defined macros in .htaccess files.
PR 57525.

Reverts pre_config hook from r1656669 (happens too late for EXEC_ON_READ), and
ensures ap_macros is reset on restart with a pconf cleanup.

Proposed by: Jose Kahan <jose w3.org>
Reviewed by: ylavic

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

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

6 years agoMerge r1811744 from trunk:
Jim Jagielski [Mon, 13 Nov 2017 13:31:33 +0000 (13:31 +0000)]
Merge r1811744 from trunk:

core, mod_rewrite: introduce the 'redirect-keeps-vary' note
                   to allow proper Vary header insertion when
                   dealing with a RewriteRule in a directory
                   context.

This change is an attempt to fix a long standing problem,
brought up while working on PR 58231. Our documentation clearly
states the following:

"If a HTTP header is used in a condition this header is added
to the Vary header of the response in case the condition
evaluates to true for the request."

This is currently not true for RewriteCond/Rules working in
a directory context, since when an internal redirect happens
all the outstanding response headers get dropped.

There might be a better solution so I am looking forward to
hear more opinions and comments. My goal for a delicate change
like this one would be to affect the least amount of configurations
possible, without triggering unwanted side effects.

If the solution is good for everybody tests will be written
in the suite asap.

Submitted by: elukey
Reviewed by: elukey, icing, ylavic

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

6 years agopromote
Jim Jagielski [Mon, 13 Nov 2017 13:30:53 +0000 (13:30 +0000)]
promote

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

6 years agotested and voted
Jim Jagielski [Mon, 13 Nov 2017 13:30:33 +0000 (13:30 +0000)]
tested and voted

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

6 years agoPropose r1814968 for backport
Luca Toscano [Mon, 13 Nov 2017 10:20:39 +0000 (10:20 +0000)]
Propose r1814968 for backport

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

6 years agoPropose.
Yann Ylavic [Thu, 9 Nov 2017 12:27:28 +0000 (12:27 +0000)]
Propose.

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

6 years agoOn the 2.4.x branch:
Stefan Eissing [Tue, 7 Nov 2017 09:01:59 +0000 (09:01 +0000)]
On the 2.4.x branch:

Merged /httpd/httpd/trunk:r1811649,1811664,1814118

  *) ab: Make the TLS layer aware that the underlying socket is nonblocking,
     and use/handle POLLOUT where needed to avoid busy IOs and recover write
     errors when appropriate.  [Yann Ylavic]

  *) ab: Keep reading nonblocking to exhaust TCP or SSL buffers when previous
     read was incomplete (the SSL case can cause the next poll() to timeout
     since data are buffered already).  PR 61301 [Luca Toscano, Yann Ylavic]

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

6 years agovote and promote
Stefan Eissing [Tue, 7 Nov 2017 08:58:03 +0000 (08:58 +0000)]
vote and promote

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

6 years agoNote release date
Jim Jagielski [Mon, 6 Nov 2017 20:05:44 +0000 (20:05 +0000)]
Note release date

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

6 years agolooks good
Jim Jagielski [Mon, 6 Nov 2017 20:00:57 +0000 (20:00 +0000)]
looks good

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

6 years agoOn the 2.4.x branch:
Stefan Eissing [Mon, 6 Nov 2017 15:20:24 +0000 (15:20 +0000)]
On the 2.4.x branch:

Merge of r1813767 from trunk.

mod_http2: avoid unnecessary data retrieval for a trace log. Allow certain
     information retrievals on null bucket beams where it makes sense.

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

6 years agopromote
Stefan Eissing [Mon, 6 Nov 2017 15:08:27 +0000 (15:08 +0000)]
promote

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

6 years agoVote mod-http2 1.10.13
Steffen Land [Mon, 6 Nov 2017 12:35:09 +0000 (12:35 +0000)]
Vote mod-http2 1.10.13

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

6 years agobackport patch update
Stefan Eissing [Mon, 6 Nov 2017 12:15:17 +0000 (12:15 +0000)]
backport patch update

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

6 years agoRebuild.
Lucien Gentis [Sat, 4 Nov 2017 16:11:20 +0000 (16:11 +0000)]
Rebuild.

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

6 years agoXML update.
Lucien Gentis [Sat, 4 Nov 2017 16:10:17 +0000 (16:10 +0000)]
XML update.

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

6 years agoObjections all cleared up by v6
William A. Rowe Jr [Fri, 3 Nov 2017 15:53:10 +0000 (15:53 +0000)]
Objections all cleared up by v6

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

6 years agoAdd missing CHANGES entry in 2.4.24
Christophe Jaillet [Fri, 3 Nov 2017 06:40:05 +0000 (06:40 +0000)]
Add missing CHANGES entry in 2.4.24

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

6 years agoPropose.
Yann Ylavic [Thu, 2 Nov 2017 22:26:54 +0000 (22:26 +0000)]
Propose.

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

6 years ago3 votes, 2 promotions.
Yann Ylavic [Thu, 2 Nov 2017 21:57:46 +0000 (21:57 +0000)]
3 votes, 2 promotions.

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

6 years agovote
Stefan Eissing [Thu, 2 Nov 2017 10:39:10 +0000 (10:39 +0000)]
vote

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

6 years agovote
Stefan Eissing [Thu, 2 Nov 2017 10:35:18 +0000 (10:35 +0000)]
vote

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

6 years agovote
Stefan Eissing [Thu, 2 Nov 2017 10:33:09 +0000 (10:33 +0000)]
vote

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

7 years agoImprove mod_proxy_html doc
Christophe Jaillet [Wed, 1 Nov 2017 22:25:05 +0000 (22:25 +0000)]
Improve mod_proxy_html doc
   - add some links and color highligh
   - remove some <var> (i.e. italic) around parameters that should be written unmodified (On|Off...)

r1813997 in trunk + some small modifications to synch with trunk

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

7 years agoUpdate to SSLProxy proposal, minor enough IMHO.
Yann Ylavic [Wed, 1 Nov 2017 20:27:12 +0000 (20:27 +0000)]
Update to SSLProxy proposal, minor enough IMHO.

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

7 years agoAdd a PR number that was lost when merged in 2.4.x
Christophe Jaillet [Wed, 1 Nov 2017 17:40:12 +0000 (17:40 +0000)]
Add a PR number that was lost when merged in 2.4.x

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

7 years agovote
Stefan Eissing [Tue, 31 Oct 2017 14:34:42 +0000 (14:34 +0000)]
vote

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

7 years agomod_http2 v1.10.13 backport porposal
Stefan Eissing [Mon, 30 Oct 2017 14:39:09 +0000 (14:39 +0000)]
mod_http2 v1.10.13 backport porposal

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

7 years agoPropose + vote
Luca Toscano [Mon, 30 Oct 2017 12:34:59 +0000 (12:34 +0000)]
Propose + vote

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

7 years agoPropose.
Yann Ylavic [Sat, 28 Oct 2017 16:11:23 +0000 (16:11 +0000)]
Propose.

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

7 years agoUpdate comment according to patch version (v5).
Yann Ylavic [Mon, 23 Oct 2017 15:17:02 +0000 (15:17 +0000)]
Update comment according to patch version (v5).

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

7 years agoUpdate to v5, v4 missed this backport change needed for 2.4.x only (see commit messag...
Yann Ylavic [Mon, 23 Oct 2017 14:58:44 +0000 (14:58 +0000)]
Update to v5, v4 missed this backport change needed for 2.4.x only (see commit message of r1812193)

+-   if ((forbidden & NOT_IN_DIR_CONTEXT) == NOT_IN_DIR_CONTEXT) {
++   if ((forbidden & NOT_IN_DIR_LOC_FILE) == NOT_IN_DIR_LOC_FILE) {
+        if (cmd->path != NULL) {
+            return apr_pstrcat(cmd->pool, cmd->cmd->name, gt,
+-                           " cannot occur within directory context", NULL);
++                           " cannot occur within <Directory/Location/Files/Proxy> "
++                           "section", NULL);
+        }
+        ...
+    }

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

7 years agoUpdate proposal, reset Mike vote.
Yann Ylavic [Mon, 23 Oct 2017 14:20:56 +0000 (14:20 +0000)]
Update proposal, reset Mike vote.

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

7 years agoRebuild.
Lucien Gentis [Sat, 21 Oct 2017 14:04:00 +0000 (14:04 +0000)]
Rebuild.

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

7 years agoXML update.
Lucien Gentis [Sat, 21 Oct 2017 14:01:02 +0000 (14:01 +0000)]
XML update.

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

7 years agoPropose
Luca Toscano [Fri, 20 Oct 2017 12:24:01 +0000 (12:24 +0000)]
Propose

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

7 years agoAnd we are now 2.4.30-dev
Jim Jagielski [Tue, 17 Oct 2017 18:54:30 +0000 (18:54 +0000)]
And we are now 2.4.30-dev

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

7 years agoGet ready to tag httpd 2.4.29
Jim Jagielski [Tue, 17 Oct 2017 18:53:00 +0000 (18:53 +0000)]
Get ready to tag httpd 2.4.29

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

7 years agoMerge r1812263, r1812301 from trunk:
Jim Jagielski [Tue, 17 Oct 2017 18:48:24 +0000 (18:48 +0000)]
Merge r1812263, r1812301 from trunk:

Fix maintainer mode with GCC/Clang.

Setting -Wstrict-prototypes in combination
with -Werror leads to compiler errors during
configure checks (autoconf generates incomplete
prototypes).

Adding -Wno-error=strict-prototypes lets the
compiler tolerate those.

Possible future enhancement: remember such
"configure time only" flags and remove them
from CFLAGS before generating our build time
files (Makefile, config_vars.mk etc.), so that
the full -Werror is in place during building.

Follow up to r1812263.

As suggested by Joe, add --maintainer/debugger-mode's CFLAGS in
NOTEST_CFLAGS to avoid interractions with autoconf's AC_LANG_PROGRAM.

APACHE_ADD_GCC_CFLAG now also forces -Wno-strict-prototypes for -Werror
to work despite AC_LANG_PROGRAM generating this warning by itself.

Submitted by: rjung, ylavic
Reviewed by: ylavic, rjung, jim

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

7 years agopromote
Jim Jagielski [Tue, 17 Oct 2017 18:47:22 +0000 (18:47 +0000)]
promote

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

7 years agovote
Jim Jagielski [Tue, 17 Oct 2017 18:47:07 +0000 (18:47 +0000)]
vote

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

7 years agoUpdate doccos
Jim Jagielski [Tue, 17 Oct 2017 18:39:14 +0000 (18:39 +0000)]
Update doccos

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

7 years agoRephrase comments by Yann in order to hopefully
Rainer Jung [Tue, 17 Oct 2017 18:38:29 +0000 (18:38 +0000)]
Rephrase comments by Yann in order to hopefully
make the current situation clearer.

I hope the new text is OK for Yann, otherwise I
could revert and add as my own comment.

i think r1812339 should be an integral part of
the mod_journald backport and currently we do not
have any obstacle for the configure.in proposal.
The ap_expr fix was already backported, the
mod_remoteip fix does not apply to the 2.4 code
and the mod_journald fix IMHO should be voted and
applied together with the pending mod_journald
backport.

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

7 years agoMerge r1799341 from trunk:
Jim Jagielski [Tue, 17 Oct 2017 11:47:14 +0000 (11:47 +0000)]
Merge r1799341 from trunk:

* The libnghttp2.pc might be found in lib64 on 64 bit systems
Submitted by: rpluem
Reviewed by: rpluem, icing, ylavic

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

7 years agoVote, promote.
Yann Ylavic [Tue, 17 Oct 2017 09:49:31 +0000 (09:49 +0000)]
Vote, promote.

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

7 years agovote
Stefan Eissing [Tue, 17 Oct 2017 09:41:59 +0000 (09:41 +0000)]
vote

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

7 years ago* Add proposal
Ruediger Pluem [Tue, 17 Oct 2017 09:21:22 +0000 (09:21 +0000)]
* Add proposal

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

7 years agoMerged.
Joe Orton [Tue, 17 Oct 2017 08:06:55 +0000 (08:06 +0000)]
Merged.

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

7 years agoMerge r1812307 from trunk:
Joe Orton [Tue, 17 Oct 2017 08:06:13 +0000 (08:06 +0000)]
Merge r1812307 from trunk:

* server/util_expr_eval.c (ap_expr_eval_re_backref): Fix gcc 7.x warning.

util_expr_eval.c: In function ‘ap_expr_eval_re_backref’:
util_expr_eval.c:265:63: error: comparison between pointer and zero character constant [-Werror=pointer-compare]
     if (!ctx->re_pmatch || !ctx->re_source || *ctx->re_source == '\0' ||

Reviewed by: rjung, ylavic, jorton

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

7 years agoTypo.
Yann Ylavic [Tue, 17 Oct 2017 07:35:06 +0000 (07:35 +0000)]
Typo.

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

7 years agoClarify configure.in proposal dependencies.
Yann Ylavic [Tue, 17 Oct 2017 07:31:54 +0000 (07:31 +0000)]
Clarify configure.in proposal dependencies.

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

7 years agoVote, comment.
Yann Ylavic [Tue, 17 Oct 2017 00:31:22 +0000 (00:31 +0000)]
Vote, comment.

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

7 years agoVote, propose, remove comment.
Rainer Jung [Mon, 16 Oct 2017 22:30:12 +0000 (22:30 +0000)]
Vote, propose, remove comment.

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

7 years agoPropose finalized alternative.
Yann Ylavic [Mon, 16 Oct 2017 16:19:46 +0000 (16:19 +0000)]
Propose finalized alternative.

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

7 years agoRevert suggestion wait for discussion about
Rainer Jung [Mon, 16 Oct 2017 13:27:05 +0000 (13:27 +0000)]
Revert suggestion wait for discussion about
using NOTEST_CFLAGS.

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

7 years agoMerged*1.
Joe Orton [Mon, 16 Oct 2017 09:54:34 +0000 (09:54 +0000)]
Merged*1.

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

7 years agoMerge r1501827 from trunk:
Joe Orton [Mon, 16 Oct 2017 09:54:13 +0000 (09:54 +0000)]
Merge r1501827 from trunk:

* modules/metadata/mod_unique_id.c: Replace use of hostname + pid with
  PRNG output.

Submitted by: jkaluza
Reviewed by: jorton, wrowe, jim

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

7 years agoSuggest another solution.
Rainer Jung [Mon, 16 Oct 2017 09:29:36 +0000 (09:29 +0000)]
Suggest another solution.

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

7 years agoRevert.
Rainer Jung [Sun, 15 Oct 2017 14:05:39 +0000 (14:05 +0000)]
Revert.

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

7 years agoPromote.
Rainer Jung [Sun, 15 Oct 2017 11:32:43 +0000 (11:32 +0000)]
Promote.

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

7 years agoVote, comment.
Rainer Jung [Sun, 15 Oct 2017 11:31:58 +0000 (11:31 +0000)]
Vote, comment.

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

7 years agoand promote w/ 3 +1s
Jim Jagielski [Fri, 13 Oct 2017 13:53:53 +0000 (13:53 +0000)]
and promote w/ 3 +1s

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

7 years ago2 votes on backport proposals2 votes on backport proposals
Jim Jagielski [Fri, 13 Oct 2017 13:53:11 +0000 (13:53 +0000)]
2 votes on backport proposals2 votes on backport proposals

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

7 years agoRevoke SHOWSTOPPER status. EAGAIN, retry, continue...
William A. Rowe Jr [Fri, 13 Oct 2017 12:00:42 +0000 (12:00 +0000)]
Revoke SHOWSTOPPER status. EAGAIN, retry, continue...

Same committer shipped a release with one well known broken platform within
days of proposing a showstopper for a platform. This specific platform is not
even universally broken, but only for maintainer mode builds, and same has
upvoted a backport which can't compile in maintainer mode. Confused yet?

It might also be why this well-reasoned patch gathered little review, since
it was parked in a more obscure place?

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

7 years agoMerge r1808746, r1809028 from trunk:
Yann Ylavic [Fri, 13 Oct 2017 08:42:57 +0000 (08:42 +0000)]
Merge r1808746, r1809028 from trunk:

mod_rewrite/core: avoid the 'Vary: Host' header

In PR 58231 is was brought up that httpd adds the
Vary: Host header whenever a condition is set to true
in mod_rewrite or in an <If> block.

The https://tools.ietf.org/html/rfc7231#section-7.1.4
section seems to disallow this use case:

"The "Vary" header field in a response describes "
"what parts of a request message, "
"aside from the method, Host header field, [...]"

I had a chat with the folks in #traffic-server and
they don't see much point in having a Vary: Host header,
plus it was reported that Varnish doesn't like it very
much (namely it does not cache the response when
it sees the header, links of the report in the PR).

I don't see much value in this behavior of httpd so
I am inclined to remove this response header value,
but I'd be glad to get a more experienced opinion.

mod_rewrite,core: avoid Vary:Host (part 2)

This is a follow up of r1808746 after a chat
with Yann on dev@:

- the HTTP:Host variable suffers from the same problem
- the strcasecmp should be used to allow case-sensitive
  comparisons.
- in mod_rewrite is less cumbersome and more clean to just
  make the Host header check in lookup_header, so it will
  be automatically picked up by every part of the code
  that uses it. It shouldn't be a relevant overhead for
  mod_rewrite.

Submitted by: elukey
Reviewed by: elukey, ylavic, wrowe

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

7 years agoMerge r1804096, r1807238, r1809981, r1810088, r1810089 from trunk:
Yann Ylavic [Fri, 13 Oct 2017 08:37:45 +0000 (08:37 +0000)]
Merge r1804096, r1807238, r1809981, r1810088, r1810089 from trunk:

bumping version, removing some unused code, fixes in base64url from mod_md

On the trunk:

  *) mod_http2: DoS flow control protection is less agressive as long as active tasks stay
     below worker capacity. Intended to fix problems with media streaming.

On the trunk:
mod_http2: v0.10.12, removed optimization for mutex handling in bucket beams that could lead to assertion failure in edge cases.

reverting r1807238 bc not addressing the issue https://github.com/icing/mod_h2/issues/120

mod_http2: non-dev 1.10.12 for backport

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

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

7 years agoShift left by one.
Yann Ylavic [Fri, 13 Oct 2017 08:22:48 +0000 (08:22 +0000)]
Shift left by one.

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

7 years agoShow trunk commits.
Yann Ylavic [Fri, 13 Oct 2017 08:21:12 +0000 (08:21 +0000)]
Show trunk commits.

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

7 years agoPropose.
Yann Ylavic [Fri, 13 Oct 2017 08:03:21 +0000 (08:03 +0000)]
Propose.

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

7 years agoMerge r1805195, r1812004 from trunk:
Yann Ylavic [Fri, 13 Oct 2017 07:30:15 +0000 (07:30 +0000)]
Merge r1805195, r1812004 from trunk:

Update offsets

Entry for 2.4.28 regression (r1808855 missing r1805195).

Submitted by: jim, ylavic
Reviewed/backported by: ylavic (CTR per miss in the original merge)

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

7 years agoVote.
Yann Ylavic [Thu, 12 Oct 2017 20:17:10 +0000 (20:17 +0000)]
Vote.

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

7 years agoFriendly link.
Yann Ylavic [Thu, 12 Oct 2017 20:01:28 +0000 (20:01 +0000)]
Friendly link.

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

7 years agoUpdate proposal.
Yann Ylavic [Thu, 12 Oct 2017 19:46:52 +0000 (19:46 +0000)]
Update proposal.

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

7 years agoPropose.
Yann Ylavic [Thu, 12 Oct 2017 19:37:44 +0000 (19:37 +0000)]
Propose.

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

7 years agoFixed patch location in backport proposal.
Stefan Eissing [Thu, 12 Oct 2017 14:36:11 +0000 (14:36 +0000)]
Fixed patch location in backport proposal.

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

7 years agopatches now reside in ^/httpd/httpd/patches/2.4.x
Stefan Eissing [Thu, 12 Oct 2017 14:35:18 +0000 (14:35 +0000)]
patches now reside in ^/httpd/httpd/patches/2.4.x

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