1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Commit Graph

396 Commits

Author SHA1 Message Date
Jeff Trawick
be36489772 Remove commented-out SSLStaplingForceURL at global scope.
Global or not, its use is specialized and those that need it won't need a sample,
and others may be confused.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1634736 13f79535-47bb-0310-9956-ffa450edef68
2014-10-27 23:18:16 +00:00
Jeff Trawick
a797fdcf70 add OCSP Stapling configuration, disabled by default
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1633730 13f79535-47bb-0310-9956-ffa450edef68
2014-10-23 00:59:40 +00:00
André Malo
3957e92328 fix tr docs charset
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1564770 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 13:33:29 +00:00
Jeff Trawick
9a8e3d149a httpd allocates separate AF_INET/AF_INET6 sockets automatically
when v4-mapped addresses are disabled


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1560679 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 13:18:02 +00:00
Daniel Gruno
8355586d9d Some wordsmithing and hopefully this will close our outstanding github issues. Closes #2 and also resolves #3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1555427 13f79535-47bb-0310-9956-ffa450edef68
2014-01-04 22:07:46 +00:00
Stefan Fritsch
ecedd50b15 use IANA registered mime type application/font-woff for woff fonts
PR: 55293


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1506674 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 19:42:53 +00:00
Guenter Knauf
c59ebd8421 Changed @exp_sysconfdir@ / @exp_logfiledir@ to relative paths.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1468575 13f79535-47bb-0310-9956-ffa450edef68
2013-04-16 19:39:20 +00:00
Gregg Lewis Smith
54f82283bd typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1438715 13f79535-47bb-0310-9956-ffa450edef68
2013-01-25 21:19:27 +00:00
Fabien Coelho
46c9392d6e macro parameter definitions and uses must match exactly
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1436796 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 08:38:38 +00:00
Rich Bowen
4027c5641e Adds a stub starter file for mod_macro usage, to make people aware that it's there.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1436390 13f79535-47bb-0310-9956-ffa450edef68
2013-01-21 14:56:55 +00:00
Rich Bowen
db7ba71bf1 s/Options/AllowOverride/ in comment describing the syntax of
AllowOverride.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1406905 13f79535-47bb-0310-9956-ffa450edef68
2012-11-08 03:07:01 +00:00
Rich Bowen
4ae8d21fa6 Typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1401133 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 00:36:39 +00:00
Rich Bowen
c53e59d56c Define the document root once, and then use the variable elsewhere, so
that if it gets changed one place it inherits it everywhere. Also, a
practical example of `Define` in action.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1401126 13f79535-47bb-0310-9956-ffa450edef68
2012-10-22 23:42:24 +00:00
Jim Jagielski
8eb1d72558 Keep this in, but commented out: also provide a little
more background/rationale. This, hopefully, satisfies both
ends of the debate: we don't "assume" that everyone who
uses this browser didn't make the specific choice, but
we allow for admins who care about DNT and want to either
  1. Make a statement
  2. Force adherence to the standard
to easily do so.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1388825 13f79535-47bb-0310-9956-ffa450edef68
2012-09-22 16:11:02 +00:00
Eric Covener
5d491ab1ff Revert r1371878 -- default configuration changes that drop the DNT
header from IE10.

See:
  Message-ID: <CALK=YjMGPNHBqNiad-ghzcEzxDovQgYOpjpSSyXmN=r74v43qg@mail.gmail.com>
  PR 53845



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1386913 13f79535-47bb-0310-9956-ffa450edef68
2012-09-17 23:47:33 +00:00
Roy T. Fielding
ad8644d93c Apache does not tolerate deliberate abuse of open standards
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1371878 13f79535-47bb-0310-9956-ffa450edef68
2012-08-11 07:51:52 +00:00
Jeff Trawick
a9896837af mod_socache_shmcb and mod_socache_dbm: finish support of
DefaultRuntimeDir

a partial conversion was made in r1299718, affecting cases
where no filename was specified


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1370225 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 12:44:30 +00:00
Jeff Trawick
b6f86b92c2 The Pidfile directive and ap_log_pid()/ap_remove_pid()/ap_read_pid()
now respect DefaultRuntimeDir


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1369808 13f79535-47bb-0310-9956-ffa450edef68
2012-08-06 12:15:03 +00:00
Jeff Trawick
9c3a143395 doc fixes for r1299718:
The value of ScriptSock is relative to DefaultRuntimeDir.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1369604 13f79535-47bb-0310-9956-ffa450edef68
2012-08-05 14:33:53 +00:00
Rainer Jung
e7f65d7aac Add a docs link to a configuration example.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1368053 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 15:25:02 +00:00
Stefan Fritsch
6dd8ce1c33 Add some improvements as suggested by Kaspar
- expand comment in config file
- check username == NULL
- detect SRP support via SSL_CTRL_SET_TLS_EXT_SRP_USERNAME_CB, not via openssl
  version
- rename rv variable


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1348653 13f79535-47bb-0310-9956-ffa450edef68
2012-06-10 19:50:25 +00:00
Stefan Fritsch
ccf77a856a Add support for TLS-SRP (Secure Remote Password key exchange
for TLS, RFC 5054).

