]> granicus.if.org Git - apache/log
apache
8 years agoClarification of mod_access_compact and mod_authz_host usage.
Luca Toscano [Fri, 8 Apr 2016 08:06:40 +0000 (08:06 +0000)]
Clarification of mod_access_compact and mod_authz_host usage.

A recent email in docs@ brought up an interesting use case, namely mixing
mod_access_compact (Order, Deny, Allow) and mod_authz_host (Require) directives
while migrating from 2.2 to 2.4. This is technically possible but it leads
to a lot of confusion due to how config merge works between these modules. This change adds
some examples on the documentation about things that might go wrong when mixing
old and new directives, stating clearly that mod_access_compact or mod_authz_host
should not be used together.

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

8 years agoRevision metadata updates after recent change.
Luca Toscano [Fri, 8 Apr 2016 07:58:14 +0000 (07:58 +0000)]
Revision metadata updates after recent change.

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

8 years agoDocumentation rebuild
Luca Toscano [Tue, 5 Apr 2016 09:47:07 +0000 (09:47 +0000)]
Documentation rebuild

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

8 years agoAdded more info for the ListenCoresBucketsRatio directive and mentioned it in MinSpar...
Luca Toscano [Tue, 5 Apr 2016 09:46:40 +0000 (09:46 +0000)]
Added more info for the ListenCoresBucketsRatio directive and mentioned it in MinSpareThreads

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

8 years agoxforms
Christophe Jaillet [Tue, 5 Apr 2016 05:49:17 +0000 (05:49 +0000)]
xforms

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

8 years agoTypo
Christophe Jaillet [Tue, 5 Apr 2016 05:47:53 +0000 (05:47 +0000)]
Typo

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

8 years agoxforms
Christophe Jaillet [Tue, 5 Apr 2016 05:18:43 +0000 (05:18 +0000)]
xforms

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

8 years agoAdd some missing hyperlinks to the corresponding directives.
Christophe Jaillet [Tue, 5 Apr 2016 05:18:18 +0000 (05:18 +0000)]
Add some missing hyperlinks to the corresponding directives.

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

8 years agoFix the -H|-h flag as spotted by Pete in the online doc.
Christophe Jaillet [Tue, 5 Apr 2016 05:10:49 +0000 (05:10 +0000)]
Fix the -H|-h flag as spotted by Pete  in the online doc.
Add the missing -ne in RewriteCond

Add some missing hyperlinks to the corresponding directives.

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

8 years agoFix the -H|-h flag as spotted by Pete in the online doc.
Christophe Jaillet [Tue, 5 Apr 2016 05:09:25 +0000 (05:09 +0000)]
Fix the -H|-h flag as spotted by Pete  in the online doc.
Add the missing -ne in RewriteCond

Add some missing hyperlinks to the corresponding directives.

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

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Mon, 4 Apr 2016 11:33:31 +0000 (11:33 +0000)]
Support for OpenSSL 1.1.0:
- BIO was made opaque after OpenSSL 1.1.0pre4.

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

8 years agoRebuild.
Lucien Gentis [Sat, 2 Apr 2016 16:22:20 +0000 (16:22 +0000)]
Rebuild.

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

8 years agoXML updates.
Lucien Gentis [Sat, 2 Apr 2016 16:20:05 +0000 (16:20 +0000)]
XML updates.

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

8 years agoAdd the <!--#comment ... --> syntax.
Christophe Jaillet [Sat, 2 Apr 2016 08:53:35 +0000 (08:53 +0000)]
Add the <!--#comment ... --> syntax.
Idea from Rob.

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

8 years agoxforms
Christophe Jaillet [Sat, 2 Apr 2016 06:29:10 +0000 (06:29 +0000)]
xforms

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

8 years agoImprove hyperlinks
Christophe Jaillet [Sat, 2 Apr 2016 06:28:24 +0000 (06:28 +0000)]
Improve hyperlinks

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

8 years agompm_worker: follow up to r1737449.
Yann Ylavic [Fri, 1 Apr 2016 22:59:21 +0000 (22:59 +0000)]
mpm_worker: follow up to r1737449.
Same spurious (duplicated) local variable removal, this time for mpm_worker.

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

