]> granicus.if.org Git - apache/log
apache
7 years agomod_ssl: don't depend on the next output filters to cleanup the passed out
Yann Ylavic [Fri, 3 Feb 2017 17:32:32 +0000 (17:32 +0000)]
mod_ssl: don't depend on the next output filters to cleanup the passed out
brigades.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781582 13f79535-47bb-0310-9956-ffa450edef68

7 years agoDocumentation rebuild
Luca Toscano [Fri, 3 Feb 2017 17:29:37 +0000 (17:29 +0000)]
Documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781581 13f79535-47bb-0310-9956-ffa450edef68

7 years agoAdd missing documentation for r1781575
Jean-Frederic Clere [Fri, 3 Feb 2017 17:15:05 +0000 (17:15 +0000)]
Add missing documentation for r1781575
Fix for PR 46037

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781580 13f79535-47bb-0310-9956-ffa450edef68

7 years agoAdd back the file I removed in r1781575.
Jean-Frederic Clere [Fri, 3 Feb 2017 16:52:34 +0000 (16:52 +0000)]
Add back the file I removed in r1781575.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781577 13f79535-47bb-0310-9956-ffa450edef68

7 years agoAdd Configuration for trusted OCSP responder certificates
Jean-Frederic Clere [Fri, 3 Feb 2017 16:19:17 +0000 (16:19 +0000)]
Add Configuration for trusted OCSP responder certificates
Fix for PR 46037

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781575 13f79535-47bb-0310-9956-ffa450edef68

7 years agohtpasswd: report the right limit when get_password() overflows.
Yann Ylavic [Fri, 3 Feb 2017 09:11:03 +0000 (09:11 +0000)]
htpasswd: report the right limit when get_password() overflows.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781516 13f79535-47bb-0310-9956-ffa450edef68

7 years agohtpasswd: don't point to (unused) stack memory on output
Yann Ylavic [Fri, 3 Feb 2017 08:51:49 +0000 (08:51 +0000)]
htpasswd: don't point to (unused) stack memory on output
to make static analysers happy.  PR 60634.

Reported by shqking and Zhenwei Zou.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781509 13f79535-47bb-0310-9956-ffa450edef68

7 years agoadd name
Eric Covener [Wed, 1 Feb 2017 23:08:05 +0000 (23:08 +0000)]
add name

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781330 13f79535-47bb-0310-9956-ffa450edef68

7 years agoadd ProxyFCGISetEnvIf
Eric Covener [Wed, 1 Feb 2017 23:07:53 +0000 (23:07 +0000)]
add ProxyFCGISetEnvIf

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781329 13f79535-47bb-0310-9956-ffa450edef68

7 years agoadd no-proxy envvar for mod_proxy
Eric Covener [Wed, 1 Feb 2017 22:33:10 +0000 (22:33 +0000)]
add no-proxy envvar for mod_proxy

replacement for ProxyPass /path ! when ProxyPass is in
location context.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781328 13f79535-47bb-0310-9956-ffa450edef68

7 years agorevert r1780909 and r1773397 ProxyPass ! perdir
Eric Covener [Wed, 1 Feb 2017 22:11:49 +0000 (22:11 +0000)]
revert r1780909 and r1773397 ProxyPass ! perdir

r1773397 had a regression and the whole thing is fishy
to shoehorn the current ProxyPass ! syntax into.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781324 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_ssl: follow up to r1740928: fix memory leaks from merged proxy_ctx.
Yann Ylavic [Wed, 1 Feb 2017 21:25:26 +0000 (21:25 +0000)]
mod_ssl: follow up to r1740928: fix memory leaks from merged proxy_ctx.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781313 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_ssl: follow up to r1781187.
Yann Ylavic [Wed, 1 Feb 2017 21:23:17 +0000 (21:23 +0000)]
mod_ssl: follow up to r1781187.
Address SSL_CTX leak in (merged) proxy_ctx.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781312 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_ssl: revert r1781299 r1781188.
Yann Ylavic [Wed, 1 Feb 2017 21:17:20 +0000 (21:17 +0000)]
mod_ssl: revert r1781299 r1781188.
Need to separate follow up related to r1740928 and co from the one related to
r1781187.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781311 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Wed, 1 Feb 2017 20:40:38 +0000 (20:40 +0000)]
On the trunk:

