]> granicus.if.org Git - apache/log
apache
8 years agompm: Add a complete_connection hook that confirms whether an MPM is allowed
Graham Leggett [Fri, 19 Feb 2016 15:00:05 +0000 (15:00 +0000)]
mpm: Add a complete_connection hook that confirms whether an MPM is allowed
to leave the WRITE_COMPLETION phase. Move filter code out of the MPMs.

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

8 years agoDocumentation rebuild
Luca Toscano [Fri, 19 Feb 2016 07:52:05 +0000 (07:52 +0000)]
Documentation rebuild

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

8 years agoImproved sections.html after Eric's feedback.
Luca Toscano [Fri, 19 Feb 2016 07:51:45 +0000 (07:51 +0000)]
Improved sections.html after Eric's feedback.

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

8 years agoRemove backported item.
Christophe Jaillet [Fri, 19 Feb 2016 06:33:59 +0000 (06:33 +0000)]
Remove backported item.

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

8 years agocatch by jchampion
Jim Jagielski [Thu, 18 Feb 2016 19:24:04 +0000 (19:24 +0000)]
catch by jchampion

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

8 years agohandle compiler warning
Jim Jagielski [Thu, 18 Feb 2016 19:03:10 +0000 (19:03 +0000)]
handle compiler warning

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

8 years agoImpl ThreadLimit so we can have sane scoreboard sizes :)
Jim Jagielski [Thu, 18 Feb 2016 18:48:19 +0000 (18:48 +0000)]
Impl ThreadLimit so we can have sane scoreboard sizes :)

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

8 years agousing proxy http2 connection concurrently, if main connection also uses http/2, needs...
Stefan Eissing [Thu, 18 Feb 2016 17:02:02 +0000 (17:02 +0000)]
using proxy http2 connection concurrently, if main connection also uses http/2, needs more hardening

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

8 years agoDocumentation rebuild.
Luca Toscano [Thu, 18 Feb 2016 13:49:31 +0000 (13:49 +0000)]
Documentation rebuild.

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

8 years agoensure sane defaults
Jim Jagielski [Thu, 18 Feb 2016 12:06:39 +0000 (12:06 +0000)]
ensure sane defaults

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

8 years agodoc patch by luca
Stefan Eissing [Thu, 18 Feb 2016 09:38:40 +0000 (09:38 +0000)]
doc patch by luca

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

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Thu, 18 Feb 2016 07:44:16 +0000 (07:44 +0000)]
Support for OpenSSL 1.1.0:
- 1.1.0-pre3 was relesed
  - remove pre2 comments which no longer apply
  - one more struct has been made opaque, use
    accessor function instead

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

8 years agoadd comments for all media types in IANA registry dated 2016-02-05
Roy T. Fielding [Wed, 17 Feb 2016 23:05:55 +0000 (23:05 +0000)]
add comments for all media types in IANA registry dated 2016-02-05

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

8 years agoneeds to find mod_ssl.h
Gregg Lewis Smith [Wed, 17 Feb 2016 18:05:00 +0000 (18:05 +0000)]
needs to find mod_ssl.h

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

8 years ago* c is set to cs->c. So use it.
Ruediger Pluem [Wed, 17 Feb 2016 15:47:03 +0000 (15:47 +0000)]
* c is set to cs->c. So use it.

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

8 years ago* Use correct bucket allocator for sending data to the backend
Ruediger Pluem [Wed, 17 Feb 2016 12:37:46 +0000 (12:37 +0000)]
* Use correct bucket allocator for sending data to the backend

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

8 years agofix segfault when not identifying mpm module, added detection for winnt, simeple...
Stefan Eissing [Wed, 17 Feb 2016 09:04:12 +0000 (09:04 +0000)]
fix segfault when not identifying mpm module, added detection for winnt, simeple, motorz and netware

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

8 years agoproperly sort the types (no functional change)
Roy T. Fielding [Wed, 17 Feb 2016 00:09:34 +0000 (00:09 +0000)]
properly sort the types (no functional change)

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

8 years agoDocumentation rebuild.
Luca Toscano [Tue, 16 Feb 2016 18:43:17 +0000 (18:43 +0000)]
Documentation rebuild.

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