8 years agompm_event, mpm_worker: No functional change.
Yann Ylavic [Fri, 1 Apr 2016 22:51:11 +0000 (22:51 +0000)]
mpm_event, mpm_worker: No functional change.
Remove one spurious (duplicated) local variable and split some long lines.

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

8 years agompm_event, mpm_worker: Fix computation of MinSpareThreads' lower bound
Yann Ylavic [Fri, 1 Apr 2016 22:18:58 +0000 (22:18 +0000)]
mpm_event, mpm_worker: Fix computation of MinSpareThreads' lower bound
according the number of listeners buckets.

We want the number of children processes to be a multiple of the number of
buckets so to optimally accept connections (the system will distribute them
accross all the buckets/listeners anyway, thus children must follow).

For MinSpareThreads, this means that we need neither more nor less than one
thread above 'threads_per_child * (num_buckets - 1)' to achieve this, since
each created child adds threads_per_child workers.

Actually, given that perform_idle_server_maintenance() is called per bucket,
and hence checks 'threads_per_child / num_buckets' for one bucket, let's lower
bound MinSpareThreads to 'threads_per_child * (num_buckets - 1) + num_buckets'.

Previously we used 'threads_per_child * num_buckets' which caused one spurious
child to be created from the very first busy worker thread of each newly added
child.

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

8 years agoxforms
Christophe Jaillet [Fri, 1 Apr 2016 20:18:04 +0000 (20:18 +0000)]
xforms

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

8 years agoFix typo (extra sapce) in example spoted by Juan Antonio Rua Soto in online doc.
Christophe Jaillet [Fri, 1 Apr 2016 20:17:44 +0000 (20:17 +0000)]
Fix typo (extra sapce) in example spoted by Juan Antonio Rua Soto in online doc.

Add a few more links to modules and directives (more could be done)

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

8 years agoUpdating .xml.* files too
Luca Toscano [Fri, 1 Apr 2016 14:27:32 +0000 (14:27 +0000)]
Updating .xml.* files too

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

8 years agoRemove some backported CHANGES entries.
Yann Ylavic [Fri, 1 Apr 2016 14:26:17 +0000 (14:26 +0000)]
Remove some backported CHANGES entries.

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

8 years agoDocumentation rebuild
Luca Toscano [Fri, 1 Apr 2016 14:22:51 +0000 (14:22 +0000)]
Documentation rebuild

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

8 years agoReverting my previous commit due to dev feedbacks
Luca Toscano [Fri, 1 Apr 2016 14:21:11 +0000 (14:21 +0000)]
Reverting my previous commit due to dev feedbacks

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

8 years agoDocumentation rebuild
Luca Toscano [Fri, 1 Apr 2016 13:31:42 +0000 (13:31 +0000)]
Documentation rebuild

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

8 years agoAdded warning for AllowOverrideList None in the mod-core doc (PR 58528)
Luca Toscano [Fri, 1 Apr 2016 13:31:28 +0000 (13:31 +0000)]
Added warning for AllowOverrideList None in the mod-core doc (PR 58528)

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

8 years agomod_ssl: follow up to r1734561 and r1735337.
Yann Ylavic [Thu, 31 Mar 2016 18:24:06 +0000 (18:24 +0000)]
mod_ssl: follow up to r1734561 and r1735337.

We also need to reset the X509_STORE_CTX's error in the callback to quiet
X509_V_ERR_UNABLE_TO_GET_CRL for the leaf certificate (caught by AH02010).

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

8 years agoupdate after backport
Stefan Eissing [Thu, 31 Mar 2016 16:30:19 +0000 (16:30 +0000)]
update after backport

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

8 years agomod_http2: removing some flushes on main connection
Stefan Eissing [Thu, 31 Mar 2016 16:02:48 +0000 (16:02 +0000)]
mod_http2: removing some flushes on main connection

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

8 years agoSet $LastChangedRevision.
Yann Ylavic [Thu, 31 Mar 2016 07:44:39 +0000 (07:44 +0000)]
Set $LastChangedRevision.

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

8 years agotakashi's TODO script needs this colon.
Yann Ylavic [Thu, 31 Mar 2016 07:26:01 +0000 (07:26 +0000)]
takashi's TODO script needs this colon.
Reported by: Luis Gil <ljgbpfeiffer googlemail.com>

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