mod_http2: fix for crash when running out of memory. Initial patch by Robert Swiecki <robert@swiecki.net>
CVEID: CVE-2017-7659

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781304 13f79535-47bb-0310-9956-ffa450edef68

7 years ago* We only need this in case HAVE_SSL_CONF_CMD is defined
Ruediger Pluem [Wed, 1 Feb 2017 19:31:06 +0000 (19:31 +0000)]
* We only need this in case HAVE_SSL_CONF_CMD is defined

[Reverted by r1781311]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781299 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_ssl: follow up to r1781187.
Yann Ylavic [Wed, 1 Feb 2017 00:32:59 +0000 (00:32 +0000)]
mod_ssl: follow up to r1781187.
The ssl_util_thread_*() functions are not necessary with openssl-1.1+

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781190 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_ssl: follow up to r1740928: fix memory leaks.
Yann Ylavic [Tue, 31 Jan 2017 23:39:58 +0000 (23:39 +0000)]
mod_ssl: follow up to r1740928: fix memory leaks.

[Reverted by r1781311]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781188 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_ssl: work around leaks on (graceful) restart.
Yann Ylavic [Tue, 31 Jan 2017 23:37:41 +0000 (23:37 +0000)]
mod_ssl: work around leaks on (graceful) restart.

Tested with valgrind and --with-ssl shared/static.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781187 13f79535-47bb-0310-9956-ffa450edef68

7 years agoconfigure: add dependency checks for mod_crypto
Jacob Champion [Tue, 31 Jan 2017 19:12:57 +0000 (19:12 +0000)]
configure: add dependency checks for mod_crypto

Don't enable mod_crypto in reallyall builds if we don't have a dev
version of APR-util (or APR 2).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781148 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_crypto: improve error message with older APRs
Jacob Champion [Tue, 31 Jan 2017 18:56:33 +0000 (18:56 +0000)]
mod_crypto: improve error message with older APRs

When compiling against APR < 1.6, the actual error message was buried in
unknown type errors from mod_crypto.h. Don't include that file at all if
we're going to error out anyway.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781146 13f79535-47bb-0310-9956-ffa450edef68

