1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

130 Commits

Author SHA1 Message Date
Justin Erenkrantz
a83350dc02 Add text/xml, audio/mpeg, video/quicktime support to mime magic file.
(Justin changed the audio/mpeg sequence to match file(1)'s listing.)

Minor style changes in nearby areas.

PR: 7730
Submitted by: Linus Walleij <triad@df.lth.se>
Reviewed by:  Justin Erenkrantz
(forward ported from revision 1.5 of apache-1.3/conf/magic)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94187 13f79535-47bb-0310-9956-ffa450edef68
2002-03-26 18:41:14 +00:00
Aaron Bannert
0b841b1a28 Change the verbage on the ScoreBoardFile in our default configs.
Also change the default to be commented out (unspecified) so we
get anonymous shared memory by default.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93437 13f79535-47bb-0310-9956-ffa450edef68
2002-02-15 21:14:30 +00:00
Joshua Slive
e468fda9c5 Change httpd.conf default UseCanonicalName to off to make the server
more idiot proof.

Also, move UseCanonicalName to directly under ServerName to make the
connection clearer, and clean up the comments.

I removed the http://123.123.123.231/ example, because it just makes it
too tempting for people to use
ServerName http://123.23.23.23/


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93396 13f79535-47bb-0310-9956-ffa450edef68
2002-02-13 19:58:21 +00:00
Greg Stein
72046380c2 Enable the BrowserMatch for Microsoft's DAV client -- we know it is
broken.

Add a match for the WebDrive client. It is similarly broken.

Sync up the NetWare and Windows .conf files a bit.

Submitted by: Sander Striker <striker@apache.org>, Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93013 13f79535-47bb-0310-9956-ffa450edef68
2002-01-25 00:24:47 +00:00
Ian Holsman
ecea874fb8 Add Hebrew Language.
Shalom Zvi.

Submitted by:	Zvi Har'El


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92966 13f79535-47bb-0310-9956-ffa450edef68
2002-01-22 04:11:40 +00:00
Lars Eilebrecht
f01fdd7095 Rename BeOS MPM directive RequestsPerThread to MaxRequestsPerThread.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92938 13f79535-47bb-0310-9956-ffa450edef68
2002-01-20 06:49:20 +00:00
William A. Rowe Jr
7f6d76ce95 Follow our Unix bretherens' conventions, and name the sub-proxy modules
with the mod_ prefix (al la mod_dav_fs as a sub-dav module.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92876 13f79535-47bb-0310-9956-ffa450edef68
2002-01-17 01:05:23 +00:00
William A. Rowe Jr
9296dc4bb3 Once again, try to bring the world into sync. Someday soon, we need to
generate this and Netware's from -std using awk.  It really would make
  more sense to strip out the appropriate directives as we build, instead
  of 'toggling' the mpm with <IfModule > (at least, as an option during
  build.)  But that requires an un-nested syntax such as
  <IfModule module module> or <IfNotModule module module> that would be
  simpler to parse in awk.  Our nested IfModules make this quite tricky.
  The better final solution is possibly to add things like HAS_SCOREBOARD
  to the 'build-in' defines, therefore assuring a simple test for any
  mpm architecture.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92813 13f79535-47bb-0310-9956-ffa450edef68
2002-01-10 21:35:05 +00:00
William A. Rowe Jr
aff1454d34 *) Split all Win32 modules [excluding the core components mod_core,
mod_so, mod_win32 and the winnt mpm] into individual loadable
     modules, so the administrator may individually disable the former
     compiled-in modules by simply commenting out their LoadModule
     directives.  [William Rowe]

  *) Saved Win32 module authors and porters many future headaches, by
     duplicating the appropriate .h files such as os.h into the include
     directory, including in the build tree.  [William Rowe]

  Also noticed that version stamp resources weren't generated for proxy
  modules, this too is now fixed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92804 13f79535-47bb-0310-9956-ffa450edef68
