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

414 Commits

Author SHA1 Message Date
William A. Rowe Jr
7316342839 Remove 3DES by default for users of older crypto librarys; the cipher
has been reclassified in current OpenSSL releases as WEAK due to 112
or fewer bits of remaining cipher strength, while the Sweet32 disclosure
extended the criticism of RC4 on to 3DES. (IDEA, which potentially has the
same issue, is never enabled by default in OpenSSL, due to patent concerns.)

This commit does not change default httpd behavior, but alters the suggested
behavior of newly provisioned httpd servers. Where adopted, XP with IE8 will
no longer handshake with mod_ssl (previously, XP with IE6 would not handshake.)
The same net effect occurs where OpenSSL is updated to 1.1.0.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795358 13f79535-47bb-0310-9956-ffa450edef68
2017-05-16 19:33:36 +00:00
William A. Rowe Jr
70c618f35f Fix pattern (.xml source filenames aren't charset tagged)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792216 13f79535-47bb-0310-9956-ffa450edef68
2017-04-21 14:46:30 +00:00
William A. Rowe Jr
e23d950174 Still can find only one problem case alluded to by André.
Where Accept-Lanuage is da Q=1 and ru Q=1, leaving these out of the priority
list results in English as the tie-breaker, which is incorrect.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792214 13f79535-47bb-0310-9956-ffa450edef68
2017-04-21 14:42:29 +00:00
William A. Rowe Jr
2091bb843a KISS: RemoveType is a simpler fix for .tr; explain .da files; order our
LanguagePriority by a first-order comparison and drop negligable translations
from our ordered priority preference list entirely.

A better comparison would be total number of documents in-sync, or some
convoluted weight ordering each document by which are more in sync than
others. Leaving that puzzle to an interested hacker.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791807 13f79535-47bb-0310-9956-ffa450edef68
2017-04-18 16:25:03 +00:00
Joe Orton
8db141ff80 Remove trailing whitespace.
Submitted by: Josef Radinger


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1769590 13f79535-47bb-0310-9956-ffa450edef68
2016-11-14 10:43:35 +00:00
Joe Orton
e4129aad1a Fix typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1767638 13f79535-47bb-0310-9956-ffa450edef68
2016-11-02 11:28:25 +00:00
William A. Rowe Jr
235ee2ff40 httpoxy workarounds, first draft patch as published for all 2.2.x+ sources
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1753228 13f79535-47bb-0310-9956-ffa450edef68
2016-07-18 14:07:00 +00:00
Roy T. Fielding
8d9713b30e add comments for all media types in IANA registry dated 2016-07-14
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1752884 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 00:00:43 +00:00
Roy T. Fielding
75d3795d10 add comments for all media types in IANA registry dated 2016-05-02
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1742054 13f79535-47bb-0310-9956-ffa450edef68
2016-05-03 00:02:28 +00:00
Roy T. Fielding
7d84dae077 add comments for all media types in IANA registry dated 2016-02-05
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730972 13f79535-47bb-0310-9956-ffa450edef68
2016-02-17 23:05:55 +00:00
Roy T. Fielding
4ab46d70e0 properly sort the types (no functional change)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730773 13f79535-47bb-0310-9956-ffa450edef68
2016-02-17 00:09:34 +00:00
Rainer Jung
79b3863c61 Add common extension "m4a" for MPEG 4 Audio to
mime.types.

As a reference see Wikipedia:
https://en.wikipedia.org/wiki/MPEG-4_Part_14#.MP4_versus_.M4A

PR: 57895


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1723567 13f79535-47bb-0310-9956-ffa450edef68
2016-01-07 15:04:33 +00:00
Roy T. Fielding
6d177396d0 PR 53845: Remove commented config regarding DNT because the spec now has CR status (confirming our interpretation) and MS has committed to changing their implementation: http://blogs.microsoft.com/on-the-issues/2015/04/03/an-update-on-microsofts-approach-to-do-not-track/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707831 13f79535-47bb-0310-9956-ffa450edef68
2015-10-09 23:25:02 +00:00
Stefan Eissing
54e6961c7e removing no longer needed h2 extra conf thing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707519 13f79535-47bb-0310-9956-ffa450edef68
2015-10-08 12:52:54 +00:00
Stefan Eissing
6537db8178 eliminating the last surviving H2Engine directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700783 13f79535-47bb-0310-9956-ffa450edef68
2015-09-02 12:20:57 +00:00
Stefan Eissing
8c27a4cd1b reworked mod_h2 donation checkin into build system, added documentation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690248 13f79535-47bb-0310-9956-ffa450edef68
2015-07-10 11:45:46 +00:00
William A. Rowe Jr
aab0eba576 Clarify the change to the default cipher suite lists
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1682099 13f79535-47bb-0310-9956-ffa450edef68
2015-05-27 18:59:59 +00:00
William A. Rowe Jr
5982e45da0 Conform to RFC 7525, with additional suggestion to drop RSA Kx ciphers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1679428 13f79535-47bb-0310-9956-ffa450edef68
2015-05-14 18:44:52 +00:00
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