PR: 51075
Submitted by: Quinn Slack <sqs cs stanford edu>, Christophe Renou,
              Peter Sylvester


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1347980 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 09:38:44 +00:00
Daniel Gruno
28a9c0d0ab Updated event mpm configuration to match the defaults in documentation and header definitions.
Updated prefork defaults to better match documentation and header definition.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1306841 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 13:19:37 +00:00
Daniel Gruno
5dc724c120 Update worker mpm defaults to match documentation and built-in defaults.
As per https://issues.apache.org/bugzilla/show_bug.cgi?id=52102

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1306426 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 15:33:04 +00:00
Igor Galić
77fddfd14f Adapt Timeout to be the same as DEFAULT_TIMEOUT.
After all it's localted in a file called extra/httpd-default.conf


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1306350 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 14:09:32 +00:00
Roy T. Fielding
a53c9e36ab Unregistered media types in common use, according to Wikipedia and MS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1301894 13f79535-47bb-0310-9956-ffa450edef68
2012-03-17 08:58:59 +00:00
Roy T. Fielding
795da501c5 new IANA media types as of 2012 Mar 16 18:55 PDT
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1301867 13f79535-47bb-0310-9956-ffa450edef68
2012-03-17 05:59:06 +00:00
Rich Bowen
cf0345a75f Based on feedback from Vincent from the docs team, change the examples
to ones that correspond with our default values.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1241071 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 16:46:39 +00:00
Rich Bowen
65b2deb6c1 Bah. The word is "whereas", not "where as"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1241069 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 16:40:32 +00:00
Rich Bowen
2cf18f47d8 Fixes issue 52604. Depending on the value of @rel_logfiledir@ the
example may or may not start with a "/", rendering the example wrong in
some cases, as described in that bugzilla issue. Changes the example to
literal strings so there can be no ambiguity.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1241066 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 16:36:28 +00:00
Roy T. Fielding
036e5528c6 More registered media types
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229930 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 08:29:46 +00:00
Graham Leggett
a03bcce31d mod_policy: Add a new testing module to help server administrators
enforce a configurable level of protocol compliance on their
servers and application servers behind theirs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1221668 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 10:42:34 +00:00
Kaspar Brand
96746b9253 Change the SSLCipherSuite default to a shorter, whitelist
oriented definition, and add an example for a speed-optimized
configuration (commented out by default).

In the SSL How-To, streamline the SSLCipherSuite examples where
applicable (explicitly banning EXP and NULL is not needed when
only HIGH is specified).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203752 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 17:17:20 +00:00
Stefan Fritsch
253d865fe4 Set MaxMemFree 2048 by default
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1201158 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 01:54:50 +00:00
Paul Querna
b8cb50f6ef Default to not allowing htaccess in /, instead of just the documentroot, which gets a nice 10% performance boost by default for me.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200478 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 19:01:54 +00:00
Nick Kew
6f00541520 proxy-html.conf needs to be included automatically
if mod_proxy_html is loaded.  Otherwise it's a big
gotcha when mod_proxy_html just does nothing at all!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200069 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 00:51:42 +00:00
Nick Kew
da6343c864 Add default proxy-html.conf file (defines links to be rewritten
according to W3C HTML 4 and XHTML 1).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200060 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 00:23:30 +00:00
Stefan Fritsch
5f666a2385 mod_reqtimeout: Change the default to set some reasonable timeout values if loaded
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199447 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 20:41:47 +00:00
Stefan Fritsch
0b26b48e9c mod_mime_magic: Add signatures for PNG and SWF to the example config.
PR: 48352
Submitted by: Jeremy Wagner-Kaiser <jwagner-kaiser adknowledge com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180725 13f79535-47bb-0310-9956-ffa450edef68
2011-10-09 21:52:42 +00:00
Kaspar Brand
574bda626b Add SSLCARevocationCheck directive to default mod_ssl config
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1178695 13f79535-47bb-0310-9956-ffa450edef68
2011-10-04 06:08:02 +00:00
Rainer Jung
37581e8385 Clarify configuration comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1177210 13f79535-47bb-0310-9956-ffa450edef68
2011-09-29 08:22:13 +00:00
Guenter Knauf
0eeeb59cd0 Fixed MaxRanges config block.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1169599 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 03:40:28 +00:00
Guenter Knauf
eaa9b29fa0 Added MaxRanges to httpd.conf.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1164861 13f79535-47bb-0310-9956-ffa450edef68
2011-09-03 13:18:09 +00:00
Stefan Fritsch
6d8de2ff42 Rename MaxClients to MaxRequestWorkers which describes more accurately what
it does.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1137744 13f79535-47bb-0310-9956-ffa450edef68
2011-06-20 19:00:52 +00:00
Stefan Fritsch
c4471432a3 Update redirect-carefully workaround for WebDAVFS 1.4, Konqueror 4.x
PR: 43031
Submitted by: Hans de Graaff, Stefan Fritsch


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1135286 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 21:13:08 +00:00
Stefan Fritsch
b41bf3dbf0 Disable AECDH ciphers in example config by using !aNULL (which includes
all ciphers without authentication.

PR: 51363
Submitted by: Rob Stradling <rob comodo com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1135234 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 19:21:57 +00:00
Stefan Fritsch
8b4732f494 Make the MSIE BrowserMatch regexp fit for MSIE 10. Remove useless '.*'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1132793 13f79535-47bb-0310-9956-ffa450edef68
2011-06-06 21:46:14 +00:00
Stefan Fritsch
a739d71433 Use Require method instead of deprecated Limit/LimitExcept
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1132790 13f79535-47bb-0310-9956-ffa450edef68
2011-06-06 21:40:41 +00:00
Rainer Jung
60cda844f8 Minor mime.types fixes:
- Change application/vnd.oasis.opendocument.text-master from otm to odm
  - Comment application/vnd.ms-office.activex+xml and video/vnd.dece.mp4
    because no suffixes were defined for those types.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1099022 13f79535-47bb-0310-9956-ffa450edef68
2011-05-03 11:47:59 +00:00
Roy T. Fielding
343f36deb0 Newly approved types for n3 and turtle
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1085785 13f79535-47bb-0310-9956-ffa450edef68
2011-03-26 19:05:55 +00:00