1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-09 15:21:02 +03:00
Commit Graph

6539 Commits

Author SHA1 Message Date
Joe Orton
483864045c Transforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831175 13f79535-47bb-0310-9956-ffa450edef68
2018-05-08 12:51:38 +00:00
Joe Orton
bba7b9805a mod_ssl: Add support for loading TLS certificates through the PKCS#11
engine.

* modules/ssl/ssl_util.c (modssl_is_engine_id): Renamed
  from modssl_is_engine_key.
  
* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLCertificateKeyFile):
  Adjust accordingly.
  (ssl_cmd_SSLCertificateFile): Also allow ENGINE cert ids.

* modules/ssl/ssl_engine_pphrase.c (modssl_load_engine_keypair):
  Rename from modssl_load_engine_key; load certificate if
  cert id is passed.

* modules/ssl/ssl_engine_init.c (ssl_init_server_certs): Optionally
  load the certificate from the engine as well.

* docs/manual/: Update manual.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831168 13f79535-47bb-0310-9956-ffa450edef68
2018-05-08 12:39:22 +00:00
Lucien Gentis
873c8edd0f Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831032 13f79535-47bb-0310-9956-ffa450edef68
2018-05-06 16:32:44 +00:00
Lucien Gentis
359e24464b XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831031 13f79535-47bb-0310-9956-ffa450edef68
2018-05-06 16:31:53 +00:00
Lucien Gentis
47b9d779f0 Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831030 13f79535-47bb-0310-9956-ffa450edef68
2018-05-06 16:17:49 +00:00
Lucien Gentis
ce1c684613 XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831029 13f79535-47bb-0310-9956-ffa450edef68
2018-05-06 16:16:16 +00:00
Joe Orton
78cfb93f06 Transforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830880 13f79535-47bb-0310-9956-ffa450edef68
2018-05-04 07:09:47 +00:00
Joe Orton
c2671100a5 Use <var> for variables in directive syntax everywhere for
consistency.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830879 13f79535-47bb-0310-9956-ffa450edef68
2018-05-04 07:09:28 +00:00
Joe Orton
ab82a8db27 Transforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830840 13f79535-47bb-0310-9956-ffa450edef68
2018-05-03 16:11:41 +00:00
Joe Orton
04294308f6 mod_ssl: Add support for loading private keys from ENGINEs. Support
for PKCS#11 URIs only, and PIN entry is not threaded through
SSLPassPhraseDialog config yet.

* modules/ssl/ssl_util.c (modssl_is_engine_key): New function.

* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLCertificateKeyFile):
  Use it, skip check for file existence for engine keys.

* modules/ssl/ssl_engine_pphrase.c (modssl_load_engine_pkey):
  New function.

* modules/ssl/ssl_engine_init.c (ssl_init_server_certs):
  For engine keys, load via modssl_load_engine_pkey.

