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

78 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
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
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
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
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
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
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
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
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
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
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
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
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
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
Vincent Bray
7dcb133275 Typo sent/send
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@732816 13f79535-47bb-0310-9956-ffa450edef68
2009-01-08 20:38:39 +00:00
Rainer Jung
d34d88ff84 Remove LockFile in default config
for all MPMs that do not support it
(AP_MPM_WANT_SET_LOCKFILE undefined).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730875 13f79535-47bb-0310-9956-ffa450edef68
2009-01-03 00:10:18 +00:00
Rainer Jung
e53bae4efd Slight fix to r712611: introductory comment should
stay above the blocks for the individual MPMs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@727761 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 16:52:33 +00:00
Vincent Bray
46fcaefb39 Minor grammatical issues
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@713575 13f79535-47bb-0310-9956-ffa450edef68
2008-11-13 00:18:02 +00:00
Paul Querna
f457e1b80f Add Simple MPM to example mpm config.
Submited by: Ryan Phillips <ryan trolocsis.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@712611 13f79535-47bb-0310-9956-ffa450edef68
2008-11-10 05:48:21 +00:00
André Malo
73f68d6e24 oh dear, thanks joe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@639923 13f79535-47bb-0310-9956-ffa450edef68
2008-03-21 23:58:35 +00:00
André Malo
95457adb8f fixup on .tr extension
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@639912 13f79535-47bb-0310-9956-ffa450edef68
2008-03-21 23:36:17 +00:00
André Malo
186d4796c0 add language definitions for turkish
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@634647 13f79535-47bb-0310-9956-ffa450edef68
2008-03-07 12:49:39 +00:00
Guenter Knauf
06067c6be8 Enable to configure the https port - missing pieces.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606806 13f79535-47bb-0310-9956-ffa450edef68
2007-12-25 20:02:55 +00:00
Guenter Knauf
4e0d66f3fb Enabled to configure the https port as we do with http port too.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606316 13f79535-47bb-0310-9956-ffa450edef68
2007-12-21 20:59:03 +00:00
William A. Rowe Jr
bf49e42166 Unix illustrates a default of 150 max childs, so make
winnt mpm consistent with this.  (Other mpm's should
also be reviewed.)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606133 13f79535-47bb-0310-9956-ffa450edef68
2007-12-21 08:36:36 +00:00