www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-02 06:53:27 +03:00
Code Activity
23,732 Commits 62 Branches 304 Tags
80d0cb1585e4c08682fd6e6252eaf48b7e24ffb7
Commit Graph

377 Commits

Author SHA1 Message Date
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
Roy T. Fielding
233d406469 Add the unregistered media type for 7z 
PR: 46959


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1085573 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-25 21:58:27 +00:00
Roy T. Fielding
217485c7e1 Add the WebP and webfont media types (that have not been registered by 
the same WHATWG idiots who regularly complain about servers not being
configured correctly for mime types).

PR: 50624



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1085522 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-25 19:08:39 +00:00
Roy T. Fielding
6afbc553f6 Add the WebM media types (that have not been registered by the same WHATWG 
idiots who regularly complain about servers not being configured correctly
for mime types).

PR: 50624


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1085507 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-25 18:40:31 +00:00
Roy T. Fielding
ad28ddcc2d Fix duplicate entry for application/vnd.stardivision.writer 
PR: 48052


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1085498 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-25 18:11:52 +00:00
Roy T. Fielding
2326e1d3a1 Update with IANA registered types as of 2011 Mar 25 15:08 CET 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1085496 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-25 18:05:55 +00:00
Rich Bowen
15c52ebab6 Moves the DocumentRoot declaration down to immediately above the 
<Directory $document_root> block, so that they are clearly related to
one another, rather than having to have the comment referring back up 20
lines.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1080291 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-10 17:22:42 +00:00
Rich Bowen
a0eb6f65b3 igalic reminded me that AllowOverride now defaults to none, and Options 
now defaults to FollowSymlinks, so simplify this entire section and thus
reduce the chance that people will tinker with it. Remove scary warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1080290 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-10 17:18:40 +00:00
Rich Bowen
745c6073d9 Warn the server admin not to relax the security of <Directory /> 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1080111 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-10 02:41:19 +00:00
Rich Bowen
fa9c874ebd Adds the simplified chinese translation to the default manual 
configuration file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1080109 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-10 02:33:56 +00:00
Rich Bowen
33055cde74 Remove NameVirtualHost, as it causes a startup warning. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1059054 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-14 16:09:18 +00:00
André Malo
f46b6a4804 add danish language 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1042446 13f79535-47bb-0310-9956-ffa450edef68
 2010-12-05 21:02:52 +00:00
Igor Galić
a321222454 pr#50371 whoops, missed something. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1041012 13f79535-47bb-0310-9956-ffa450edef68
 2010-12-01 14:01:57 +00:00
Igor Galić
fce2218117 pr#50371 no more pcre 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1041011 13f79535-47bb-0310-9956-ffa450edef68
 2010-12-01 13:52:56 +00:00
Stefan Fritsch
5bcd082e3d Rename MaxRequestsPerChild to MaxConnectionsPerChild, which 
describes more accurately what the directive does.

The old name still works but logs a warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1021924 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-12 21:12:37 +00:00
Stefan Fritsch
a0e0e585b0 Disable sendfile by default, as discussed at 
http://mail-archives.apache.org/mod_mbox/httpd-dev/201007.mbox/<4C4355EE.2060605@rowe-clan.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@992689 13f79535-47bb-0310-9956-ffa450edef68
 2010-09-04 21:53:06 +00:00
Rainer Jung
98b9ff5728 Update SSL cipher suite and add example for SSLHonorCipherOrder. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@966160 13f79535-47bb-0310-9956-ffa450edef68
 2010-07-21 09:54:59 +00:00
Greg Stein
9b90637efc Fix up some SSL configuration, per issue #49484. IE6 had a hotfix released 
for this problem quite a while back (see kb 921090), so restrict the
modified behavior to the old/unsupported browsers.

* docs/conf/extra/http-ssl.conf.in:
  (): tighten up the regex to only select old MSIE browsers for the
    downgrade in http behavior. this allows IE6 to run much faster.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@966055 13f79535-47bb-0310-9956-ffa450edef68
 2010-07-20 23:33:18 +00:00
Rainer Jung
cdc8db7eb5 Add a configuration block for Event MPM. 
Event is now the default MPM for many platforms,
so we should provide an explicit configuration.

Discussion for good values to follow.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@955033 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-15 20:08:49 +00:00
Rainer Jung
12b699719a Update comment about required modules in extra configuration files. 
Mostly adding the information to the vhost and ssl files,
and adding mod_authz_core and mod_authz_host (for
"Require all denied" and "Require all granted") where needed.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@954816 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-15 11:05:13 +00:00