Submitted by: Anderson Sasaki <ansasaki redhat.com>, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830819 13f79535-47bb-0310-9956-ffa450edef68
2018-05-03 13:06:46 +00:00
Luca Toscano
9df2e49e57 Add mod_socache_redis docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830490 13f79535-47bb-0310-9956-ffa450edef68
2018-04-29 06:02:28 +00:00
Luca Toscano
c17a9471f6 documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830489 13f79535-47bb-0310-9956-ffa450edef68
2018-04-29 05:58:52 +00:00
Stefan Eissing
6647764e3b mod_proxy_http2 docs: added section about HTTP/2 PUSH implementation and alternatives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830443 13f79535-47bb-0310-9956-ffa450edef68
2018-04-28 12:13:00 +00:00
Lucien Gentis
2089af807d Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829725 13f79535-47bb-0310-9956-ffa450edef68
2018-04-21 16:28:53 +00:00
Lucien Gentis
7ec611fdc5 XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829722 13f79535-47bb-0310-9956-ffa450edef68
2018-04-21 16:24:52 +00:00
Lucien Gentis
cf7c24a5df XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829720 13f79535-47bb-0310-9956-ffa450edef68
2018-04-21 16:19:21 +00:00
Eric Covener
025ed9b18a rebuild with extraclean to pick up permalinks in
This will make it easier to compare with an extraclean jdk9 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829716 13f79535-47bb-0310-9956-ffa450edef68
2018-04-21 15:59:44 +00:00
Eric Covener
c1f2f93149 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829715 13f79535-47bb-0310-9956-ffa450edef68
2018-04-21 15:45:59 +00:00
Eric Covener
6ca32f9eb4 xforms for mod_filter
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829714 13f79535-47bb-0310-9956-ffa450edef68
2018-04-21 15:43:20 +00:00
Eric Covener
b160984ae3 try to make the mod_filter docs a little more approachable
- more consistently refer to the filters declared via the harness as
   "smart filters"
 - reinforce that the providers are traditional filters.
 - drop some info about the optional type parameter
 - elaborate on examples



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829713 13f79535-47bb-0310-9956-ffa450edef68
2018-04-21 15:42:03 +00:00
Christophe Jaillet
368fa54f78 Improve highlight and make these doc much more readable.
Use the "c" highlight for API description.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829678 13f79535-47bb-0310-9956-ffa450edef68
2018-04-20 21:06:39 +00:00
Christophe Jaillet
9cf83a220a Fix some formating. (extra '.', missing <code>)
Fix the number of available load balancer scheduler algorithms and add a link to the corresponding module. (lbmethod_heartbeat was missing in the list)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829613 13f79535-47bb-0310-9956-ffa450edef68
2018-04-19 20:25:35 +00:00
Christophe Jaillet
c4c948381d These tokens should not be emphasised.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829393 13f79535-47bb-0310-9956-ffa450edef68
2018-04-17 19:58:16 +00:00
Christophe Jaillet
adf6ef9e62 Explain when the surrounding double quotes arround the expr argument MUST be avoided.
Fix an example to add these surrounding quotes to be consistent and in line with 2.4.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829390 13f79535-47bb-0310-9956-ffa450edef68
2018-04-17 19:33:27 +00:00
Lucien Gentis
d72c4bb783 Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829143 13f79535-47bb-0310-9956-ffa450edef68
2018-04-14 14:26:29 +00:00
Lucien Gentis
51cb88aad3 XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829142 13f79535-47bb-0310-9956-ffa450edef68
2018-04-14 14:14:51 +00:00
Eric Covener
bd1ccf5f0a PR62199: add worker parameter ResponseFieldSize to mod_proxy
Submitted By: Hank Ibell
Committed By: covener




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828926 13f79535-47bb-0310-9956-ffa450edef68
2018-04-11 19:11:52 +00:00
Jim Riggs
55b4505765 mod_proxy_balancer: Add hot spare member type and corresponding flag (R). Hot spare members are
used as drop-in replacements for unusable workers in the same load balancer set. This differs
from hot standbys which are only used when all workers in a set are unusable. PR 61140.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828890 13f79535-47bb-0310-9956-ffa450edef68
2018-04-11 12:11:05 +00:00
Rainer Jung
7a7127a659 mod_logio: Add LogIOTrackTTFU and %^FU logformat
to log the time difference between request start
and last request body byte read (finished upload).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828727 13f79535-47bb-0310-9956-ffa450edef68
2018-04-09 14:36:19 +00:00
Lucien Gentis
674a7c8af3 Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828708 13f79535-47bb-0310-9956-ffa450edef68
2018-04-09 12:40:50 +00:00
Lucien Gentis
7323e81fad XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828707 13f79535-47bb-0310-9956-ffa450edef68
2018-04-09 12:40:03 +00:00
Lucien Gentis
96f81bf282 Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828650 13f79535-47bb-0310-9956-ffa450edef68
2018-04-08 16:31:28 +00:00
Lucien Gentis
dc188ff6ba Compatibility and Override elements inversion.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828648 13f79535-47bb-0310-9956-ffa450edef68
2018-04-08 16:28:02 +00:00
Lucien Gentis
00e726d3b0 XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828647 13f79535-47bb-0310-9956-ffa450edef68
2018-04-08 16:26:08 +00:00
Christophe Jaillet
3c74876ff7 Initial doc for the sosache_redis module.
Corrections and improvements welcome.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828626 13f79535-47bb-0310-9956-ffa450edef68
2018-04-08 08:36:09 +00:00
Christophe Jaillet
2e5c64d40a Remove an extra '>'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828584 13f79535-47bb-0310-9956-ffa450edef68
2018-04-07 05:18:01 +00:00
Christophe Jaillet
933a8f6dab Add some compatibility note + some small syntax highlight sugar.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828478 13f79535-47bb-0310-9956-ffa450edef68
2018-04-05 21:13:51 +00:00
Stefan Eissing
50cb9264da On the trunk:
removing leftovers of SSLPolicyDefine from docs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828238 13f79535-47bb-0310-9956-ffa450edef68
2018-04-03 13:39:27 +00:00
Eric Covener
d7e880f420 PR62229: add CGIScriptTimeout to mod_cgi
add CGIScriptTimeout to mod_cgi, like mod_cgid's CGIDScriptTimeout.