8 years agoNew proposal for the sections.html documentation.
Luca Toscano [Tue, 16 Feb 2016 18:42:26 +0000 (18:42 +0000)]
New proposal for the sections.html documentation.

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

8 years agodocco change re 451
Jim Jagielski [Tue, 16 Feb 2016 17:42:49 +0000 (17:42 +0000)]
docco change re 451

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

8 years agoAdd 451... Needed to adjust RESPONSE_CODES which
Jim Jagielski [Tue, 16 Feb 2016 17:33:31 +0000 (17:33 +0000)]
Add 451... Needed to adjust RESPONSE_CODES which
was not in the provided patch
BUGZ# 58985

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

8 years agoGet rid of all this min/max server stuff. Keep it simple.
Jim Jagielski [Tue, 16 Feb 2016 15:58:01 +0000 (15:58 +0000)]
Get rid of all this min/max server stuff. Keep it simple.
We fork a set number of processes and ensure we stay
at that number.

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

8 years agoDocumentation rebuild
Luca Toscano [Tue, 16 Feb 2016 12:32:26 +0000 (12:32 +0000)]
Documentation rebuild

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

8 years agoExpanding sections.xml to address Bug: 58789
Luca Toscano [Tue, 16 Feb 2016 12:32:08 +0000 (12:32 +0000)]
Expanding sections.xml to address Bug: 58789

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

8 years agoDocumentation rebuild
Luca Toscano [Tue, 16 Feb 2016 07:52:09 +0000 (07:52 +0000)]
Documentation rebuild

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

8 years agoSimplified the AsyncRequestWorkerFactor section of mod_event's doc page
Luca Toscano [Tue, 16 Feb 2016 07:50:59 +0000 (07:50 +0000)]
Simplified the AsyncRequestWorkerFactor section of mod_event's doc page

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

8 years agolet's not emphasize keep-alive w/ the Event MPM. That was true long,
Jim Jagielski [Mon, 15 Feb 2016 23:03:37 +0000 (23:03 +0000)]
let's not emphasize keep-alive w/ the Event MPM. That was true long,
long ago when that was the only thing that made it useful. Nowadays,
it really *is* an event-based MPM w/ async/non-blocking i/o.

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

8 years agotimer is really just timeout
Jim Jagielski [Mon, 15 Feb 2016 20:37:16 +0000 (20:37 +0000)]
timer is really just timeout

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

8 years agostart of timeout handling
Jim Jagielski [Mon, 15 Feb 2016 19:48:51 +0000 (19:48 +0000)]
start of timeout handling

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

8 years agoUpdate the motorz MPM with some logging and some minor fixes...
Jim Jagielski [Mon, 15 Feb 2016 18:36:39 +0000 (18:36 +0000)]
Update the motorz MPM with some logging and some minor fixes...
Most of the debugs will be removed once more stable.

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

8 years agofirst working h2 request engine implementation that does serial processing of proxy...
Stefan Eissing [Mon, 15 Feb 2016 17:10:54 +0000 (17:10 +0000)]
first working h2 request engine implementation that does serial processing of proxy requests

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

8 years agoFix typo in comment
Christophe Jaillet [Mon, 15 Feb 2016 06:52:14 +0000 (06:52 +0000)]
Fix typo in comment

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

8 years agoSupport OpenSSL 1.1.0.
Rainer Jung [Sun, 14 Feb 2016 22:40:07 +0000 (22:40 +0000)]
Support OpenSSL 1.1.0.
- use common code for OpenSSL pre-1.1.0 and
  1.1.0 where possible.

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

8 years agoAdd remark about backport obstacle.
Rainer Jung [Sun, 14 Feb 2016 16:36:04 +0000 (16:36 +0000)]
Add remark about backport obstacle.

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

8 years agoCommit change forgotten in r1730075 (include
Rainer Jung [Sun, 14 Feb 2016 12:18:13 +0000 (12:18 +0000)]
Commit change forgotten in r1730075 (include
mod_proxy_http2 in Netware LoadModule list).

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

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Sun, 14 Feb 2016 11:24:39 +0000 (11:24 +0000)]
Support for OpenSSL 1.1.0:
- use SSL_peek instead of looping with
  has_buffered_data().