8 years ago* Dreaded Umlauts :-). Use the usual transcription for those to be consistent
Ruediger Pluem [Wed, 30 Mar 2016 19:04:17 +0000 (19:04 +0000)]
* Dreaded Umlauts :-). Use the usual transcription for those to be consistent
  with other entries in the file.

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

8 years agomod_http2: new vars, keepalive increase, no slave reuse when con->keepalive not set...
Stefan Eissing [Wed, 30 Mar 2016 15:35:58 +0000 (15:35 +0000)]
mod_http2: new vars, keepalive increase, no slave reuse when con->keepalive not set properly

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

8 years agoMissed changes for r1737114
Daniel Ruggeri [Wed, 30 Mar 2016 13:40:15 +0000 (13:40 +0000)]
Missed changes for r1737114

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

8 years agoFix bug 58528 - Do not read .htaccess if override and overridelist are "None"
Daniel Ruggeri [Wed, 30 Mar 2016 13:31:07 +0000 (13:31 +0000)]
Fix bug 58528 - Do not read .htaccess if override and overridelist are "None"

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

8 years agocore: '!x == 0' => 'x != 0' to avoid a compiler warning (suggesting parens).
Yann Ylavic [Wed, 30 Mar 2016 11:30:50 +0000 (11:30 +0000)]
core: '!x == 0' => 'x != 0' to avoid a compiler warning (suggesting parens).

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

8 years agomod_http2: incrementing keepalives on each request started so that logging
Stefan Eissing [Wed, 30 Mar 2016 11:25:29 +0000 (11:25 +0000)]
mod_http2: incrementing keepalives on each request started so that logging
     %k gives increasing numbers per master http2 connection.

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

8 years agoFollow up to r1737053: add newly generated files.
Yann Ylavic [Wed, 30 Mar 2016 10:51:16 +0000 (10:51 +0000)]
Follow up to r1737053: add newly generated files.

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

8 years agomake docs.
Yann Ylavic [Tue, 29 Mar 2016 21:21:11 +0000 (21:21 +0000)]
make docs.

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

8 years agoFollow up to r1737042.
Yann Ylavic [Tue, 29 Mar 2016 21:19:41 +0000 (21:19 +0000)]
Follow up to r1737042.
s/<glossary href/<glossary ref/g and xml fixes.

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

8 years agoUpdate spanish translation.
Yann Ylavic [Tue, 29 Mar 2016 20:21:52 +0000 (20:21 +0000)]
Update spanish translation.

Submitted by: Luis Gil de Bernabé Pfeiffer <ljgbpfeiffer googlemail.com>
Reviewed by: Sergio Ramos

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

8 years agomod_http2: fix for wrong handling of prefetched response bodies
Stefan Eissing [Tue, 29 Mar 2016 16:54:25 +0000 (16:54 +0000)]
mod_http2: fix for wrong handling of prefetched response bodies

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

8 years agoSome flow improvements...
Jim Jagielski [Tue, 29 Mar 2016 16:47:05 +0000 (16:47 +0000)]
Some flow improvements...

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

8 years agomod_proxy_express: Fix possible use of DB handle after close.
Yann Ylavic [Tue, 29 Mar 2016 15:48:00 +0000 (15:48 +0000)]
mod_proxy_express: Fix possible use of DB handle after close.
PR 59230.

Submitted by: Petr <pgajdos suse.cz>
Reviewed/Committed by: ylavic

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

8 years agomod_http2: more effient passing of response bodies
Stefan Eissing [Tue, 29 Mar 2016 13:28:18 +0000 (13:28 +0000)]
mod_http2: more effient passing of response bodies

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

8 years agoxforms
Christophe Jaillet [Sat, 26 Mar 2016 23:07:04 +0000 (23:07 +0000)]
xforms

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

8 years agoSynch with 2.4.x
Christophe Jaillet [Sat, 26 Mar 2016 23:06:22 +0000 (23:06 +0000)]
Synch with 2.4.x

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

8 years agodocumentation rebuild
Luca Toscano [Sat, 26 Mar 2016 08:21:40 +0000 (08:21 +0000)]
documentation rebuild

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

8 years agoAdded HTTP/2 guide among the howtos
Luca Toscano [Sat, 26 Mar 2016 08:21:23 +0000 (08:21 +0000)]
Added HTTP/2 guide among the howtos

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

