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

81 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Ryan Bloom
51a71722a1 Modify the standard config file to match to new semantics of MaxClients
for the Worker MPM
Submitted by:	 Aaron Bannert <aaron@clove.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91123 13f79535-47bb-0310-9956-ffa450edef68
2001-09-24 06:44:39 +00:00
Chuck Murcko
e55737d7c3 Close the same directive we open
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91041 13f79535-47bb-0310-9956-ffa450edef68
2001-09-16 19:15:59 +00:00
Joshua Slive
f97356f955 Add Norwegian Nynorsk translation of welcome page.
Submitted by:	Roy-Magne Mo <rmo@sunnmore.net>
Reviewed by:	Ragnar Wisl�ff <ragnar@wisloff.no>, Tor Hildrum <torhildr@mac.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90932 13f79535-47bb-0310-9956-ffa450edef68
2001-09-06 18:27:56 +00:00
William A. Rowe Jr
4a98f8085f These no longer work, and even though most of this whole
<IfModule mod_proxy.c> section doesn't work today, at least
  get the syntax right for <Proxy > blocks.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90858 13f79535-47bb-0310-9956-ffa450edef68
2001-08-31 21:43:53 +00:00
William A. Rowe Jr
396bc6df6a Someone pointed out that we were running the images through the INCLUDE
filter.  This fixes it, in a sort of hackish way.
  I don't remember who noticed this, sorry :(


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90758 13f79535-47bb-0310-9956-ffa450edef68
2001-08-28 15:29:21 +00:00
Justin Erenkrantz
6c28ee4d9d As the worker MPM is really an alternative to the threaded MPM (and hopefully it'll be a replacement), the httpd.conf settings are identical.
Submitted by:	Aaron Bannert <aaron@clove.org>
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90738 13f79535-47bb-0310-9956-ffa450edef68
2001-08-27 20:55:09 +00:00
Martin Kraemer
46956f4ebb My first try at relocating the manual tree outside of the htdocs/ directory.
It will now reside in the ServerRoot, alongside with .../man/ and .../icons/
and .../htdocs/
-
Please review the config.layout entries for the vendor specific entries,
I supplied sensible defaults but you may disagree.

Reviewed by:	William A. Rowe, Jr., Joshua Slive, Rich Bowen


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90551 13f79535-47bb-0310-9956-ffa450edef68
2001-08-23 15:17:02 +00:00
Joshua Slive
ad9beffae1 If we use a type-map, we need to set up the handler.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90457 13f79535-47bb-0310-9956-ffa450edef68
2001-08-21 01:58:50 +00:00
Joshua Slive
2fb61a1d4c Typo fix to get error docs going.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90453 13f79535-47bb-0310-9956-ffa450edef68
2001-08-21 01:22:55 +00:00
Joshua Slive
40bf7616ad Add the rest of the error docs to httpd-*.conf.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90436 13f79535-47bb-0310-9956-ffa450edef68
2001-08-20 22:36:35 +00:00
William A. Rowe Jr
5f25da7607 We might want to disable this, by default, when we get ready for GA.
ITMT, this provides a fantastic stress-test for interoperability of
  the ap_die handling, the includes filter, the negotiated typemap
  behavior and the new typemap-body functions.

  Keep adding to the list of errors as they are converted from the
  httpd-2.0/docs/docroot/error individual files into docs/error.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90423 13f79535-47bb-0310-9956-ffa450edef68
2001-08-20 20:23:13 +00:00
William A. Rowe Jr
4bf48e8e09 Per Martin, Mark's and my discussion, index.html will _still_ override
the typemap, and enabling multiviews will undo the optimization.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90398 13f79535-47bb-0310-9956-ffa450edef68
2001-08-20 14:14:22 +00:00
William A. Rowe Jr
2f99b246a6 This patch;
enables Multiviews only for htdocs/manual/

    enables .var type map files to shortcut Multiviews

    changes the DirectoryIndex to index.html.var before index.html,
    again to avoid multiviews if a typemap exists.

    locates the /manual resource by an alias, so the user may easily
    change their DocumentRoot and still have access to the documentation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90377 13f79535-47bb-0310-9956-ffa450edef68
2001-08-19 23:19:05 +00:00
Graham Leggett
d7ef319885 Added a default commented-out mod_ldap and mod_auth_ldap
configuration to httpd-std.conf and httpd-win.conf
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90352 13f79535-47bb-0310-9956-ffa450edef68
2001-08-19 01:44:43 +00:00
Joshua Slive
b4fee0fd82 Lots of small config file changes including:
- Beat everything down to less than 80 character lines.

- Revise the comments for the DSO section to eliminate mention
of ordering problems.

- Add LoadModule lines for all extension modules, commented out.
Note that it is very difficult in the current ./configure
system to make the base modules DSOs, so I didn't include those.

- Remove ServerType comments.

- Add "deny from all" to the root directory container.  The comments
indicate that it should be there.

- Delete a little (in my opinion) excess verbosity in the
description of the .htacess download blocker.

- Remove the CacheNegotiatedDocs directive.  It was wrong,
and is obscure enough that people should probably just look
it up in the docs.

- Make the example for Redirect a little more explicit

- Change the examples and descriptions for READMENAME/HEADERNAME
since, if multiviews are off, they haven't worked as described
since 1.3.something.

- Remove the phf trap example.  This is very old and probably
worthless.

- Remove MetDir/MetSuffix.  These are rarely used.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90142 13f79535-47bb-0310-9956-ffa450edef68
2001-08-13 20:23:21 +00:00
Justin Erenkrantz
4f28d38299 Change the MaxSpareThreads to 150 for threaded MPM. This mirrors the new
prefork setting and removes the default case where we would spawn three
children, but kill two of them immediately because MaxSpareThreads was
set to 10 (only one children can be supported with the old value).

Please note that I don't have email access as eBuilt's servers are AWOL
this weekend (none of us have the desire to go in a fix the servers for
semi-obvious reasons).  I'm trying to keep up on posts via apachelabs.org.
So, if you want to change this, just go ahead and commit the changes...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90118 13f79535-47bb-0310-9956-ffa450edef68
2001-08-12 18:00:03 +00:00
Joshua Slive
4ef85cc751 Put the MaxClients setting for prefork back to its 1.3 level.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90116 13f79535-47bb-0310-9956-ffa450edef68
2001-08-12 15:44:18 +00:00
Ryan Bloom
a105221970 The ExtendedStatus directive was added back to mod_status when we
re-vamped that module before the first beta.  Since we put the directive
back, we should put it into the default config file.
PR:	7937


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89498 13f79535-47bb-0310-9956-ffa450edef68
2001-07-05 01:23:00 +00:00
William A. Rowe Jr
d8462ec039 Whoops, wanted the original unix language, not win32's, for both
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89330 13f79535-47bb-0310-9956-ffa450edef68
2001-06-10 20:47:22 +00:00