1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-28 11:57:22 +03:00
Commit Graph

281 Commits

Author SHA1 Message Date
Roy T. Fielding
36b99f9aee sync with IANA registry as of 2008 Nov 30 14:17 PST
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@721974 13f79535-47bb-0310-9956-ffa450edef68
2008-12-01 05:54:25 +00:00
William A. Rowe Jr
d1c691cc4e Correct broken configuration in 2.2 - this example didn't run out of the box
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@644357 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 15:28:59 +00:00
André Malo
9152fae454 fix comment, thanks joe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@639924 13f79535-47bb-0310-9956-ffa450edef68
2008-03-21 23:59:27 +00:00
André Malo
482d87bb43 fixup on .tr extension
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@639914 13f79535-47bb-0310-9956-ffa450edef68
2008-03-21 23:39:39 +00:00
André Malo
5edcd5dde5 add language definitions for turkish
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@634651 13f79535-47bb-0310-9956-ffa450edef68
2008-03-07 12:53:49 +00:00
Guenter Knauf
b3df2da681 applied accepted backport of r606316, r606806: make https port configurable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@618483 13f79535-47bb-0310-9956-ffa450edef68
2008-02-04 23:00:07 +00:00
Roy T. Fielding
0d2c8c9f16 Update mime.types with IANA registry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@608253 13f79535-47bb-0310-9956-ffa450edef68
2008-01-02 22:10:01 +00:00
Roy T. Fielding
ef7ea05ade revert move to image/vnd.microsoft.icon because everyone uses image/x-icon
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@608218 13f79535-47bb-0310-9956-ffa450edef68
2008-01-02 20:44:49 +00:00
William A. Rowe Jr
e8bc08a0f3 Provide vhosts examples remotely related to the httpd.conf we create?
This patch was leapfrogged by a backport of 515403, if you
are confused by the sequence.

Backport: r410762

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@607366 13f79535-47bb-0310-9956-ffa450edef68
2007-12-29 03:29:03 +00:00
William A. Rowe Jr
3d241d314b Migrating from httpd-win.conf to httpd.conf.in we need to add
winnt's mpm to extra/httpd-mpm.conf.in

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@607365 13f79535-47bb-0310-9956-ffa450edef68
2007-12-29 03:08:28 +00:00
William A. Rowe Jr
98179c68d8 Unplug win32 specific config, plug in build/installwinconf.awk
Backports: r606158

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606167 13f79535-47bb-0310-9956-ffa450edef68
2007-12-21 11:45:33 +00:00
William A. Rowe Jr
ee57a5e9f7 Prepare for win32 to share the common config file.
Note the quotes for "logs/access_log" which let us
toggle this to access.log, while leaving the custom
log format specifier pretty_log alone.

Also, prefer the user specified port for example
ServerName directive.

Backports: r606135


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606166 13f79535-47bb-0310-9956-ffa450edef68
2007-12-21 11:43:00 +00:00
Jeff Trawick
f83f57b742 fix broken backport of r515403 some months ago
(trunk commit was okay; 2.2.x commit had quotes in
the wrong place)

PR: 43922
Submitted by: Basant Kumar Kukreja <basant.kukreja sun.com>
Reviewed by: trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@597044 13f79535-47bb-0310-9956-ffa450edef68
2007-11-21 11:47:09 +00:00
William A. Rowe Jr
96aa483b41 With the exception of exclusively test/stress modules, add all
of the modules we compile and ship in the installer (in any shape).

drop mod_imagemap, mod_userdir from the default-loaded modules

Several other modules should be considered for default-loaded 
or default-not loaded changees.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@580257 13f79535-47bb-0310-9956-ffa450edef68
2007-09-28 09:02:28 +00:00
Roy T. Fielding
6a7f86e787 Sync with mime.types rev 571614
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@571616 13f79535-47bb-0310-9956-ffa450edef68
2007-08-31 22:00:42 +00:00
Roy T. Fielding
2fe2de75a4 backport from trunk (r570206)
Sync with IANA registry.

Update common x-types that have been registered or will never
be registered for compatibility reasons.  Yeah, those x-Idiots.

The extensions recently assigned to application/vnd.apple.installer+xml
(dist distz pkg mpkg) are too numerous and too generic.  We should
always assume that vendors are too lazy to check for conflicts
(we choose .mpkg only, since that is the common one).