2002-01-10 08:47:23 +00:00
William A. Rowe Jr
cabc07d1f2 Best to use -no- file extension here, since that always pops up the
'open with' dialog in MS Explorer, preventing the user from really
  mucking anything up.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92797 13f79535-47bb-0310-9956-ffa450edef68
2002-01-10 03:19:49 +00:00
William A. Rowe Jr
349cffc66f Consistency
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92783 13f79535-47bb-0310-9956-ffa450edef68
2002-01-09 16:00:54 +00:00
William A. Rowe Jr
3104e28d90 Bad committer! Well, fix everyone else's tabs while I'm in here.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92658 13f79535-47bb-0310-9956-ffa450edef68
2001-12-30 05:25:26 +00:00
William A. Rowe Jr
faf908c44f Gotta have an error doc to serve, even if it's not their favorite
language.

  From the http://www.ethnologue.com/ survey of languages, their data
  is, in descending order [in millions, by primary and pri+sec speakers]
  EN  341  508
  ES  322  417
  DE  100  128
  FR   77  128

  So that's the order I chose, and why.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92657 13f79535-47bb-0310-9956-ffa450edef68
2001-12-30 05:23:36 +00:00
William A. Rowe Jr
98727a9bd8 Resync a few documentation stanzas [all I have time for today], but
MOST SIGNIFICANTLY;

  Unwind '_' characters from ALL of our example IP names.  Since we waste
  oodles of time stating 'Underscores are invalid in DNS entries' - why
  have examples that contradict the RFC?


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92577 13f79535-47bb-0310-9956-ffa450edef68
2001-12-22 18:03:29 +00:00
Bradley Nicholes
8ec9037bb0 Merged NetWare into the standard conf file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92431 13f79535-47bb-0310-9956-ffa450edef68
2001-12-11 19:37:59 +00:00
Joshua Slive
993b5b4d05 Fix a typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92348 13f79535-47bb-0310-9956-ffa450edef68
2001-12-05 19:07:00 +00:00
Joshua Slive
8d7cbbed06 Remove some comments from the errordocument and browsermatch sections.
I like short config files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92347 13f79535-47bb-0310-9956-ffa450edef68
2001-12-05 19:01:25 +00:00
Joshua Slive
b03f3c4d18 Config file updates. Mostly just playing with comments, but a few functional
changes:

1. Remove the directives in the document root <directory> section that
are there to handle the index.html.var and put them in their normal place
in the config file.  I see no reason to duplicate the directives and
explanations.

2. Change from the funky FilesMatch/SetOutputFilter to AddOutputFilter for
the SSI configuration.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92346 13f79535-47bb-0310-9956-ffa450edef68
2001-12-05 18:28:37 +00:00
Jeff Trawick
c229289a21 Get rid of threaded MPM. This commit has the actual code changes.
The deletes come next.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92036 13f79535-47bb-0310-9956-ffa450edef68
2001-11-19 18:07:28 +00:00
David Reid
91cb82ebd4 Add some runtime configuration variable for the beos mpm.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91977 13f79535-47bb-0310-9956-ffa450edef68
2001-11-16 14:50:26 +00:00
Bradley Nicholes
4cce66398d Fixed the LoadModule statements to fit the 8.3 and NLM extension
requirement for NetWare


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91903 13f79535-47bb-0310-9956-ffa450edef68
2001-11-13 17:35:32 +00:00
Justin Erenkrantz
f503777680 Resolve the mod_dir overaggressive redirection problem seen with non-GET
requests for WebFolders.
Reviewed by:	Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91894 13f79535-47bb-0310-9956-ffa450edef68
2001-11-13 05:10:24 +00:00
David Reid
e18c712970 Reverse last nights commit - we'll deal with this another way!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91809 13f79535-47bb-0310-9956-ffa450edef68
2001-11-08 22:31:28 +00:00
David Reid
606ca28f37 This doesn't feel quite right, but it doesn't cause any problems
and stops an irritation about the standard conf file for
BeOS which barfs if the User/Group is present.