Not addressed: making CGIScriptTimeout name work for either module.


Submitted By: Hank Ibell <hwibell gmail.com>
Committed By: covener




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828172 13f79535-47bb-0310-9956-ffa450edef68
2018-04-02 15:22:56 +00:00
Luca Toscano
ec55fff0f2 doc rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828127 13f79535-47bb-0310-9956-ffa450edef68
2018-04-01 07:27:48 +00:00
Luca Toscano
f8f80fe1b2 docs rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828070 13f79535-47bb-0310-9956-ffa450edef68
2018-03-30 15:43:58 +00:00
Luca Toscano
d28916cf7c mod_proxy.xml: docs improvements
Tried to clarify the doubts raised in PR 61225
(related also to 60458) and also split a single note
into multiple ones to improve the reader's attention span
(reading through a long block of text may cause loss
of attention to important details, as it happened to me :)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828069 13f79535-47bb-0310-9956-ffa450edef68
2018-03-30 15:43:40 +00:00
Eric Covener
e7202dce84 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828060 13f79535-47bb-0310-9956-ffa450edef68
2018-03-30 12:40:53 +00:00
Eric Covener
587941ff2a bring balance to the force
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828059 13f79535-47bb-0310-9956-ffa450edef68
2018-03-30 12:40:13 +00:00
Stefan Eissing
352d92c698 On the trunk:
mod_ssl TLSv1.3 support, removed V1_3 cipher suite directives again and added an optional protocol specifier to the SSLCipherSuite and SSLProxyCipherSuite commands.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1827992 13f79535-47bb-0310-9956-ffa450edef68
2018-03-29 14:10:12 +00:00
Christophe Jaillet
b59b7bdfa6 rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1827781 13f79535-47bb-0310-9956-ffa450edef68
2018-03-26 19:40:06 +00:00
Christophe Jaillet
a22567d792 Add a summary and explain at which loglevel the module operates. (related to PR 59088)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1827780 13f79535-47bb-0310-9956-ffa450edef68
2018-03-26 19:39:23 +00:00
Christophe Jaillet
7d98edcfc1 Small tweaks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1827778 13f79535-47bb-0310-9956-ffa450edef68
2018-03-26 18:45:37 +00:00
Stefan Eissing
1c9a4b1a2a On the trunk:
mod_ssl: reverting r1807709 (SSLEngine with addr:port spec) as a "seemed a good idea at the time" thing.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1827760 13f79535-47bb-0310-9956-ffa450edef68
2018-03-26 13:09:27 +00:00
Christophe Jaillet
fa6a8669c2 Rebuilt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1827715 13f79535-47bb-0310-9956-ffa450edef68
2018-03-25 12:45:20 +00:00