8 years agoUploading http2 howto
Luca Toscano [Sat, 26 Mar 2016 08:10:32 +0000 (08:10 +0000)]
Uploading http2 howto

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

8 years agoxforms
Christophe Jaillet [Sat, 26 Mar 2016 07:54:46 +0000 (07:54 +0000)]
xforms

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

8 years agoAdd missing space between directives and parameters.
Christophe Jaillet [Sat, 26 Mar 2016 07:51:51 +0000 (07:51 +0000)]
Add missing space between directives and parameters.
Improve syntax highlight.

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

8 years agoFix missing space in log message
Christophe Jaillet [Sat, 26 Mar 2016 06:24:55 +0000 (06:24 +0000)]
Fix missing space in log message

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

8 years agoFix formatting, highlighting of examples.
Rich Bowen [Fri, 25 Mar 2016 15:35:24 +0000 (15:35 +0000)]
Fix formatting, highlighting of examples.

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

8 years agoRebuild.
Lucien Gentis [Fri, 25 Mar 2016 14:51:08 +0000 (14:51 +0000)]
Rebuild.

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

8 years agoXML update.
Lucien Gentis [Fri, 25 Mar 2016 14:49:44 +0000 (14:49 +0000)]
XML update.

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

8 years agoprotect logic in case backend == NULL
Jim Jagielski [Fri, 25 Mar 2016 12:14:30 +0000 (12:14 +0000)]
protect logic in case backend == NULL

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

8 years agomod_http2: fix for scoreboard updates missing, mem leak fix for slave connections
Stefan Eissing [Thu, 24 Mar 2016 16:36:37 +0000 (16:36 +0000)]
mod_http2: fix for scoreboard updates missing, mem leak fix for slave connections

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

8 years agorebuild
Rich Bowen [Thu, 24 Mar 2016 14:40:05 +0000 (14:40 +0000)]
rebuild

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

8 years agoErrorDocument is not a section directive.
Rich Bowen [Thu, 24 Mar 2016 14:24:57 +0000 (14:24 +0000)]
ErrorDocument is not a section directive.

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

8 years agoFollow up to r1736217: really bump MMN minor.
Yann Ylavic [Thu, 24 Mar 2016 11:36:15 +0000 (11:36 +0000)]
Follow up to r1736217: really bump MMN minor.

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

8 years agomod_http2: no variadic macro in C89, use equivalent function.
Yann Ylavic [Tue, 22 Mar 2016 20:46:19 +0000 (20:46 +0000)]
mod_http2: no variadic macro in C89, use equivalent function.

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

8 years agoFix missing limits.h header, required for 2.4.next release,
William A. Rowe Jr [Tue, 22 Mar 2016 20:06:32 +0000 (20:06 +0000)]
Fix missing limits.h header, required for 2.4.next release,
masked on many platforms by intrinsic limits.h inclusion by
other headers.

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

8 years agoFollow up to r1734656, r1736216, r1736225: more correct pointer size semantic.
Yann Ylavic [Tue, 22 Mar 2016 18:25:46 +0000 (18:25 +0000)]
Follow up to r1734656, r1736216, r1736225: more correct pointer size semantic.

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

8 years agoFollow up to r1734656, r1736216: use correct pointer size semantic.
Yann Ylavic [Tue, 22 Mar 2016 18:23:08 +0000 (18:23 +0000)]
Follow up to r1734656, r1736216: use correct pointer size semantic.

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

8 years agocore: Add missing AP_IMPLEMENT_OPTIONAL_HOOK_RUN_FIRST.
Yann Ylavic [Tue, 22 Mar 2016 17:38:20 +0000 (17:38 +0000)]
core: Add missing AP_IMPLEMENT_OPTIONAL_HOOK_RUN_FIRST.

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

8 years agoFollow up to r1734656: restore c->data_in_input_filters usage to
Yann Ylavic [Tue, 22 Mar 2016 17:08:29 +0000 (17:08 +0000)]
Follow up to r1734656: restore c->data_in_input_filters usage to
see if it helps unblocking test framework.

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

8 years agomod_ssl: return non ambiguous value in ssl_callback_SessionTicket() for
Yann Ylavic [Tue, 22 Mar 2016 13:09:17 +0000 (13:09 +0000)]
mod_ssl: return non ambiguous value in ssl_callback_SessionTicket() for
encryption mode (we used to return 0, OpenSSL documents returning 1 instead).

