1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

362 Commits

Author SHA1 Message Date
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
Rainer Jung
fb023f403a Fix IfModule in default configuration according
the to new mod_unixd.

"User" and "Group" are no longer implemented in the MPMs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@954808 13f79535-47bb-0310-9956-ffa450edef68
2010-06-15 10:58:34 +00:00
Roy T. Fielding
5f941fbef6 Comment-out all unused types for faster processing at start-up
and easier reading with a syntax-highlighting editor.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@896223 13f79535-47bb-0310-9956-ffa450edef68
2010-01-05 21:20:59 +00:00
Roy T. Fielding
906b282ed4 Sync with IANA registry as of 04 Jan 2010 18:22 PST
Somebody in the ISO OOXML committee needs a friggin clue.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@895930 13f79535-47bb-0310-9956-ffa450edef68
2010-01-05 07:47:02 +00:00
Jeff Trawick
6ffd71cee5 catch up with updated Mutex syntax
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@886291 13f79535-47bb-0310-9956-ffa450edef68
2009-12-02 19:54:23 +00:00
Jeff Trawick
2e9668a33d Replace AcceptMutex, LockFile, RewriteLock, SSLMutex, SSLStaplingMutex,
and WatchdogMutexPath with a single Mutex directive.  Add APIs to
simplify setup and user customization of APR proc and global mutexes.  
(See util_mutex.h.)  Build-time setting DEFAULT_LOCKFILE is no longer
respected; set DEFAULT_REL_RUNTIMEDIR instead.

Some existing modules, such as mod_ldap and mod_auth_digest gain 
configurability for their mutexes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883540 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:17:51 +00:00
Sander Temme
b90aee19b9 enable support for ECC keys and ECDH ciphers. Tested against
OpenSSL 1.0.0b3.  [Vipul Gupta vipul.gupta sun.com, Sander Temme]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834378 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 07:55:13 +00:00
Brian Havard
b975e90af4 Bring OS/2 MPM back from the dead.
Reverses r758899.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@804678 13f79535-47bb-0310-9956-ffa450edef68
2009-08-16 12:03:34 +00:00
Roy T. Fielding
3947e01b2c Remove some duplicate extensions (reported by Jacob Rus)
Add more unregistered Microsoft types for silverlight (idiots)
   http://blogs.msdn.com/tims/archive/2008/03/18/configuring-a-web-server-to-host-silverlight-content.aspx


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@800196 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 04:36:18 +00:00
Roy T. Fielding
b12bad0ed9 update comments and place in public domain
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774530 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 20:59:33 +00:00
Roy T. Fielding
c87cd3256c sync with IANA as of 2009 May 12 16:30 PDT
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774184 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 03:48:12 +00:00
Roy T. Fielding
909159f2ef More unregistered media types in common use on the Internet. *sigh*
http://msdn.microsoft.com/en-us/library/aa338205.aspx 
http://technet.microsoft.com/ja-jp/library/cc179224.aspx

http://www.adobe.com/support/config.html
http://www.adobe.com/go/tn_16509http://www.adobe.com/support/documentation/en/air/1_5_1/releasenotes_developers.html#tips
http://livedocs.adobe.com/coldfusion/8/htmldocs/vspider_17.html
http://help.adobe.com/en_US/AdobeMediaPlayer/1.5/CDK/WSb04c7610c343283941c82cdf11cc3cc68f8-8000.html

http://www.idpf.org/specs.htm
http://rivviepop.wordpress.com/2006/01/27/configuring-apache-for-mobile-browsing/



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@766211 13f79535-47bb-0310-9956-ffa450edef68
2009-04-18 04:38:32 +00:00
Jeff Trawick
e64b014d3e remove OS/2 MPM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758899 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 22:35:11 +00:00
Jeff Trawick
6c50a14923 axe BeOS MPM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758796 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 18:48:10 +00:00
Roy T. Fielding
d4757bac75 add application/x-java-jnlp-file
http://java.sun.com/developer/technicalArticles/Programming/jnlp/
(because some companies are too stupid to register a type)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@755445 13f79535-47bb-0310-9956-ffa450edef68
2009-03-17 23:36:27 +00:00
Roy T. Fielding
278e117dfa Remove DefaultType config. I could have sworn I did this
four years ago, but apparently that was just AddDefaultCharset.
PR: 13986



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@740144 13f79535-47bb-0310-9956-ffa450edef68
2009-02-02 23:08:25 +00:00