Submitted by:	Brad Froehle <epEnochRoot@yahoo.com>
Reviewed by:	David Reid <dreid@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91795 13f79535-47bb-0310-9956-ffa450edef68
2001-11-08 00:54:00 +00:00
Cliff Woolley
2e24f06826 Get rid of "You configured HTTPS(443) on the standard HTTP(80) port!"
message.

Submitted by: Madhu Mathihalli


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91794 13f79535-47bb-0310-9956-ffa450edef68
2001-11-07 22:16:09 +00:00
William A. Rowe Jr
0a00a06837 Fix a typo and URL. [Gotta get this keyboard cleaned.]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91718 13f79535-47bb-0310-9956-ffa450edef68
2001-11-01 05:12:46 +00:00
William A. Rowe Jr
2b4060c596 Make this a bit more formal, as in httpd.conf. Also should cite the
contributor, but only Ralf knows who all should be the primary citation,
  if not simply "the modssl project".  I don't know if this conf is all
  new material, significantly created by the modssl project, or if much
  of it goes all the way back to ApacheSSL.  Rather that miss-attribute,
  I'm leaving line one for someone else [Ralf?] to add, vis-a-vie the
  citation in httpd-std.conf line 2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91717 13f79535-47bb-0310-9956-ffa450edef68
2001-11-01 04:56:59 +00:00
Roy T. Fielding
9e59ae4d0e Since we are in a file that is only included with mod_ssl.c and
there is no point in any of it if SSL is not defined, just wrap
the whole thing in one IfDefine.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91716 13f79535-47bb-0310-9956-ffa450edef68
2001-11-01 00:05:58 +00:00
William A. Rowe Jr
3f9aebdd95 Introduce an Apache mod_ssl initial configuration template
(ssl.conf, generated from ssl-std.conf).  [Ralf S. Engelschall]

  Revised Cliff's intro paragraph to point folks at docs until
  docs are provided.  [Will Rowe]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91707 13f79535-47bb-0310-9956-ffa450edef68
2001-10-31 15:50:53 +00:00
Cliff Woolley
d033b75b24 Stick a comment into this file so it's clear that it's a placeholder
and not just a zero-byte thingy.  :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91702 13f79535-47bb-0310-9956-ffa450edef68
2001-10-31 05:37:06 +00:00
Bradley Nicholes
ceb086b73b Conf file cleanup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91689 13f79535-47bb-0310-9956-ffa450edef68
2001-10-29 22:52:53 +00:00
William A. Rowe Jr
5477dfb420 Remerge proxy configuration. Tally: of 9 votes;
Majority for segregating mod_ssl
  Minority for segregating mod_proxy

  Also remove a lingering bit of ldap config from httpd-std.conf


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91631 13f79535-47bb-0310-9956-ffa450edef68
2001-10-22 12:46:29 +00:00
Justin Erenkrantz
11f831e3de Remove the reference to Port directive and replace it with Listen.
Who knows if the rest of this file is still valid?


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91568 13f79535-47bb-0310-9956-ffa450edef68
2001-10-19 05:57:47 +00:00
Bradley Nicholes
53cf31ad0d Brought the conf file up to date with the latest source
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91539 13f79535-47bb-0310-9956-ffa450edef68
2001-10-17 22:48:14 +00:00
William A. Rowe Jr
d83c2cf3f9 Whoops ... invalid <Directory /> blocks for the new 'manual' tree location
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91528 13f79535-47bb-0310-9956-ffa450edef68
2001-10-17 15:37:19 +00:00
Ryan Bloom
fb7781b279 Remove the ldap config file. This is now part of the ldap sub-project.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91511 13f79535-47bb-0310-9956-ffa450edef68
2001-10-16 22:29:20 +00:00
Ryan Bloom
4d4ce3209a Port the MaxClients changes from the worker MPM to the threaded
MPM.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91483 13f79535-47bb-0310-9956-ffa450edef68
2001-10-16 04:02:28 +00:00
William A. Rowe Jr
4cf572780c My badness (well, I tried)
Mladen Turk's <mturk@mappingsoft.com> corrections for recent cleanups


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91469 13f79535-47bb-0310-9956-ffa450edef68
2001-10-15 15:29:03 +00:00
Ryan Bloom
705737ea79 Fixed the configure script to add a LoadModule directive to
the default httpd.conf for any module that was compiled
as a DSO.