The extension recently assigned to ecmascript (.es)
interferes with languages (espanol), so replace with .ecma.
PR: 35550

Assign the .chm extension to the newly registered type based on
the theory that Microsoft will use it eventually.
PR: 37798

Add application/xspf+xml xspf since they are trying to do it right.
PR: 39317

Add svgz to list of image/svg+xml extensions as per W3C.
PR: 31483



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@570217 13f79535-47bb-0310-9956-ffa450edef68
2007-08-27 18:52:25 +00:00
Jim Jagielski
370463e4ad Merge r560533, r562236 from trunk:
PR: 40299	Registered Javascript/ECMAScript MIME types (RFC4329)
PR: 40379	Apple installer registered type

Comment: "dist" and "pkg" are too widely used to reserve.
Not sure if they could be overloaded in the context of "extension"s?


Note mime.types updates

Submitted by: niq
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@562446 13f79535-47bb-0310-9956-ffa450edef68
2007-08-03 12:50:32 +00:00
Greg Stein
ff5112bd63 port r532162 to the 2.2.x stable branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@533998 13f79535-47bb-0310-9956-ffa450edef68
2007-05-01 10:40:46 +00:00
Sander Temme
1a8d53241d Backport of r515403, quote filesystem paths that might have spaces in them when expanded.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@515485 13f79535-47bb-0310-9956-ffa450edef68
2007-03-07 07:33:58 +00:00
Rich Bowen
ffedf68ae6 Removing unregistered mime types.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@373378 13f79535-47bb-0310-9956-ffa450edef68
2006-01-29 22:34:37 +00:00
Rich Bowen
e9e391e9ed Add the m4a and m4b mime types, so that podcasts in these formats work
without configuration changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@373209 13f79535-47bb-0310-9956-ffa450edef68
2006-01-28 18:32:25 +00:00
Joshua Slive
eaa42b09c8 Make the DAV example actually work when included
in the default config by allowing access.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@371935 13f79535-47bb-0310-9956-ffa450edef68
2006-01-24 14:47:44 +00:00
Joshua Slive
4217f66bd0 Merge r371933 from trunk:
Use HTMLTable option in the config example so that directory listings will satisfy
people concerned about html spec compliance.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@371934 13f79535-47bb-0310-9956-ffa450edef68
2006-01-24 14:45:46 +00:00
Joshua Slive
d4f6d0d45e Merge r349747 from trunk:
Some config file changes:

- Make the <Files> section safer by
  adding Satisfy all (as is already present in 1.3)

- Remove some handler examples that almost nobody will
  use (the config file is not the documentation)

- Remove some win32 specific stuff from the default
  config, since win32 uses its own config file

