Commit Graph

399 Commits

Author SHA1 Message Date
029fc1601c Fix a typo (missing "t")
s/redisribution/redistribution/

PR 67018 [<hanskrentel yahoo.de>]

r1914884 on trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1914885 13f79535-47bb-0310-9956-ffa450edef68
2023-12-23 10:31:02 +00:00
3d106572c2 Merge r1884511, r1901273, r1910843, r1910849 from trunk:
Add .opus extension for audio/ogg mimetype, per RFC 7845

RFC 7845: https://tools.ietf.org/html/rfc7845#section-9

Submitted by: Richard de Boer <richard tubul.net>
Github: closes #144

Merge of PR 318:

  *) core: the conf/mime.types has been updated in conformance with RFC 9239:
     - .js moved from 'application/javascript' to 'text/javascript'
     - .mjs was added as 'text/javascript'
     [Mathias Bynens <@mathiasbynens> via PR 318]

Add application/vnd.geogebra.slides mime type

Submitted by: Zbynek Konecny <zbynek1729 gmail.com>
Github: closes #207

Add WebAssembly MIME type and file extension

Submitted by: Dave Hodder <dmh dmh.org.uk>
Github: closes #332
Reviewed by: jorton, icing, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911060 13f79535-47bb-0310-9956-ffa450edef68
2023-07-17 09:52:06 +00:00
d9c7d78622 Merge r1491700, r1862200 from trunk:
According to comment in 'magic_rsl_add' and to the way 'magic_rsl_printf' manages its buffer, I think that this memory should be apr_pstrdup'ed.

This has been like that forever, but seems broken to me.

Untested.

* docs/conf/magic: Allow mod_mime_magic to return "audio/x-wav" for
  WAV files, and omit returning "audio/unknown" for other RIFF 
  format files.  Having a MIME type defined on a continuation line
  *and* the preceding top-level match breaks mod_mime_magic, which
  treats the second result "printed" as the MIME encoding. Neither
  audio/x-wav nor audio/unknown are IANA registered, though Firefox
  and Chrome both appear to recognize the former.  Since the RIFF
  format can contain non-audio media, returning audio/unknown as
  a fallback for all RIFF files appears to be bogus anyway.

Submitted by: Àngel Ollé Blázquez <aollebla redhat.com>
Submitted by: jailletc36
Reviewed by: jorton, jim, icing


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1862604 13f79535-47bb-0310-9956-ffa450edef68
2019-07-05 11:26:12 +00:00
919f0e1f79 RFC8081, new font/ registry as pointed out by Steffen (backports r1810121)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1810122 13f79535-47bb-0310-9956-ffa450edef68
2017-09-29 15:10:51 +00:00
2a705b6bdf 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/branches/2.4.x@1795359 13f79535-47bb-0310-9956-ffa450edef68
2017-05-16 19:33:45 +00:00
6af4c002ce 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/branches/2.4.x@1792215 13f79535-47bb-0310-9956-ffa450edef68
2017-04-21 14:44:58 +00:00
d820d78629 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/branches/2.4.x@1791808 13f79535-47bb-0310-9956-ffa450edef68
2017-04-18 16:25:39 +00:00
b0ac59c9cf Merge r1753228, r1753229 from trunk:
httpoxy workarounds, first draft patch as published for all 2.2.x+ sources

Optimization to httpoxy workaround, for 2.4.23+ only.

Submitted by: Dominic Scheirlinck <dominic vendhq.com>, ylavic
Reviewed/backported by: wrowe, jim, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756559 13f79535-47bb-0310-9956-ffa450edef68
2016-08-16 23:12:07 +00:00
2332d0a5e6 non-merge sync with r1752884 of mime.types from trunk.
The only uncommented change is application/x-woff -> application/woff
which was added for PR55293 by r1506674 in mid 2013.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1754408 13f79535-47bb-0310-9956-ffa450edef68
2016-07-28 13:15:26 +00:00
50521c10eb Merge r1723567 from trunk:
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