This fixes t/security/CVE-2009-3555.t where
has_buffered_data() doesn't help, because it
finds the buffered data and doesn't call
SSL_read(), so the reneg handshake isn't
triggered. SSL_peek() for 0 bytes seems to
reliably trigger the reneg in every case.

No more polling/sleeping. The code for the
OpenSSL 1.1.0 case is now again very close to
the pre 1.1.0 case.

Still need to run the full test suite with a
clean build.

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

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Sun, 14 Feb 2016 11:16:18 +0000 (11:16 +0000)]
Support for OpenSSL 1.1.0:
- Fix typo in loop end condition

This code will be removed next. Thex fix is
for the case we want to roll teh code back
to this state.

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

8 years agoDocumentation rebuild.
Luca Toscano [Sun, 14 Feb 2016 08:52:23 +0000 (08:52 +0000)]
Documentation rebuild.

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

8 years agoAdded examples to mod_event's AsyncRequestWorkerFactor section.
Luca Toscano [Sun, 14 Feb 2016 08:50:05 +0000 (08:50 +0000)]
Added examples to mod_event's AsyncRequestWorkerFactor section.

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

8 years agoRebuild.
Lucien Gentis [Sat, 13 Feb 2016 15:01:34 +0000 (15:01 +0000)]
Rebuild.

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

8 years agoXML update.
Lucien Gentis [Sat, 13 Feb 2016 15:00:52 +0000 (15:00 +0000)]
XML update.

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

8 years agoRebuild.
Lucien Gentis [Sat, 13 Feb 2016 14:33:39 +0000 (14:33 +0000)]
Rebuild.

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

8 years agoXML updates.
Lucien Gentis [Sat, 13 Feb 2016 14:30:48 +0000 (14:30 +0000)]
XML updates.

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

8 years agoSupport OpenSSL 1.1.0:
Rainer Jung [Sat, 13 Feb 2016 01:52:31 +0000 (01:52 +0000)]
Support OpenSSL 1.1.0:
- Fix renegotiation for the client side
  of a proxy connection.

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

8 years agoSupport %{c}h for conn-hostname, %h for useragent_host
William A. Rowe Jr [Fri, 12 Feb 2016 22:08:29 +0000 (22:08 +0000)]
Support %{c}h for conn-hostname, %h for useragent_host

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

8 years agoCorrect doxygen groupname
William A. Rowe Jr [Fri, 12 Feb 2016 22:06:01 +0000 (22:06 +0000)]
Correct doxygen groupname

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

8 years agoSync mod_rewrite REMOTE_HOST to newbehavior (REMOTE_ADDR is useragent_ip)
William A. Rowe Jr [Fri, 12 Feb 2016 22:05:24 +0000 (22:05 +0000)]
Sync mod_rewrite REMOTE_HOST to newbehavior (REMOTE_ADDR is useragent_ip)

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

8 years agoUse different variables to track normal
Rainer Jung [Fri, 12 Feb 2016 17:46:38 +0000 (17:46 +0000)]
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.

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

8 years agoOfficial ASF favicon
Jim Jagielski [Fri, 12 Feb 2016 17:32:11 +0000 (17:32 +0000)]
Official ASF favicon

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

8 years agoAdd mod_proxy as a dependency to mod_proxy_http2
Rainer Jung [Fri, 12 Feb 2016 17:25:21 +0000 (17:25 +0000)]
Add mod_proxy as a dependency to mod_proxy_http2
Unix Makefile.

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

8 years agoMore mod_proxy_http2 build support:
Rainer Jung [Fri, 12 Feb 2016 17:20:22 +0000 (17:20 +0000)]
More mod_proxy_http2 build support:
- include in Windows and Netware LoadModule lists
- add to cmake build file
Untested.

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

8 years agoUse nice PNG instead of ugly nasty GIF
Jim Jagielski [Fri, 12 Feb 2016 17:03:09 +0000 (17:03 +0000)]
Use nice PNG instead of ugly nasty GIF

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