- Remove the config section for the perchild mpm



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@349748 13f79535-47bb-0310-9956-ffa450edef68
2005-11-29 16:10:50 +00:00
Paul Querna
dc8cf5775e Perchild MPM has been removed from this Branch, remove it from the config too.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@345715 13f79535-47bb-0310-9956-ffa450edef68
2005-11-20 04:44:18 +00:00
André Malo
ce41018fcb more url fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@333065 13f79535-47bb-0310-9956-ffa450edef68
2005-11-13 17:17:31 +00:00
Colm MacCarthaigh
31a8f37287 Merge r327892 from trunk:
These days in most cases, "all bound IP addresses" means :: and 0.0.0.0
or even just ::. Rather than confuse users by trying to explain this in
the configuration, simply remove the now-erroneous reference to 0.0.0.0. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@327896 13f79535-47bb-0310-9956-ffa450edef68
2005-10-24 01:01:45 +00:00
Wilfredo Sanchez
0797affba4 Backport r220032 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@225162 13f79535-47bb-0310-9956-ffa450edef68
2005-07-25 18:42:23 +00:00
Joe Orton
61248dbf3f Add redirect-carefully for Dreamweaver MX.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@201583 13f79535-47bb-0310-9956-ffa450edef68
2005-06-24 08:45:09 +00:00
Joe Orton
ac48c6b810 PHP 3.x + httpd-2.2 seems... unlikely.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190906 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 12:52:57 +00:00
Rich Bowen
0e5a55be8b Change "Files ~" to the preferred "FilesMatch"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190905 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 12:42:32 +00:00
Joshua Slive
5d2f77b59a Reverse r168030 because the not-acceptable (406)
custom error doc can't provide all the information
provided by the internal doc.  Also delete the corresponding
.html.var file to avoid future confusion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178453 13f79535-47bb-0310-9956-ffa450edef68
2005-05-25 15:20:55 +00:00
Erik Abele
8ceb063d94 WebDAVFS (1.3) is still broken in OS X Tiger.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170662 13f79535-47bb-0310-9956-ffa450edef68
2005-05-17 21:01:37 +00:00
Joshua Slive
23ea0cd2c0 Missing ErrorDocument line for Not Acceptable.
PR: 28581


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168028 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 00:23:48 +00:00
Joe Orton
440083dd9c - don't allow PROPFIND in the default config for public_html directories
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@164763 13f79535-47bb-0310-9956-ffa450edef68
2005-04-26 07:51:11 +00:00
Joe Orton
cda74843ef * docs/conf/extra/httpd-ssl.conf.in: Don't reference directories which
aren't created by "make install".  Use BrowserMatch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161883 13f79535-47bb-0310-9956-ffa450edef68
2005-04-19 13:09:43 +00:00
Joshua Slive
32205b5219 Fix the logfile names in windows to have a .log extension.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161777 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 17:20:11 +00:00
Joe Orton
9a4b700af6 Add redirect-carefully BrowserMatch for FrontPage.
PR: 32842 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161475 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 14:41:53 +00:00
Rich Bowen
6efa778213 As discussed on the list, change the default setting for
KeepAliveTimeout from 15 seconds to 5 seconds.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161140 13f79535-47bb-0310-9956-ffa450edef68
2005-04-13 01:21:11 +00:00
Joshua Slive
ead8a4b2c6 Bring the windows config file in line with the simplifications
of the main httpd.conf.

Make a vain attempt to modify Makefile.win appropriately.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160989 13f79535-47bb-0310-9956-ffa450edef68
2005-04-12 00:12:14 +00:00
Bradley Nicholes
b947afe0d8 Missing a space delimiter between the values
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160724 13f79535-47bb-0310-9956-ffa450edef68
2005-04-09 23:59:26 +00:00
Joshua Slive
fa4e866600 Merged the simple-conf branch changes r159781:160695 into the trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160696 13f79535-47bb-0310-9956-ffa450edef68
2005-04-09 16:59:15 +00:00
Sander Striker
c312a18db5 * docs/conf/httpd-win.conf
Reformat.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160584 13f79535-47bb-0310-9956-ffa450edef68
2005-04-08 19:02:12 +00:00
William A. Rowe Jr
3d89009576 Need to update the default conf.
Submitted for your consideration - does 

    AddHandler imap-file map

  make sense anymore?  or should the handler be imagemap-file?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160436 13f79535-47bb-0310-9956-ffa450edef68
2005-04-07 19:01:26 +00:00
Sander Striker
359a77ca1b * docs/conf/httpd-std.conf.in
Adjust one conditional to new style.
  Wrap mod_logio directives into a conditional, instead of having them commented out.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159499 13f79535-47bb-0310-9956-ffa450edef68
2005-03-30 17:47:02 +00:00
Sander Striker
f8354dc777 Stop exposing source filenames in the configuration files.
* docs\conf\httpd-win.conf
* docs\conf\httpd-std.conf.in

  Replace all occurences of *.c with *_module within
  IfModule clauses, as pointed out by Paul Querna to
  be possible nowadays.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@152951 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 22:31:56 +00:00
Erik Abele
947d103c02 Sync available error languages with used LanguagePriority.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124607 13f79535-47bb-0310-9956-ffa450edef68
2005-01-08 02:21:30 +00:00
André Malo
b74e119fee update config for pt-br inclusion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124362 13f79535-47bb-0310-9956-ffa450edef68
2005-01-06 11:22:56 +00:00
Roy T. Fielding
bbb4bfda2c Remove AddDefaultCharset from the default configuration because
setting a site-wide default does more harm than good.

PR: 23421



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111581 13f79535-47bb-0310-9956-ffa450edef68
2004-12-11 05:57:29 +00:00
André Malo
61c4312eb2 general property cleanup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105995 13f79535-47bb-0310-9956-ffa450edef68
2004-11-20 20:16:24 +00:00