7 years ago* modules/metadata/mod_remoteip.c (register_hooks,
Joe Orton [Tue, 31 Jan 2017 08:39:11 +0000 (08:39 +0000)]
* modules/metadata/mod_remoteip.c (register_hooks,
  remoteip_hook_pre_connection): Reference the filter by handle rather
  than name (avoiding tree lookup by name on use).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781031 13f79535-47bb-0310-9956-ffa450edef68

7 years ago* modules/metadata/mod_remoteip.c: Fix GCC strict-aliasing warning
Joe Orton [Tue, 31 Jan 2017 08:23:38 +0000 (08:23 +0000)]
* modules/metadata/mod_remoteip.c: Fix GCC strict-aliasing warning
  by moving deference of header array via a different pointer type
  ("type-punning") out of line.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781030 13f79535-47bb-0310-9956-ffa450edef68

7 years agowishlist: add CGI fixes
Jacob Champion [Mon, 30 Jan 2017 22:39:01 +0000 (22:39 +0000)]
wishlist: add CGI fixes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781003 13f79535-47bb-0310-9956-ffa450edef68

7 years agobuildconf: merge apr-config mode from its feature branch
Jacob Champion [Mon, 30 Jan 2017 19:17:00 +0000 (19:17 +0000)]
buildconf: merge apr-config mode from its feature branch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780971 13f79535-47bb-0310-9956-ffa450edef68

7 years agoCore's documentation rebuild - part 2
Luca Toscano [Mon, 30 Jan 2017 14:59:02 +0000 (14:59 +0000)]
Core's documentation rebuild - part 2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780920 13f79535-47bb-0310-9956-ffa450edef68

7 years agoCore's documentation rebuild
Luca Toscano [Mon, 30 Jan 2017 14:58:13 +0000 (14:58 +0000)]
Core's documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780919 13f79535-47bb-0310-9956-ffa450edef68

7 years agoReworded the Timeout documentation about mod_cgi[d]
Luca Toscano [Mon, 30 Jan 2017 14:58:04 +0000 (14:58 +0000)]
Reworded the Timeout documentation about mod_cgi[d]

After a chat with Yann and Eric on dev@, we agreed to
simplify the description.

PR: 60404
Follow up of: http://svn.apache.org/r1780907

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780918 13f79535-47bb-0310-9956-ffa450edef68

7 years ago"fix" regression in r1773397.
Eric Covener [Mon, 30 Jan 2017 12:59:09 +0000 (12:59 +0000)]
"fix" regression in r1773397.

committing for discussion purposes to trunk.  I have reopened PR60458 because
I am tempted to revert the entire thing, it was not really a release-to-release
regression because the reporter arbitrarily used a new 2.4 syntax and the semantics
were unclear.

It is useful to have global exceptions apply to per-location proxypass, but it totally
breaks the "fast" lookup part of it.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780909 13f79535-47bb-0310-9956-ffa450edef68

7 years agoCore's documentation rebuild
Luca Toscano [Mon, 30 Jan 2017 12:57:43 +0000 (12:57 +0000)]
Core's documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780908 13f79535-47bb-0310-9956-ffa450edef68

7 years agoAdd more info about the role of Timeout for mod_cgi
Luca Toscano [Mon, 30 Jan 2017 12:57:00 +0000 (12:57 +0000)]
Add more info about the role of Timeout for mod_cgi

PR 60404 asks if the Timeout directive is related to
the amount of time to wait for the entire CGI script's
output or only the first byte received.
Checking in mod_cgi.c -> cgi_bucket_read shows a
apr_pollset_poll that should support the latter.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780907 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRebuild.
Lucien Gentis [Sun, 29 Jan 2017 15:59:38 +0000 (15:59 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780818 13f79535-47bb-0310-9956-ffa450edef68

7 years agoBad meta file.
Lucien Gentis [Sun, 29 Jan 2017 15:56:16 +0000 (15:56 +0000)]
Bad meta file.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780816 13f79535-47bb-0310-9956-ffa450edef68

7 years agoSet all read buckets aside in case we need to restore all during optional header...
Daniel Ruggeri [Sat, 28 Jan 2017 17:53:58 +0000 (17:53 +0000)]
Set all read buckets aside in case we need to restore all during optional header processing

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780725 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRebuild.
Lucien Gentis [Sat, 28 Jan 2017 16:49:33 +0000 (16:49 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780722 13f79535-47bb-0310-9956-ffa450edef68

7 years agoXML updates.
Lucien Gentis [Sat, 28 Jan 2017 16:48:45 +0000 (16:48 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780720 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRebuild.
Lucien Gentis [Sat, 28 Jan 2017 16:33:52 +0000 (16:33 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780716 13f79535-47bb-0310-9956-ffa450edef68

7 years agoXML updates.
Lucien Gentis [Sat, 28 Jan 2017 16:32:18 +0000 (16:32 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780715 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Fri, 27 Jan 2017 17:46:26 +0000 (17:46 +0000)]
On the trunk:

mod_http2: update after backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780598 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Fri, 27 Jan 2017 17:21:55 +0000 (17:21 +0000)]
On the trunk:

mod_http2: do not attempt to send responses on aborted slave connections.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780596 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Fri, 27 Jan 2017 16:34:36 +0000 (16:34 +0000)]
On the trunk:

  *) mod_http2: regression fix on PR 59348, on graceful restart, ongoing
     streams are finished normally before the final GOAWAY is sent.
     [Stefan Eissing, <slavko gmail.com>]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780576 13f79535-47bb-0310-9956-ffa450edef68

7 years agobuildconf: add --help for the new behavior
Jacob Champion [Thu, 26 Jan 2017 20:19:16 +0000 (20:19 +0000)]
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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-buildconf-noapr@1780470 13f79535-47bb-0310-9956-ffa450edef68

7 years agoAdding .fr translation from the french doc translation project. Credits go to lgentis
Vincent Deffontaines [Thu, 26 Jan 2017 20:02:25 +0000 (20:02 +0000)]
Adding .fr translation from the french doc translation project. Credits go to lgentis

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780462 13f79535-47bb-0310-9956-ffa450edef68

7 years agobuildconf: allow configuration without APR sources
Jacob Champion [Thu, 26 Jan 2017 19:24:58 +0000 (19:24 +0000)]
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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-buildconf-noapr@1780441 13f79535-47bb-0310-9956-ffa450edef68

7 years agodocumentation rebuild
Luca Toscano [Thu, 26 Jan 2017 10:33:39 +0000 (10:33 +0000)]
documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780357 13f79535-47bb-0310-9956-ffa450edef68

7 years agoAdd HTTP/2 howto link to index and sitemap
Luca Toscano [Thu, 26 Jan 2017 10:32:57 +0000 (10:32 +0000)]
Add HTTP/2 howto link to index and sitemap

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780356 13f79535-47bb-0310-9956-ffa450edef68

7 years agodebugging
Jim Jagielski [Thu, 26 Jan 2017 03:52:35 +0000 (03:52 +0000)]
debugging

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780329 13f79535-47bb-0310-9956-ffa450edef68

7 years agoAdjust as needed
Jim Jagielski [Thu, 26 Jan 2017 03:52:34 +0000 (03:52 +0000)]
Adjust as needed

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780328 13f79535-47bb-0310-9956-ffa450edef68

7 years agodebug
Jim Jagielski [Thu, 26 Jan 2017 03:52:31 +0000 (03:52 +0000)]
debug

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780327 13f79535-47bb-0310-9956-ffa450edef68

7 years agorotatelogs: fix -n help text
Eric Covener [Thu, 26 Jan 2017 02:02:59 +0000 (02:02 +0000)]
rotatelogs: fix -n help text

this closes #24

Submitted By: Isaac Boukris <iboukris gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780308 13f79535-47bb-0310-9956-ffa450edef68

7 years ago80 chars
Eric Covener [Wed, 25 Jan 2017 22:29:26 +0000 (22:29 +0000)]
80 chars

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780282 13f79535-47bb-0310-9956-ffa450edef68

7 years agoPR60647: ACC per connection not available w/ event MPM
Eric Covener [Wed, 25 Jan 2017 22:23:43 +0000 (22:23 +0000)]
PR60647: ACC per connection not available w/ event MPM

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780280 13f79535-47bb-0310-9956-ffa450edef68

7 years agoFeature branch for configuring with source-less APR[Util] installs.
Jacob Champion [Wed, 25 Jan 2017 18:16:31 +0000 (18:16 +0000)]
Feature branch for configuring with source-less APR[Util] installs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-buildconf-noapr@1780253 13f79535-47bb-0310-9956-ffa450edef68

7 years agodocumentation rebuild
Luca Toscano [Wed, 25 Jan 2017 15:22:53 +0000 (15:22 +0000)]
documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780213 13f79535-47bb-0310-9956-ffa450edef68

7 years agoCorrect some typos across the documentation.
Luca Toscano [Wed, 25 Jan 2017 15:19:30 +0000 (15:19 +0000)]
Correct some typos across the documentation.

This commit was made thanks to the tool and PR
created by Lajos Veres (vlajos) on github.

PR: https://github.com/apache/httpd/pull/6
Tool: https://github.com/vlajos/misspell_fixer

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780210 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Wed, 25 Jan 2017 09:46:09 +0000 (09:46 +0000)]
On the trunk:

mod_http2: fixing h2_bucket_beam to avoid duplicate calls to cleanup functions.
[Yann, Ylavic, Stefan Eissing]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780159 13f79535-47bb-0310-9956-ffa450edef68

7 years agoFix %{DOCUMENT_URI} in SSI w/ default parser
Eric Covener [Tue, 24 Jan 2017 17:09:47 +0000 (17:09 +0000)]
Fix %{DOCUMENT_URI} in SSI w/ default parser

  *) core: %{DOCUMENT_URI} used in nested SSI expressions should point to the
     URI originally requsted by the user, not the nested documents URI. This
     restores the behavior of this variable to match the "legacy" SSI parser.
     PR60624.

Submitted By [Hank Ibell <hwibell gmail.com>]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780095 13f79535-47bb-0310-9956-ffa450edef68

7 years agoLINK : warning LNK4013: image size 0xB1000 exceeds specified maximum 0x20000
Gregg Lewis Smith [Tue, 24 Jan 2017 07:50:31 +0000 (07:50 +0000)]
LINK : warning LNK4013: image size 0xB1000 exceeds specified maximum 0x20000

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780035 13f79535-47bb-0310-9956-ffa450edef68

7 years agoupdate after backport
Stefan Eissing [Mon, 23 Jan 2017 20:25:03 +0000 (20:25 +0000)]
update after backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779979 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Mon, 23 Jan 2017 20:10:20 +0000 (20:10 +0000)]
On the trunk:

  *) mod_http2: fixes PR60599, sending proper response for conditional requests
     answered by mod_cache. [Jeff Wheelhouse, Stefan Eissing]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779972 13f79535-47bb-0310-9956-ffa450edef68

7 years agoDocumentation rebuild
Luca Toscano [Mon, 23 Jan 2017 14:03:44 +0000 (14:03 +0000)]
Documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779928 13f79535-47bb-0310-9956-ffa450edef68

7 years agoReworked and added examples to the HTTPProtocolOptions doc
Luca Toscano [Mon, 23 Jan 2017 14:03:26 +0000 (14:03 +0000)]
Reworked and added examples to the HTTPProtocolOptions doc

On #httpd-dev a user gave us some hints about what kind of
things would have been great to see in the HTTPProtocolOptions
directive's documentation, so I tried to apply them all.

I also added some examples taken from http_strict.t and tested
a bit. I didn't follow completely the complete change-set of
the HTTPProtocolOptions directive, so please review the change
and let me know if anything is wrong or missing.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779927 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Mon, 23 Jan 2017 09:36:09 +0000 (09:36 +0000)]
On the trunk:

M    modules/http2/h2_bucket_beam.c
     - renaming: former red/green is now send/recv, better to read
M    modules/http2/h2_from_h1.c
     - produce a response also when body it totally absent (PR 60599)
M    modules/http2/h2_session.c
     - more work on cleaner connection shutdown

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779896 13f79535-47bb-0310-9956-ffa450edef68

7 years agoupdate transformation
André Malo [Sat, 21 Jan 2017 18:19:03 +0000 (18:19 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779750 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRebuild en language.
Lucien Gentis [Sat, 21 Jan 2017 17:43:12 +0000 (17:43 +0000)]
Rebuild en language.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779749 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRebuild.
Lucien Gentis [Sat, 21 Jan 2017 16:52:04 +0000 (16:52 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779745 13f79535-47bb-0310-9956-ffa450edef68

7 years agoBad metafile.
Lucien Gentis [Sat, 21 Jan 2017 16:49:43 +0000 (16:49 +0000)]
Bad metafile.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779744 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Sat, 21 Jan 2017 15:49:42 +0000 (15:49 +0000)]
On the trunk:

mod_http2: update after backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779743 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Sat, 21 Jan 2017 15:07:42 +0000 (15:07 +0000)]
On the trunk:

  *) mod_http2: rework of stream resource cleanup to avoid a crash in a close
     of a lingering connection. Prohibit special file bucket beaming for
     shared buckets. Files sent in stream output now use the stream pool
     as read buffer, reducing memory footprint of connections.
     [Yann Ylavic, Stefan Eissing]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779738 13f79535-47bb-0310-9956-ffa450edef68

7 years agoSave a few bytes and a few cycles.
Christophe Jaillet [Sat, 21 Jan 2017 06:40:23 +0000 (06:40 +0000)]
Save a few bytes and a few cycles.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779700 13f79535-47bb-0310-9956-ffa450edef68

7 years agoBe more consitent in the layout, and fix the display of a multi lines <highlight...
Christophe Jaillet [Sat, 21 Jan 2017 06:34:53 +0000 (06:34 +0000)]
Be more consitent in the layout, and fix the display of a multi lines <highlight> section

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779699 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_proxy_hcheck: follow up to r1779574.
Yann Ylavic [Fri, 20 Jan 2017 13:18:58 +0000 (13:18 +0000)]
mod_proxy_hcheck: follow up to r1779574.
Parse/validate response bodies.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779623 13f79535-47bb-0310-9956-ffa450edef68

7 years agodocumentation rebuild
Luca Toscano [Fri, 20 Jan 2017 11:43:52 +0000 (11:43 +0000)]
documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779610 13f79535-47bb-0310-9956-ffa450edef68

7 years agoReworked mod-proxy-http2's documentation after Stefan's suggestions
Luca Toscano [Fri, 20 Jan 2017 11:43:34 +0000 (11:43 +0000)]
Reworked mod-proxy-http2's documentation after Stefan's suggestions

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779609 13f79535-47bb-0310-9956-ffa450edef68

7 years agoDocumentation rebuild
Luca Toscano [Fri, 20 Jan 2017 08:46:55 +0000 (08:46 +0000)]
Documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779579 13f79535-47bb-0310-9956-ffa450edef68

7 years agoAdded more details to mod-proxy-http2's doc
Luca Toscano [Fri, 20 Jan 2017 08:45:40 +0000 (08:45 +0000)]
Added more details to mod-proxy-http2's doc

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779578 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_proxy_hcheck: Don't validate timed out responses.
Yann Ylavic [Fri, 20 Jan 2017 08:30:00 +0000 (08:30 +0000)]
mod_proxy_hcheck: Don't validate timed out responses.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779574 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_proxy_hcheck: thread-safety.
Yann Ylavic [Fri, 20 Jan 2017 08:23:28 +0000 (08:23 +0000)]
mod_proxy_hcheck: thread-safety.
Use the thread pool everywhere for the needs/lifetime of the request to
the backend.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779573 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Thu, 19 Jan 2017 21:09:18 +0000 (21:09 +0000)]
On the trunk:

reverting change 1779525.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779528 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Thu, 19 Jan 2017 20:38:50 +0000 (20:38 +0000)]
On the trunk:

mod_http2: decoupling lifetime of mplx pool from h2_session which messed up the cleanup ordering.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779525 13f79535-47bb-0310-9956-ffa450edef68

7 years agoAs per http://httpd.apache.org/docs/2.4/programs/httpd.html#comment_6187
Rich Bowen [Thu, 19 Jan 2017 14:48:10 +0000 (14:48 +0000)]
As per http://httpd.apache.org/docs/2.4/programs/httpd.html#comment_6187
the -R option has been gone for ages.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779469 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Thu, 19 Jan 2017 12:57:08 +0000 (12:57 +0000)]
On the trunk:

  *) mod_http2: change lifetime of h2_session record to address crashes
     during connection shutdown. [Yann Ylavic, Stefan Eissing]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779459 13f79535-47bb-0310-9956-ffa450edef68