Practically this does not change anything since OpenSSL will only check for
>= 0 return value (non error) for encryption mode (the other possible return
values are only relevant for decryption mode).

However the OpenSSL documentation for SSL_CTX_set_tlsext_ticket_key_cb()
states:
"
The return value of the cb function is used by OpenSSL to determine what
further processing will occur. The following return values have meaning:

2
    This indicates that the ctx and hctx have been set and the session can
    continue on those parameters. Additionally it indicates that the session
    ticket is in a renewal period and should be replaced. The OpenSSL library
    will call cb again with an enc argument of 1 to set the new ticket (see
    RFC5077 3.3 paragraph 2).

1
    This indicates that the ctx and hctx have been set and the session can
    continue on those parameters.

0
    This indicates that it was not possible to set/retrieve a session ticket
    and the SSL/TLS session will continue by by negotiating a set of
    cryptographic parameters or using the alternate SSL/TLS resumption
    mechanism, session ids.
    If called with enc equal to 0 the library will call the cb again to get a
    new set of parameters.

less than 0
    This indicates an error.
"

So 0 is not appropriate in our code, 1 is what we really want (and it won't
break if OpenSSL later changes its checks on the callback return value).

Reported/Proposed by: oknet on github, pull request #18.

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

8 years agoadding missing source h2_ngn_shed.c for win build
Stefan Eissing [Tue, 22 Mar 2016 09:02:17 +0000 (09:02 +0000)]
adding missing source h2_ngn_shed.c for win build

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

8 years agoupdate transformation
André Malo [Mon, 21 Mar 2016 12:43:10 +0000 (12:43 +0000)]
update transformation

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

8 years agoDOCUMENT_ARGS in 2.4.19
Jeff Trawick [Mon, 21 Mar 2016 12:38:58 +0000 (12:38 +0000)]
DOCUMENT_ARGS in 2.4.19

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

8 years agoMention cgi_var_rules, fix expr_handler typos
Jeff Trawick [Mon, 21 Mar 2016 12:09:27 +0000 (12:09 +0000)]
Mention cgi_var_rules, fix expr_handler typos

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

8 years agoCheck for proxy_detach_backend hook, for 2.4.x compatibility
Jeff Trawick [Mon, 21 Mar 2016 11:45:44 +0000 (11:45 +0000)]
Check for proxy_detach_backend hook, for 2.4.x compatibility

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

8 years agoh2_proxy_session: fill in missing APLOGNO()s.
Yann Ylavic [Mon, 21 Mar 2016 10:22:48 +0000 (10:22 +0000)]
h2_proxy_session: fill in missing APLOGNO()s.

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

8 years agoFollow up to r1735882: fill in APLOGNO().
Yann Ylavic [Mon, 21 Mar 2016 10:21:52 +0000 (10:21 +0000)]
Follow up to r1735882: fill in APLOGNO().

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

8 years agofix APLOGNO at wrong place, me stupid
Stefan Eissing [Mon, 21 Mar 2016 09:47:58 +0000 (09:47 +0000)]
fix APLOGNO at wrong place, me stupid

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

8 years agoAPLOGNO update for mod_proxy_http2
Stefan Eissing [Mon, 21 Mar 2016 09:17:36 +0000 (09:17 +0000)]
APLOGNO update for mod_proxy_http2

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

8 years agoAPLOGNO tagging
Stefan Eissing [Mon, 21 Mar 2016 09:17:13 +0000 (09:17 +0000)]
APLOGNO tagging

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

8 years agolatest additions to netware build by NormW
Stefan Eissing [Mon, 21 Mar 2016 08:59:46 +0000 (08:59 +0000)]
latest additions to netware build by NormW

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

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Mon, 21 Mar 2016 08:47:15 +0000 (08:47 +0000)]
Support for OpenSSL 1.1.0:
  - Followup to r1735875:
    ssl_util_thread_setup() is gone.

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

