1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Commit Graph

1719 Commits

Author SHA1 Message Date
Ken Coar
89f6b366b5 Allow fancyindexed directories to be presorted in some other way
than by name.

PR:		1699
Submitted by:	Ken Coar
Reviewed by:	Martin Kraemer


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82594 13f79535-47bb-0310-9956-ffa450edef68
1999-01-04 14:35:53 +00:00
Ralf S. Engelschall
2e340f399e Small fix for mod_env.html: The module was documented as to be _not_
compiled into Apache per default, although it _IS_ compiled into
Apache per default.

Submitted by: Sim Harbert <sim@mindspring.com>
Reviewed by: Ralf S. Engelschall
PR: 3572


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82576 13f79535-47bb-0310-9956-ffa450edef68
1999-01-02 13:24:41 +00:00
Ralf S. Engelschall
5377cc517a Two minor enhancements to mod_rewrite: First RewriteRule now also supports the
``nocase|NC'' flag (as RewriteCond already does for ages) to match case
insensitive (this especially avoids nasty patterns like `[tT][eE][sS][tT]').
Second two additional internal map functions `escape' and `unescape' were
added which can be used to escape/unescape to/from hex-encodings in URLs parts
(this is especially useful in combination with map lookups).

Submitted by: Magnus Bodin, Ian Kallen
Integrated and fixed by: Ralf S. Engelschall


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82563 13f79535-47bb-0310-9956-ffa450edef68
1999-01-01 19:50:23 +00:00
Ralf S. Engelschall
c2419ae221 Fix a few minor inconsistencies related to directive scoping
============================================================

1. httpd -h

Under "httpd -h" one gets a nice English description in which scope a
directive can occur. But we talk here only about <Directory> and <Location>,
although <Files> is treated the same (also with `cmd->override ==
ACCESS_CONF|OR_ALL'). So I think it's correct to also list <Files>, too.

2. Used scope variants

Currently we have 203 directives and they use the following scopes (the
numbers in parenthesis gives the number of directives using a particular
scope):

   RSRC_CONF (106)
   RSRC_CONF|ACCESS_CONF (5)
   RSRC_CONF|ACCESS_CONF|OR_ALL (1)            <--
   RSRC_CONF|ACCESS_CONF|OR_AUTHCFG (2)        <--
   ACCESS_CONF (5)
   OR_AUTHCFG (20)
   OR_LIMIT (3)
   OR_OPTIONS (4)
   OR_FILEINFO (21)
   OR_INDEXES (23)
   OR_ALL (13)

This is well spreaded and sounds reasonable. Except for
the two classes:

   RSRC_CONF|ACCESS_CONF|OR_ALL (1)
   RSRC_CONF|ACCESS_CONF|OR_AUTHCFG (2)

The first one is just a syntax overkill. It means only OR_ALL, because OR_ALL
includes (implicitly) already RSRC_CONF and ACCESS_CONF. So, when we fix
this to OR_ALL we get:

   RSRC_CONF (106)
   RSRC_CONF|ACCESS_CONF (5)
   RSRC_CONF|ACCESS_CONF|OR_AUTHCFG (2)        <--
   ACCESS_CONF (5)
   OR_AUTHCFG (20)
   OR_LIMIT (3)
   OR_OPTIONS (4)
   OR_FILEINFO (21)
   OR_INDEXES (23)
   OR_ALL (14)

The remaining RSRC_CONF|ACCESS_CONF|OR_AUTHCFG is used by two directives:
UseCanonicalName and ContentDigest. Two not too old directives which were
added mostly at the same time. They're are implemented the same way.
But the scope looks incorrect. Why?

First, it's again syntax overkill, ok. We can reduce it to
RSRC_CONF|OR_AUTHCFG. But when we compare it to all other used scopes, it
looks very inconsistent. No other of the 203 directives want to be applicable
in such a non-orthoginal scope: on the first hand inside the AuthConfig scope
(which means .htaccess under "AllowOverride AuthConfig" plus _INSIDE_ of
<Directory>/<Location>/<Files> sections in httpd.conf only) and on the other
hand also in RSRC_CONF (which means _OUTSIDE_ of
<Directory>/<Location>/<Files> sections in httpd.conf only). Sure, finally
it's everywhere in httpd.conf plus .htaccess under AuthConfig scope.  But it's
not intuitive: Directives which want to be applicable in such a total scope
use OR_OPTIONS, OR_FILEINFO or OR_INDEXES. And when we think about
UseCanonicalName and ContentDigest we find out that they belongs more to
Options, XBitHack and CheckSpelling than to any AuthXXXX directives.

So, I propose to change the scope of those two directives to OR_OPTIONS.  It
makes no big difference, of course. It still is useable everwhere inside
httpd.conf, but inside .htaccess now under Options instead of AuthConfig.  And
it both belongs to the more correct group of directives and makes our list of
used scopes more consistent.

With the above patch be get this consistent scope-list:

   RSRC_CONF (106)
   RSRC_CONF|ACCESS_CONF (5)
   ACCESS_CONF (5)
   OR_AUTHCFG (20)
   OR_LIMIT (3)
   OR_OPTIONS (6)
   OR_FILEINFO (21)
   OR_INDEXES (23)
   OR_ALL (14)

When we take into account that _theoretically_ there are a lot more variants
of these or'ed values are possible, this list is _VERY_ clean. Actually it's
the most clean variant I can think of (except for the fact that the whole
mechanism is a horrible mess ;-)...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82558 13f79535-47bb-0310-9956-ffa450edef68
1999-01-01 17:03:12 +00:00
Lars Eilebrecht
d3bcc3e1e0 A little update (DefaultLanguage wasn't on the directives page).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82534 13f79535-47bb-0310-9956-ffa450edef68
1998-12-27 02:38:15 +00:00
pcs
1ef824be63 Fix HTML
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82445 13f79535-47bb-0310-9956-ffa450edef68
1998-12-04 17:39:24 +00:00
pcs
7ef4d35033 Actually, without a DefaultLanguage documents are considered to have _no_
language attribute. Apache does not default to English.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82433 13f79535-47bb-0310-9956-ffa450edef68
1998-12-02 17:01:26 +00:00
Ken Coar
9b6422cedb Put in Paul's DefaultLanguage code. I don't recall seeing
any negative comments, and it's pretty valuable for multilingual
	sites.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82425 13f79535-47bb-0310-9956-ffa450edef68
1998-12-02 03:45:51 +00:00
pcs
893fd31987 A few minor HTML fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82417 13f79535-47bb-0310-9956-ffa450edef68
1998-11-23 15:21:18 +00:00
pcs
42d564b100 Note that Redirect* require FileInfo override.
PR: 3346


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82411 13f79535-47bb-0310-9956-ffa450edef68
1998-11-20 17:07:38 +00:00
pcs
38955a3c99 Don't assume that filename extension is at the end of the filename
PR: 3151


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82407 13f79535-47bb-0310-9956-ffa450edef68
1998-11-20 16:34:17 +00:00
pcs
63e7bd76a6 Be more careful when documenting the way that extensions are mapped to
meta data. Note the effect of multiple extensions in all the Add*
directive descriptions, and explain that these directives add or override
existing mappings. Remove assumptions that there is only one extension.
Add note about how setting both handlers and media types could result in
unexpected results. Remove some highly misleading information such as that
the type is the extension left "after content-encoding and language
extensions have been removed"

PR: 3151


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82403 13f79535-47bb-0310-9956-ffa450edef68
1998-11-20 15:45:36 +00:00
Ralf S. Engelschall
d6defc369e Fix documentation of `Action' directive: It can activate a CGI script when
either a handler or a MIME content type is triggered by the request. We forgot
to mention the handler-based variant here.

Submitted by: Andrew Pimlott <pimlott@math.harvard.edu>
Reviewed by: Ralf S. Engelschall
PR: 3340


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82398 13f79535-47bb-0310-9956-ffa450edef68
1998-11-18 09:15:27 +00:00
Ralf S. Engelschall
c416b304ec Remove an old "old" from the old days where we thought mod_alias will be old ;-)
Thanks to Marc for discovering this too offensive wording...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82370 13f79535-47bb-0310-9956-ffa450edef68
1998-11-09 16:44:08 +00:00
Ken Coar
62ee3cbe95 Make it more clear that AuthName takes a single argument, and fix
a broken example in the FAQ.

PR:		3360
Submitted by:	Jonathan Hartzog <jhartzog@w00f.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82360 13f79535-47bb-0310-9956-ffa450edef68
1998-11-07 00:10:40 +00:00
Ken Coar
fa1e4ed782 Note that the SuppressHTMLPreamble IndexOption only came in
with Apache 1.3.

PR:		3267


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82294 13f79535-47bb-0310-9956-ffa450edef68
1998-10-22 17:43:20 +00:00
Ralf S. Engelschall
eb3d8c6331 Fix a few bugs in the mod_rewrite documentation by the
help of some hints from Adam M Donahue <amd0978@acf3.nyu.edu>.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82292 13f79535-47bb-0310-9956-ffa450edef68
1998-10-22 12:02:27 +00:00
Ken Coar
8f01495f7f Add a note about the size restriction on AddDescription text.
PR:		3218


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82266 13f79535-47bb-0310-9956-ffa450edef68
1998-10-16 06:48:11 +00:00
Marc Slemko
285fc3cf9d Add missing ProxyVia directive.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82264 13f79535-47bb-0310-9956-ffa450edef68
1998-10-15 16:54:09 +00:00
Martin Kraemer
6f41c7ec35 Add the new mod_autoindex features to new_features_1_3, add hyperlinks to
the IndexOptions keyword arguments (in the new form HREF="#indexoption:keyword").


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82230 13f79535-47bb-0310-9956-ffa450edef68
1998-10-06 19:54:01 +00:00
Ralf S. Engelschall
ffa03a35f4 Document `ErrorLog syslog:facility' variant of error logging.
Requested by: Youichirou Koga <y-koga@jp.FreeBSD.org>
Performed by: Ralf S. Engelschall
PR: 3096


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82204 13f79535-47bb-0310-9956-ffa450edef68
1998-10-03 13:38:31 +00:00
Ken Coar
92f2dca43e Back off a portion of the incremental-IndexOptions patch;
unprefixed keywords should clear all inherited options and
	start setting the local directory's options from scratch.
	Otherwise, 'keyword' and '+keyword' are essentially identical,
	and clearing inheritance a pain.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82194 13f79535-47bb-0310-9956-ffa450edef68
1998-10-02 21:35:33 +00:00
Ken Coar
8cf72c8c46 There appear to be no dissenters (other than for brand-new and
incompatible syntaxes) after three days, and I want to get this
	in for 1.3.3.  It can always be modified or reverted later.

	Add +/- prefixes to IndexOptions keywords, allow merging of
	multiple occurrences, and document the changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82175 13f79535-47bb-0310-9956-ffa450edef68
1998-09-28 22:32:10 +00:00
Ken Coar
59685f1c0d Correct name for IndexOptions keyword.
PR:		3066


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82150 13f79535-47bb-0310-9956-ffa450edef68
1998-09-24 15:27:52 +00:00
Martin Kraemer
ee4db23663 BS2000 only: Change nasty BS2000AuthFile to less dangerous BS2000Account
(no need to store a password anywhere)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82078 13f79535-47bb-0310-9956-ffa450edef68
1998-09-17 20:23:40 +00:00
Ken Coar
681f8e5fec More documentation consistency cleanup for 1.3.2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82066 13f79535-47bb-0310-9956-ffa450edef68
1998-09-17 14:15:02 +00:00
Ken Coar
caec9aac63 The semi-regular HTML cleanup of the documentation. There are
some HTML errors (incorrect anchor nesting, primarily) coming in
	another commit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82064 13f79535-47bb-0310-9956-ffa450edef68
1998-09-17 12:33:12 +00:00
Ken Coar
64b5f061b7 Fix some typos and inaccuracies and incorrectnesses.
PR:		3016
Submitted by:	Youichirou Koga <y-koga@jp.FreeBSD.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82061 13f79535-47bb-0310-9956-ffa450edef68
1998-09-17 12:06:41 +00:00
Ken Coar
dd3eb53f54 Fix 'resource config' to be 'server config.'
PR:		2997


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82039 13f79535-47bb-0310-9956-ffa450edef68
1998-09-13 10:03:57 +00:00
Jim Jagielski
7144848657 PR:
Obtained from:
Submitted by:
Reviewed by:
mod_status is now a Base module and included by default.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82037 13f79535-47bb-0310-9956-ffa450edef68
1998-09-12 20:16:51 +00:00
Ralf S. Engelschall
b4de41204c Fix mod_auth_*.html documents: NSCA -> NCSA
Submitted by: Youichirou Koga <y-koga@jp.FreeBSD.org>
PR: 2991


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82035 13f79535-47bb-0310-9956-ffa450edef68
1998-09-12 11:26:02 +00:00
Ralf S. Engelschall
db98ceb158 Fix documentation of ProxyPass/ProxyPassReverse according to the
trailing slash problem.

Submitted by: Jon Drukman <jsd@gamespot.com>
Reviewed by: Ralf S. Engelschall
PR: 2933


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82023 13f79535-47bb-0310-9956-ffa450edef68
1998-09-10 07:30:51 +00:00
Martin Kraemer
71026141b7 Sameer posted the AllowCONNECT back in march. I adapted it to default
to ports 443 and 563 (for https:// and snews://) and wrote a description
for the mod_proxy.html document.

Submitted by:	Sameer Parekh <sameer@c2.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82014 13f79535-47bb-0310-9956-ffa450edef68
1998-09-08 21:15:53 +00:00
Marc Slemko
20cd1090f9 Add some more detailed information about ListenBacklog and MaxClients,
plus a few misc cleanups.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82008 13f79535-47bb-0310-9956-ffa450edef68
1998-09-07 08:31:45 +00:00
Marc Slemko
595b5c8921 ExtendedStatus is first in 1.3.2, _NOT_ 1.3. Please be careful when
noting such things to avoid confused users.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@81998 13f79535-47bb-0310-9956-ffa450edef68
1998-09-06 19:00:41 +00:00
Marc Slemko
f2b9b63942 Fix mod_expires to add Expires headers for content that isn't served
from disk (ie. the case where r->finfo.st_mode == 0), unless it is
a modification date based setting.

PR:
Obtained from:
Submitted by:	Paul Phillips <paulp@go2net.com>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@81989 13f79535-47bb-0310-9956-ffa450edef68
1998-09-04 18:15:45 +00:00
Ken Coar
0189823900 Update the filname column width-sizing piece of mod_autoindex
so that it's customisable with a NameLength keyword on the
	IndexOptions directive.  A value of '*' means 'as wide as the
	longest filename,' which was the default effect of the last
	patch in this area.

PR:	1949, 2324


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@81979 13f79535-47bb-0310-9956-ffa450edef68
1998-09-02 21:04:39 +00:00
Ken Coar
1a6dd5e389 Clean up mod_autoindex's storage of the IndexOptions settings.
They are per-directory, not per-filename, so keeping them in
	an array is confusing and pointless.  They're now stored in an
	int in the module config record.  Also (finally!) fix the
	FancyIndexing directive so it gets merged into any IndexOptions
	settings for the current directory, rather than replacing them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@81972 13f79535-47bb-0310-9956-ffa450edef68
1998-08-31 01:18:48 +00:00
Marc Slemko
f1f562e65f LocationMatch, not Location, is only 1.3+.
PR:
Obtained from:
Submitted by:	Paul Phillips <paulp@go2net.com>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@81963 13f79535-47bb-0310-9956-ffa450edef68
1998-08-27 06:49:24 +00:00
Ralf S. Engelschall
7f9c8bc3b9 Remove bad reference to non-existing SERVER_VERSION in mod_rewrite.html
Submitted by: Youichirou Koga <y-koga@jp.FreeBSD.ORG>
Reviewed by: Ralf S. Engelschall
PR: 2895


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@81954 13f79535-47bb-0310-9956-ffa450edef68
1998-08-24 18:39:27 +00:00
Martin Kraemer
42e46d67b9 Add proxy Via: header management. Currently, Via: headers can be left
unchanged (compatibility), can be set to protocol and host only,
or to protocol, host and comment. Optionally, all Via: headers can
be suppressed if intranet privacy in companies is desired when going out
over a firewall apache.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@81939 13f79535-47bb-0310-9956-ffa450edef68
1998-08-16 20:51:52 +00:00
Roy T. Fielding
860f63ab0f Forgot that LimitRequestBody is allowed everywhere.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@81919 13f79535-47bb-0310-9956-ffa450edef68
1998-08-12 00:31:44 +00:00
Roy T. Fielding
405e967857 Documentation for the LimitRequest* directives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@81917 13f79535-47bb-0310-9956-ffa450edef68
1998-08-12 00:29:14 +00:00
Jim Jagielski
cbefa02222 mod_status isn't included by default so ExtendedStatus
is Extension not Base directive


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@81910 13f79535-47bb-0310-9956-ffa450edef68
1998-08-11 17:33:48 +00:00
Jim Jagielski
0c968cb5dd Move the ExtendedStatus option to mod_status
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@81907 13f79535-47bb-0310-9956-ffa450edef68
1998-08-11 15:37:50 +00:00
Jim Jagielski
e44cc22be0 And now the docs for ExtendedStatus
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@81902 13f79535-47bb-0310-9956-ffa450edef68
1998-08-11 00:24:28 +00:00
Ken Coar
0ed57939cb Allow CheckSpelling to be used anywhere, not just at the server
level.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@81878 13f79535-47bb-0310-9956-ffa450edef68
1998-08-06 23:31:55 +00:00
Lars Eilebrecht
43af9f19e8 We don't want to make people think that '_' are allowed in hostnames.
PR: 2788


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@81866 13f79535-47bb-0310-9956-ffa450edef68
1998-08-06 01:05:30 +00:00
Ralf S. Engelschall
006c7b9273 Fixed examples in mod_rewrite.html document.
PR: 2756


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@81841 13f79535-47bb-0310-9956-ffa450edef68
1998-08-02 11:18:26 +00:00
Marc Slemko
70f15d6e86 Digest is mostly supported, for all the good it does.
PR: 2715
Obtained from:
Submitted by:	Youichirou Koga <y-koga@jp.FreeBSD.org>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@81827 13f79535-47bb-0310-9956-ffa450edef68
1998-07-28 05:57:13 +00:00