Submitted by: rjung
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1725509 13f79535-47bb-0310-9956-ffa450edef68
2016-01-19 12:58:52 +00:00
d560d2b940 Merge r1707831 from trunk:
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/
Submitted by: fielding
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1712265 13f79535-47bb-0310-9956-ffa450edef68
2015-11-03 11:58:58 +00:00
2fd2a22851 backport of old h2 doc removal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707520 13f79535-47bb-0310-9956-ffa450edef68
2015-10-08 12:55:53 +00:00
0e132fa7f3 merge of protocols + http2 relevant changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1701655 13f79535-47bb-0310-9956-ffa450edef68
2015-09-07 17:37:19 +00:00
1268693f1c Clarify the change to the default cipher suite lists
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682099 13f79535-47bb-0310-9956-ffa450edef68
2015-05-27 18:59:59 +00:00
06ad550e82 Merge r1679428, r1679432 from trunk:
Conform to RFC 7525, with additional suggestion to drop RSA Kx ciphers

Document RFC 7525 changes
Submitted by: wrowe
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1679987 13f79535-47bb-0310-9956-ffa450edef68
2015-05-18 11:06:36 +00:00
5d7d8c16cd Merge r1634736 from trunk:
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/branches/2.4.x@1634737 13f79535-47bb-0310-9956-ffa450edef68
2014-10-27 23:22:57 +00:00
5cec12c042 Merge r1633730 from trunk:
add OCSP Stapling configuration, disabled by default
Submitted by: trawick
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1634521 13f79535-47bb-0310-9956-ffa450edef68
2014-10-27 12:41:31 +00:00
067d6d5cd7 fix tr docs charset
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1564771 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 13:35:16 +00:00
fa3bbd5e58 merge r1560679 from trunk:
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/branches/2.4.x@1560680 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 13:22:08 +00:00
ad61aab1d7 Add support for TLS-SRP (Secure Remote Password key exchange
for TLS, RFC 5054).
Including some improvements as suggested by Kaspar

PR: 51075
Submitted by: Quinn Slack <sqs cs stanford edu>, Christophe Renou,
              Peter Sylvester
Backported by: sf
Reviewed by: sf, minfrin, rjung

Backports of r1347980 and r1348653 form trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1420057 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 09:55:03 +00:00
76c45e06ff s/Options/AllowOverride/ in comment describing AllowOverride
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1406904 13f79535-47bb-0310-9956-ffa450edef68
2012-11-08 03:05:38 +00:00
2ac08a1ed1 Merge r1386913, r1388825 from trunk:
Revert r1371878 --  default configuration changes that drop the DNT
header from IE10.

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



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.
Submitted by: covener, jim
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1389261 13f79535-47bb-0310-9956-ffa450edef68
2012-09-24 09:43:45 +00:00
577acc2d12 Revert r1373105, the merging of incompatible DefaultRuntimeDir
changes.

The trunk patches for these all have some configuration breakage
as 2.4.x interprets the individual directive or API parameter as
relative to ServerRoot whereas trunk interprets everything
relative to DefaultRuntimeDir.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1373168 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 23:59:24 +00:00
f8c5165c28 Merge r1364695, r1369477, r1369808, r1370288, r1370225, r1370763, r1371684 from trunk:
mod_lbmethod_heartbeat, mod_heartmonitor: Respect DefaultRuntimeDir/
DEFAULT_REL_RUNTIMEDIR for the heartbeat storage file.


core: Respect DefaultRuntimeDir/DEFAULT_REL_RUNTIMEDIR for the
scoreboard (ScoreBoardFile).


The Pidfile directive and ap_log_pid()/ap_remove_pid()/ap_read_pid()
now respect DefaultRuntimeDir


Mutex directive: finish support of DefaultRuntimeDir

a partial conversion was made in r1299718, but I'm not
sure when that change is effective


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


mod_slotmem_plain: make the "filename" key relative to
DefaultRuntimeDir if not absolute

mod_slotmem_plain does not externalize or check the full path
in any way, so this change is just for consistency with other
modules which build paths to run-time artifacts.


make LDAPSharedCacheFile relative to DefaultRuntimeDir

Submitted by: trawick
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1373105 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 21:08:35 +00:00
aeab1fa667 Merge r1371878 from trunk:
Apache does not tolerate deliberate abuse of open standards

Submitted by: fielding
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1373085 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 20:53:31 +00:00
0e25e07a90 merge r1364709 from trunk:
doc fixes for r1299718:

The value of ScriptSock is relative to DefaultRuntimeDir.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1369607 13f79535-47bb-0310-9956-ffa450edef68
2012-08-05 14:35:48 +00:00
be19fac861 Add a docs link to a configuration example.
Backport of r1368053 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1368054 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 15:26:38 +00:00
1db4bd37aa Merge r1306426, r1306841 from trunk:
Update worker mpm defaults to match documentation and built-in defaults.
As per https://issues.apache.org/bugzilla/show_bug.cgi?id=52102

Updated event mpm configuration to match the defaults in documentation and header definitions.
Updated prefork defaults to better match documentation and header definition.
Submitted by: humbedooh
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364600 13f79535-47bb-0310-9956-ffa450edef68
2012-07-23 12:15:33 +00:00
1d3dab497e Merge r1306350 from trunk:
Adapt Timeout to be the same as DEFAULT_TIMEOUT.
After all it's localted in a file called extra/httpd-default.conf

Submitted by: igalic
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364599 13f79535-47bb-0310-9956-ffa450edef68
2012-07-23 12:14:34 +00:00
630f45a87e merge with trunk r1301894
Unregistered media types in common use, according to Wikipedia and MS.
New IANA media types as of 2012 Mar 16 18:55 PDT.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1301895 13f79535-47bb-0310-9956-ffa450edef68
2012-03-17 09:08:44 +00:00
603383a794 Example in configuration comment should use a path
consistent with the default configuration.

PR 52715.

Backport from trunk of r1241069 and 1241071.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1293800 13f79535-47bb-0310-9956-ffa450edef68
2012-02-26 10:39:06 +00:00
32fd3068f2 Switch documentation links nconfiguration templates
from trunk to 2.4.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1291307 13f79535-47bb-0310-9956-ffa450edef68
2012-02-20 15:22:16 +00:00
e2b47e86e7 Fixes example in httpd.conf, as per bug 52604
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1241076 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 16:55:22 +00:00
e7293c231f Merge r1229930:
More registered media types


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1231780 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 22:35:13 +00:00
aca418a70c merge r1203752 from trunk:
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/branches/2.4.x@1203753 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 17:18:31 +00:00
fc4b704ff0 Pre GA removal of components that will not be included:
Part 3: Remote MPM simple.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201214 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 07:15:45 +00:00
aeaf18b96f Merge r1201158 from trunk:
Set MaxMemFree 2048 by default


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201161 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 01:57:26 +00:00
ca0f90bb48 Merge r1200475, r1200478, r1200482, r1200491, r1200513, r1200550, r1200580, r1200605, r1200612, r1200614, r1200639, r1200646, r1200656, r1200667, r1200679, r1200699, r1200957, r1200961, r1200963 from trunk:
fix issue with incorrect munging of the lua package path -- LuaPackagePath directives were not working

Default to not allowing htaccess in /, instead of just the documentroot, which gets a nice 10% performance boost by default for me.

* modules/ssl/ssl_private.h, modules/ssl/ssl_engine_kernel.c
  (ssl_callback_tlsext_tickets): Use unsigned char * to fix gcc
  -Wpointer-sign warnings.


Only load the really imporant modules (i.e. those enabled by the 'few'
selection) by default. Don't handle modules enabled with --enable-foo
specially.

This fixes problems with module dependencies until someone implements a
mechanism for resolving module dependencies.


remove last traces of the code cache

* modules/proxy/mod_proxy_html.c (comp_urlmap): Fix const-ness warning.


* modules/lua/mod_lua.c (ap_lua_ssl_is_https): New function.
  (lua_post_config): Pick up ssl_is_https optional function.

* modules/lua/lua_request.c (req_ssl_is_https_field): New function.
  (ap_lua_load_request): Map is_https field to above.


remove some debug logging which snuck in

remove ability to set min and max pool sizes for server scope in prep for removing server scope

remove lingering reslist references before killing server scope

replace server scope with thread scope

use a sub-pool for scope_once

Fix installation of conf/extra/proxy-html.conf.

Otherwise httpd does no longer start, because
it is the only extra file required in the main
config at the moment.


Rebuild xdoc transform


Clarify docs for LimitRequestLine, as per bug #51665.


Rebuild doc transforms.

Submitted by: brianm, pquerna, jorton, sf, brianm, jorton, jorton, sf, pquerna, brianm, brianm, brianm, brianm, brianm, jorton, rjung, rbowen, rbowen, rbowen
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1200981 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 17:36:46 +00:00
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
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
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
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
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
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
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
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
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
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
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
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