Submitted by:	Aaron Bannert <aaron@clove.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91415 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 03:42:53 +00:00
Martin Kraemer
e04745a32a Rename ssl-std.conf to match Makefile.in's installation action
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91347 13f79535-47bb-0310-9956-ffa450edef68
2001-10-08 10:15:37 +00:00
William A. Rowe Jr
fe89e443fe And thank you once again, Justin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91307 13f79535-47bb-0310-9956-ffa450edef68
2001-10-05 03:41:15 +00:00
William A. Rowe Jr
3f610a281d These now exist with their -std names, thanks for the suggest, Justin.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91306 13f79535-47bb-0310-9956-ffa450edef68
2001-10-05 03:40:27 +00:00
Justin Erenkrantz
fb715f4370 Include paths must be relative to ServerRoot directive.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91304 13f79535-47bb-0310-9956-ffa450edef68
2001-10-05 03:32:42 +00:00
William A. Rowe Jr
d90e107ee0 Split the significant modules into segregated module configs.
Probably should do the same with negotation/autoindex, since those
  are _so_ huge, but not this afternoon on my schedule.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91295 13f79535-47bb-0310-9956-ffa450edef68
2001-10-04 20:40:37 +00:00
William A. Rowe Jr
e9ada276aa Cleanup the config (somewhat) so that win32 -could- actually run from
the httpd-std.conf - but there are still some discrepancies to take
  back to the conference committee :)

  LDAP was voted some time ago into it's own httpd-ldap repository, and
  never built on Win32; No ldap config directives are present, so I've
  pulled it from both .conf files.

  It would be really nice if the proxy team would come in and clean out
  the deprecated/unsupported directives here.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91294 13f79535-47bb-0310-9956-ffa450edef68
2001-10-04 20:28:34 +00:00
Ryan Bloom
b7bc1a03e7 Remove the Port directive. In it's place, the Listen directive
is now a required directive, which tells Apache what port to
listen on.  The ServerName directive has also been extended
to accept an optional port.  If the port is specified to the
ServerName, the server will report that port whenever it
reports the port that it is listening on.  This change was
made to ease configuration errors that stem from having a Port
directive, and a Listen directive.  In that situation, the server
would only listen to the port specified by the Listen command,
which caused a lot of confusion to users.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91293 13f79535-47bb-0310-9956-ffa450edef68
2001-10-04 20:00:53 +00:00
Ryan Bloom
2c7371aebb We need to use @@Port@@ not hard-code the Port number.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91264 13f79535-47bb-0310-9956-ffa450edef68
2001-10-03 18:56:38 +00:00
Ryan Bloom
edab33dc9c Add a Listen directive to the default config file. This allows us to
later add another listen directive, in the default SSL config file,
without stopping the server from listening on port 80.  The next step
is to combine the Port and ServerName directives, so that Port can go
away finally.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91260 13f79535-47bb-0310-9956-ffa450edef68
2001-10-03 17:44:34 +00:00
Lars Eilebrecht
9f72c2d5ea Update mime.types file.
Map video/vnd.mpegurl to mxu according to
ftp://ftp.isi.edu/in-notes/iana/assignments/media-types/video/vnd.mpegurl
and audio/x-mpegurl to m3u, because it is commonly used.

Submitted by: Heiko Recktenwald <uzs106@uni-bonn.de>
Reviewed by: Sander van Zoest, Lars Eilebrecht


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91247 13f79535-47bb-0310-9956-ffa450edef68
2001-10-02 21:54:28 +00:00
Mark J. Cox
f9590ea435 Update the mime.types file to the registered media types as
of 2001-09-25, and add mapping for xsl extension
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91145 13f79535-47bb-0310-9956-ffa450edef68
2001-09-26 08:25:14 +00:00