8 years agoRename http2 module m4 file, so that it will
Rainer Jung [Fri, 12 Feb 2016 16:54:02 +0000 (16:54 +0000)]
Rename http2 module m4 file, so that it will
come after most standard modules in configure
and thus will also be added later with
LoadModule to the default Unix httpd.conf file.

This is necessary, because modules/http2 also
contains mod_proxy_http2, which must be loaded
after mod_proxy itself.

The same trick is already in used for some other
modules (see config5.m4 files).

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

8 years agoand keep the old one around
Jim Jagielski [Fri, 12 Feb 2016 16:45:37 +0000 (16:45 +0000)]
and keep the old one around

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

8 years agoAdd the gif version
Jim Jagielski [Fri, 12 Feb 2016 16:45:13 +0000 (16:45 +0000)]
Add the gif version

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

8 years agoNew feather
Jim Jagielski [Fri, 12 Feb 2016 16:38:35 +0000 (16:38 +0000)]
New feather

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

8 years agoxforms
Jim Jagielski [Fri, 12 Feb 2016 12:16:49 +0000 (12:16 +0000)]
xforms

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

8 years agostandardize /
Jim Jagielski [Fri, 12 Feb 2016 12:15:37 +0000 (12:15 +0000)]
standardize /

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

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Fri, 12 Feb 2016 11:29:36 +0000 (11:29 +0000)]
Support for OpenSSL 1.1.0:
- fix copy&paste typos
  (wrong version number in "#if").

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

8 years agonetware make updates by normw
Stefan Eissing [Fri, 12 Feb 2016 10:12:55 +0000 (10:12 +0000)]
netware make updates by normw

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

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Fri, 12 Feb 2016 10:03:48 +0000 (10:03 +0000)]
Support for OpenSSL 1.1.0:
- fix rejecting client initiated renegotiations

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

8 years agoupdate description of mmn bum 20150222.10 to include pre_close connection additions
Stefan Eissing [Fri, 12 Feb 2016 09:10:46 +0000 (09:10 +0000)]
update description of mmn bum 20150222.10 to include pre_close connection additions

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

8 years agoLast part of doc rebuild.
Luca Toscano [Fri, 12 Feb 2016 07:31:49 +0000 (07:31 +0000)]
Last part of doc rebuild.

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

8 years agoDocumentation rebuild.
Luca Toscano [Fri, 12 Feb 2016 07:29:56 +0000 (07:29 +0000)]
Documentation rebuild.

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

8 years agoRemoved confusing parts in the Limitations section of the mod_event's doc page.
Luca Toscano [Fri, 12 Feb 2016 07:29:19 +0000 (07:29 +0000)]
Removed confusing parts in the Limitations section of the mod_event's doc page.

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

8 years agoA rather ugly patch since the code was refactored recently to exclude
William A. Rowe Jr [Fri, 12 Feb 2016 01:19:49 +0000 (01:19 +0000)]
A rather ugly patch since the code was refactored recently to exclude
the simple patch for 2.4.x, illustrated below.

Completes the changeset r1729930 and resolves all 2.4.19-dev corrections,
but other 2.5.0-dev specific changes may still be needed on trunk.