8 years agoAvoid a call to 'prep_walk_cache' if possible, just as in 'ap_if_walk' and 'ap_locati...
Christophe Jaillet [Sun, 20 Mar 2016 21:22:14 +0000 (21:22 +0000)]
Avoid a call to 'prep_walk_cache' if possible, just as in 'ap_if_walk' and 'ap_location_walk'

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

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Sun, 20 Mar 2016 18:26:22 +0000 (18:26 +0000)]
Support for OpenSSL 1.1.0:
- ab: use new API SSL_CTX_set_max_proto_version()
  and SSL_CTX_set_min_proto_version() in
  combination with TLS_client_method() instead
  of the old deprecated methods.

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

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Sun, 20 Mar 2016 14:23:06 +0000 (14:23 +0000)]
Support for OpenSSL 1.1.0:
- The callback function passed to
  SSL_CTX_sess_set_get_cb() now needs the
  session id argument to be const.
  So constify the session id.

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

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Sun, 20 Mar 2016 14:20:52 +0000 (14:20 +0000)]
Support for OpenSSL 1.1.0:
- use new API SSL_CTX_set_max_proto_version()
  and SSL_CTX_set_min_proto_version() instead
  of SSL_CTX_set_options()
- use new methods TLS_client_method() and
  TLS_server_method()

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

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Sun, 20 Mar 2016 13:23:35 +0000 (13:23 +0000)]
Support for OpenSSL 1.1.0:
- ERR_remove_thread_state() no longer has an
  argument.

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

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Sun, 20 Mar 2016 13:21:46 +0000 (13:21 +0000)]
Support for OpenSSL 1.1.0:
- SRP_VBASE_get_by_user() is deprecated now,
  one should use SRP_VBASE_get1_by_user()
  instead. The new function returns a pointer
  owned by the callee. It must be freed after
  use.

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

8 years agoSupport for OpenSSL 1.1.0:
Rainer Jung [Sun, 20 Mar 2016 13:10:05 +0000 (13:10 +0000)]
Support for OpenSSL 1.1.0:
- remove thread locking. It is now builtin
  for OpenSSL 1.1.0

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

8 years agoDon't check for presence of ap_log_cdata/ap_log_data
Jeff Trawick [Sat, 19 Mar 2016 20:41:31 +0000 (20:41 +0000)]
Don't check for presence of ap_log_cdata/ap_log_data

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

8 years agofix order of lowercase/compare for r->handler
Eric Covener [Sat, 19 Mar 2016 16:48:19 +0000 (16:48 +0000)]
fix order of lowercase/compare for r->handler

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

8 years agomod_proxy_http2: removed duplicate log code after review
Stefan Eissing [Sat, 19 Mar 2016 10:16:02 +0000 (10:16 +0000)]
mod_proxy_http2: removed duplicate log code after review

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

8 years agoDocumentation rebuild
Luca Toscano [Fri, 18 Mar 2016 23:02:06 +0000 (23:02 +0000)]
Documentation rebuild

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

8 years agoAdded notes to the HTTP/2 howto
Luca Toscano [Fri, 18 Mar 2016 23:01:47 +0000 (23:01 +0000)]
Added notes to the HTTP/2 howto

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

8 years agoRemove leftover comment
Christophe Jaillet [Fri, 18 Mar 2016 20:02:02 +0000 (20:02 +0000)]
Remove leftover comment

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

8 years agoAdd missing proxy_run_detach_backend() on error path
Jeff Trawick [Fri, 18 Mar 2016 17:33:40 +0000 (17:33 +0000)]
Add missing proxy_run_detach_backend() on error path

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

8 years agomod_http2: prohibit unnecessary flushing on master conn
Stefan Eissing [Fri, 18 Mar 2016 15:08:51 +0000 (15:08 +0000)]
mod_http2: prohibit unnecessary flushing on master conn

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

8 years agomod_http2: oops, forgot a rename
Stefan Eissing [Fri, 18 Mar 2016 14:30:17 +0000 (14:30 +0000)]
mod_http2: oops, forgot a rename

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

8 years agomod_http2: some cleanup in GGOAWAY handling, disabling PUSH when rmeote sends GOAWAY
Stefan Eissing [Fri, 18 Mar 2016 14:24:13 +0000 (14:24 +0000)]
mod_http2: some cleanup in GGOAWAY handling, disabling PUSH when rmeote sends GOAWAY

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

8 years agoupdate transformation
André Malo [Thu, 17 Mar 2016 20:19:13 +0000 (20:19 +0000)]
update transformation

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

8 years agofix eol style
André Malo [Thu, 17 Mar 2016 20:16:33 +0000 (20:16 +0000)]
fix eol style

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