7 years agoevent: follow up to r1762701.
Yann Ylavic [Wed, 18 Jan 2017 16:08:51 +0000 (16:08 +0000)]
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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779354 13f79535-47bb-0310-9956-ffa450edef68

7 years agoAllow -DHC_USE_THREADS=0
Jim Jagielski [Wed, 18 Jan 2017 15:46:58 +0000 (15:46 +0000)]
Allow -DHC_USE_THREADS=0

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779349 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_brotli: Update makefile to cope with the pkg-config layout change
Evgeny Kotkov [Mon, 16 Jan 2017 21:43:17 +0000 (21:43 +0000)]
mod_brotli: Update makefile to cope with the pkg-config layout change
in https://github.com/google/brotli/commit/fe9f9a9

There's a typo in the upstream commit [1] (s/brotlicommon/libbrotlicommon)
that currently produces an unusable libbrotlienc.pc file, but hopefully
this is going to be fixed there.

[1] https://github.com/google/brotli/commit/fe9f9a9#diff-af3b638bc2a3e6c650974192a53c7291R409

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779111 13f79535-47bb-0310-9956-ffa450edef68

7 years agoXforms et.al.
Jim Jagielski [Mon, 16 Jan 2017 19:53:10 +0000 (19:53 +0000)]
Xforms et.al.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779092 13f79535-47bb-0310-9956-ffa450edef68