--- server/scoreboard.c (revision 1729907)
+++ server/scoreboard.c (working copy)
@@ -491,9 +491,8 @@
             ws->conn_bytes = 0;
         }
         if (r) {
-            const char *client = ap_get_remote_host(c, r->per_dir_config,
-                                 REMOTE_NOLOOKUP, NULL);
-            if (!client || !strcmp(client, c->client_ip)) {
+            const char *client;
+            if (!(client = ap_get_useragent_host(r, REMOTE_NOLOOKUP, NULL))) {
                 apr_cpystrn(ws->client, r->useragent_ip, sizeof(ws->client));
             }
             else {

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

8 years agohostname: Test and log useragent_host per-request across various modules,
William A. Rowe Jr [Fri, 12 Feb 2016 01:17:03 +0000 (01:17 +0000)]
hostname: Test and log useragent_host per-request across various modules,
including the scoreboard, expression and rewrite engines, setenvif,
authz_host, access_compat, custom logging, ssl and REMOTE_HOST variables.
PR55348  [William Rowe]

This is the complete change set which applies cleanly to 2.4.x as well,
the server/scoreboard.c will follow, which does not apply due to drift.

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

8 years agoIntroduce an ap_get_useragent_host() accessor to replace the old
William A. Rowe Jr [Fri, 12 Feb 2016 01:04:58 +0000 (01:04 +0000)]
Introduce an ap_get_useragent_host() accessor to replace the old
ap_get_remote_host() in most applications, but preserve the original
behavior for all ap_get_remote_host() consumers (mostly, because we
don't have the request_rec in the first place, and also to avoid any
unintended consequences).

This accessor continues to store the remote_host of connection based
uesr agents within the conn_rec for optimization.  Only where some
other module modifies the useragent_addr will we perform a per-request
query of the remote_host.

(Fixed compilation issues noted by Ranier, applies to 2.4.x trunk,
modulo CHANGES and ap_mmn.h)

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

8 years agoUnwind commit 1729901 (and 1729926), it was not ready for trunk
William A. Rowe Jr [Fri, 12 Feb 2016 00:46:00 +0000 (00:46 +0000)]
Unwind commit 1729901 (and 1729926), it was not ready for trunk

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

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Fri, 12 Feb 2016 00:44:22 +0000 (00:44 +0000)]
Support for OpenSSL 1.1.0:
- further improvements for renegotiation
No more test suite failures for reneg,
but still using not so nice polling.

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

8 years agoFix compile error:
Rainer Jung [Fri, 12 Feb 2016 00:18:38 +0000 (00:18 +0000)]
Fix compile error:
- missing semicolons
- s/req/r/

Followup to r1729901

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

8 years agoIntroduce an ap_get_useragent_host() accessor to replace the old
William A. Rowe Jr [Thu, 11 Feb 2016 21:58:45 +0000 (21:58 +0000)]
Introduce an ap_get_useragent_host() accessor to replace the old
ap_get_remote_host() in most applications, but preserve the original
behavior for all ap_get_remote_host() consumers (mostly, because we
don't have the request_rec in the first place, and also to avoid any
unintended consequences).

This accessor continues to store the remote_host of connection based
uesr agents within the conn_rec for optimization.  Only where some
other module modifies the useragent_addr will we perform a per-request
query of the remote_host.

(Committed previously, but backed out due to unrelated core.c changes)

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

8 years agoRevert r1729897, 1729898, my copy of core.c was polluted by a different patch
William A. Rowe Jr [Thu, 11 Feb 2016 21:52:12 +0000 (21:52 +0000)]
Revert r1729897, 1729898, my copy of core.c was polluted by a different patch

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

8 years agoNote change for r1729897
William A. Rowe Jr [Thu, 11 Feb 2016 21:47:25 +0000 (21:47 +0000)]
Note change for r1729897

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

8 years agoIntroduce an ap_get_useragent_host() accessor to replace the old
William A. Rowe Jr [Thu, 11 Feb 2016 21:43:32 +0000 (21:43 +0000)]
Introduce an ap_get_useragent_host() accessor to replace the old
ap_get_remote_host() in most applications, but preserve the original
behavior for all ap_get_remote_host() consumers (mostly, because we
don't have the request_rec in the first place, and also to avoid any
unintended consequences).

This accessor continues to store the remote_host of connection based
uesr agents within the conn_rec for optimization.  Only where some
other module modifies the useragent_addr will we perform a per-request
query of the remote_host.

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

8 years agoNote that this should become private to mod_ident, accessed by the accessor fn
William A. Rowe Jr [Thu, 11 Feb 2016 21:37:42 +0000 (21:37 +0000)]
Note that this should become private to mod_ident, accessed by the accessor fn

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

8 years agomod_proxy: follow up to r1729826: really copy conn->ssl_hostname.
Yann Ylavic [Thu, 11 Feb 2016 14:57:04 +0000 (14:57 +0000)]
mod_proxy: follow up to r1729826: really copy conn->ssl_hostname.

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

8 years agoxforms
Jim Jagielski [Thu, 11 Feb 2016 14:10:35 +0000 (14:10 +0000)]
xforms

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

8 years agoABC order and add hcheck
Jim Jagielski [Thu, 11 Feb 2016 14:08:19 +0000 (14:08 +0000)]
ABC order and add hcheck

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

8 years agomore docco: health check and status. Basic info
Jim Jagielski [Thu, 11 Feb 2016 14:05:48 +0000 (14:05 +0000)]
more docco: health check and status. Basic info

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

8 years agomod_proxy_http2: remove code working around issue fixed (hopefully) in 1729826.
Yann Ylavic [Thu, 11 Feb 2016 13:53:07 +0000 (13:53 +0000)]
mod_proxy_http2: remove code working around issue fixed (hopefully) in 1729826.

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

8 years agomod_proxy: Play/restore the TLS-SNI on new backend connections which
Yann Ylavic [Thu, 11 Feb 2016 13:46:39 +0000 (13:46 +0000)]
mod_proxy: Play/restore the TLS-SNI on new backend connections which
had to be issued because the remote closed the previous/reusable one
during idle (keep-alive) time.

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

8 years agoapr_strtok minor invocation change to maybe what everyone is used to
Stefan Eissing [Thu, 11 Feb 2016 09:18:25 +0000 (09:18 +0000)]
apr_strtok minor invocation change to maybe what everyone is used to

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

8 years agoPrefer "goto cleanup" over "do {... if (error) break; ... } while(0)"
Yann Ylavic [Wed, 10 Feb 2016 22:42:57 +0000 (22:42 +0000)]
Prefer "goto cleanup" over "do {... if (error) break; ... } while(0)"
construction for error handling/jump (as suggested by Ruediger).

Hence we can move backend->close = 1 (for mod_proxy_wstunnel) and
proxy_run_detach_backend() (for mod_proxy_http2) in the cleanup fallback.

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

8 years agoMake images align center
Jim Jagielski [Wed, 10 Feb 2016 20:48:58 +0000 (20:48 +0000)]
Make images align center

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

8 years agoAdjust size...
Jim Jagielski [Wed, 10 Feb 2016 20:44:50 +0000 (20:44 +0000)]
Adjust size...

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

8 years agobal-man
Jim Jagielski [Wed, 10 Feb 2016 20:39:28 +0000 (20:39 +0000)]
bal-man

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

8 years ago* Fix properties
Ruediger Pluem [Wed, 10 Feb 2016 20:25:03 +0000 (20:25 +0000)]
* Fix properties

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

8 years agofix xform
Jim Jagielski [Wed, 10 Feb 2016 19:49:36 +0000 (19:49 +0000)]
fix xform

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

8 years agogrrrr... indenting
Jim Jagielski [Wed, 10 Feb 2016 19:49:16 +0000 (19:49 +0000)]
grrrr... indenting

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

8 years agoxform
Jim Jagielski [Wed, 10 Feb 2016 19:46:10 +0000 (19:46 +0000)]
xform

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

8 years agomore info
Jim Jagielski [Wed, 10 Feb 2016 19:45:02 +0000 (19:45 +0000)]
more info

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

8 years ago* Fix compiler warning of unused variable
Ruediger Pluem [Wed, 10 Feb 2016 19:35:34 +0000 (19:35 +0000)]
* Fix compiler warning of unused variable

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

8 years agoand xforms
Jim Jagielski [Wed, 10 Feb 2016 17:24:56 +0000 (17:24 +0000)]
and xforms

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

8 years agoforce to new para
Jim Jagielski [Wed, 10 Feb 2016 17:24:20 +0000 (17:24 +0000)]
force to new para

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

8 years agoAdd in gen'ed files
Jim Jagielski [Wed, 10 Feb 2016 17:23:09 +0000 (17:23 +0000)]
Add in gen'ed files

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

8 years agoNote guide
Jim Jagielski [Wed, 10 Feb 2016 17:20:46 +0000 (17:20 +0000)]
Note guide

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

8 years agoxform
Jim Jagielski [Wed, 10 Feb 2016 17:18:04 +0000 (17:18 +0000)]
xform

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

8 years agoadded dimensioning and mutlti domain sections
Stefan Eissing [Wed, 10 Feb 2016 16:57:29 +0000 (16:57 +0000)]
added dimensioning and mutlti domain sections

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