7 years ago1st draft
Jim Jagielski [Mon, 16 Jan 2017 19:51:31 +0000 (19:51 +0000)]
1st draft

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779091 13f79535-47bb-0310-9956-ffa450edef68

7 years agounused variable error could mistakenly note that brotli isn't available.
Jim Jagielski [Mon, 16 Jan 2017 18:24:00 +0000 (18:24 +0000)]
unused variable error could mistakenly note that brotli isn't available.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779077 13f79535-47bb-0310-9956-ffa450edef68

7 years agoupdate transformation
André Malo [Sun, 15 Jan 2017 13:26:29 +0000 (13:26 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778916 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRebuild.
Lucien Gentis [Sat, 14 Jan 2017 17:44:23 +0000 (17:44 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778807 13f79535-47bb-0310-9956-ffa450edef68

7 years agoXML updates.
Lucien Gentis [Sat, 14 Jan 2017 17:43:36 +0000 (17:43 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778806 13f79535-47bb-0310-9956-ffa450edef68

7 years agoupdate after backport
Stefan Eissing [Fri, 13 Jan 2017 16:33:20 +0000 (16:33 +0000)]
update after backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778630 13f79535-47bb-0310-9956-ffa450edef68

7 years agoFollow-up to r1778350
Christophe Jaillet [Fri, 13 Jan 2017 07:22:29 +0000 (07:22 +0000)]
Follow-up to r1778350

Remove useless tests in order to avoid the duplication of a message.
Be consistent with "FPM" vs "PHP-FPM" usage messages.
Fix style issues.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778500 13f79535-47bb-0310-9956-ffa450edef68

7 years agoPR60576: php-fpm broken w/ per-dir rewrites
Eric Covener [Wed, 11 Jan 2017 20:58:33 +0000 (20:58 +0000)]
PR60576: php-fpm broken w/ per-dir rewrites

Attempt to dig out of well-meaning fixes for generic fcgi backends
that negatively affected some FPM configs.

Adds ProxyFCGIBackendType

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778350 13f79535-47bb-0310-9956-ffa450edef68

7 years agoname changes re: suggestion
Jim Jagielski [Wed, 11 Jan 2017 18:05:13 +0000 (18:05 +0000)]
name changes re: suggestion

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778331 13f79535-47bb-0310-9956-ffa450edef68

7 years agoUse pconf as parent pool so mutexes get cleaned on restarts/reloads
Jim Jagielski [Wed, 11 Jan 2017 16:00:37 +0000 (16:00 +0000)]
Use pconf as parent pool so mutexes get cleaned on restarts/reloads

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778319 13f79535-47bb-0310-9956-ffa450edef68

7 years ago* Silence compiler warning
Ruediger Pluem [Wed, 11 Jan 2017 10:23:55 +0000 (10:23 +0000)]
* Silence compiler warning

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778268 13f79535-47bb-0310-9956-ffa450edef68

7 years agoremove backported items
Eric Covener [Tue, 10 Jan 2017 13:22:53 +0000 (13:22 +0000)]
remove backported items

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778118 13f79535-47bb-0310-9956-ffa450edef68

7 years agofollowup to r1776285
Eric Covener [Tue, 10 Jan 2017 13:20:26 +0000 (13:20 +0000)]
followup to r1776285

backwards per rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778117 13f79535-47bb-0310-9956-ffa450edef68

7 years agohttps://bz.apache.org/bugzilla/show_bug.cgi?id=58855
Jim Jagielski [Mon, 9 Jan 2017 22:08:01 +0000 (22:08 +0000)]
https://bz.apache.org/bugzilla/show_bug.cgi?id=58855

Optimize check for empty strings

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778067 13f79535-47bb-0310-9956-ffa450edef68