1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-05 05:30:39 +03:00
Commit Graph

170 Commits

Author SHA1 Message Date
André Malo
bc5b07c9a4 If a directory contains a file listed in the
DirectoryIndex directive, the folder icon is no longer replaced
by the icon of that file.

PR:	9587
Submitted by:	David Shane Holden <dpejesh@yahoo.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100628 13f79535-47bb-0310-9956-ffa450edef68
2003-07-15 13:22:03 +00:00
André Malo
dac1e5717b Unescape the supplied wildcard pattern. Otherwise the pattern will
not always match as desired. In order to be correct and safe, the
pattern will be re-escaped for output.

PR: 12596


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98885 13f79535-47bb-0310-9956-ffa450edef68
2003-03-02 18:06:16 +00:00
André Malo
ac90d0c043 add some comments and WS to make it better readable (hopefully ;-)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98884 13f79535-47bb-0310-9956-ffa450edef68
2003-03-02 17:28:34 +00:00
André Malo
f99c1d6dca emit and accept modern query string parameter delimiters (;).
Thus column headers no longer contain unescaped ampersands.

PR: 10880


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98883 13f79535-47bb-0310-9956-ffa450edef68
2003-03-02 17:15:43 +00:00
André Malo
c35ab34ccf buhuh! use the correct target string and don't forget
F=x and V=y in column headers ...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98882 13f79535-47bb-0310-9956-ffa450edef68
2003-03-02 16:26:45 +00:00
André Malo
5f90dfcdf9 WS and style issues. No code changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98880 13f79535-47bb-0310-9956-ffa450edef68
2003-03-02 13:38:38 +00:00
André Malo
742af25096 finished that boring job:
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
William A. Rowe Jr
05caa1cf52 Bring forward the IndexOptions IgnoreCase option to mod_autoindex
from Apache 1.3 for both 2.0 and 2.1 (since the patch/feature was
  previously accepted for 1.3, I'm committing without the usual vote
  specific to 2.0.)  Only small modification of David's patch to avoid
  future reformatting of the options list and better handle the strnatcmp
  side effects.

PR: 14276
Obtained from:
Submitted by:	David Shane Holden <dpejesh@yahoo.com>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98181 13f79535-47bb-0310-9956-ffa450edef68
2003-01-06 15:20:32 +00:00
Jeff Trawick
d91c0c5bb3 mod_autoindex: AddDescription directives for directories
now work as in Apache 1.3, where no trailing '/' is
specified on the directory name.  Previously, the trailing
'/' *had* to be specified, which was incompatible with
Apache 1.3.

PR:       7990


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97590 13f79535-47bb-0310-9956-ffa450edef68
2002-11-21 23:53:21 +00:00
Sander Striker
795c3a0302 One line fix to get HTMLTable to validate.
PR: 13351
Submitted by: Thom May <thommay@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97158 13f79535-47bb-0310-9956-ffa450edef68
2002-10-09 09:50:09 +00:00
William A. Rowe Jr
2604f8bdbb Changes for deprecated apr_is_fnmatch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95976 13f79535-47bb-0310-9956-ffa450edef68
2002-07-08 17:43:34 +00:00
Jeff Trawick
0971e59fed if we autoindex, discard the request body and check for any
errors doing so


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95453 13f79535-47bb-0310-9956-ffa450edef68
2002-05-31 20:50:14 +00:00
Cliff Woolley
81c03e82c4 Renames:
APR_XtOffset   -> APR_OFFSET
  APR_XtOffsetOf -> APR_OFFSETOF


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95164 13f79535-47bb-0310-9956-ffa450edef68
2002-05-18 04:13:13 +00:00
Jeff Trawick
bc0cf18899 stop using APLOG_NOERRNO in calls to ap_log_[pr]error()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95151 13f79535-47bb-0310-9956-ffa450edef68
2002-05-17 11:33:10 +00:00
Cliff Woolley
2a644fbdb8 Fix HTML 3.2 validation error: &O is not a valid entity. Should be &amp;O
Reported by: validator.w3.org


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94740 13f79535-47bb-0310-9956-ffa450edef68
2002-04-21 19:10:07 +00:00
Cliff Woolley
219a3a1011 Fix mod_autoindex output with SuppressRules turned on.
PR: 8016
Submitted by: David Shane Holden <dpejesh@yahoo.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94739 13f79535-47bb-0310-9956-ffa450edef68
2002-04-21 18:35:26 +00:00
Sander Striker
6e8efec657 Adapt to the rename of apr_explode_localtime to apr_time_exp_lt in APR.
Submitted by: Thom May <thom@planetarytramp.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94631 13f79535-47bb-0310-9956-ffa450edef68
2002-04-13 12:02:38 +00:00
Ryan Bloom
45cb1e8190 This is a HACK! The problem is that the fast_internal_redirect is
removing the OLD_WRITE filter. Obviously that is wrong.  For right now,
the fix is to hack around the problem and just make it work.  Long term,
we need to find a real solution to this, but this gets autoindex working
today.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94457 13f79535-47bb-0310-9956-ffa450edef68
2002-04-05 17:50:37 +00:00
Bill Stoddard
d5c24720dc Commit 1 of 2 to:
1. rename ap_rset_content_type to ap_set_content_type
2. reverse the arguments on the call to aligh with ap_set_content_length


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94056 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 17:41:55 +00:00
Bill Stoddard
470edb9dd8 First commit to introduce accessor function to set r->content_type..
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94027 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 01:58:47 +00:00
Roy T. Fielding
845cbfd508 Update our copyright for this year.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93918 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:48:07 +00:00
Ian Holsman
da35725071 apr-utils rename apr_ansi_time_to_apr_time and
apr_exploded_time_t.

PR:
Obtained from:
Submitted by:	Thom May <thom@planetarytramp.net>
Reviewed by:	Ian Holsman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93733 13f79535-47bb-0310-9956-ffa450edef68
2002-03-06 17:55:38 +00:00
William A. Rowe Jr
b494547e8a next_filter of NULL to any ap_sub_req_lookup*() fn implies the subreq
will never be run - or we expect to pass the subreq to fast_redirect.
  The comming fix will break invalid ap_sub_req_lookups* expecting to
  run subrequests with the next_filter NULL semantic.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93663 13f79535-47bb-0310-9956-ffa450edef68
2002-03-01 20:44:20 +00:00
Justin Erenkrantz
00ad366b42 That check is superfluous since we must have savename defined
(otherwise, we'd get APR_INCOMPLETE on apr_dir_read).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93330 13f79535-47bb-0310-9956-ffa450edef68
2002-02-07 06:50:52 +00:00
Justin Erenkrantz
795f15723d Allow mod_autoindex to serve symlinks if permitted and optimize our stats
so that only one stat() is needed.

If we get APR_FINFO_MIN bits, lookup_dirent won't do a repeated stat()
call.  So, let's do it here.  Also, if we see a symlink, expand it.
(Technically, we don't *have* to expand the symlinks - the resolve_symlink
fix handles that, but we can't really assume that.)  Since we know that
dirent will be rr->finfo anyway, go back to relying on dirent only for
APR_DIR checks.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93329 13f79535-47bb-0310-9956-ffa450edef68
2002-02-07 06:37:09 +00:00
Cliff Woolley
e2b7e4bd89 Vetoed by Ken
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93256 13f79535-47bb-0310-9956-ffa450edef68
2002-02-05 15:35:54 +00:00
Cliff Woolley
87e7dd20a9 List files that would result in HTTP_UNAUTHORIZED in addition to
successes and redirections, since there's a chance the client will
actually have the proper authorization to retrieve them.

Reported by:	Stas Bekman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93250 13f79535-47bb-0310-9956-ffa450edef68
2002-02-05 09:26:02 +00:00
Greg Ames
6cbb3ef98e vetoing and backing out OtherBill's patch rev 1.91. This breaks
mod_autoindex on systems such as Unix where apr_dir_read doesn't automatically
return the filetype.  You see a '?' icon rather than a folder icon
for directories on 2.0.31 because mod_autoindex doesn't realize that the thing
is a directory.

No, we don't want more stat()s either.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93232 13f79535-47bb-0310-9956-ffa450edef68
2002-02-04 21:19:08 +00:00
William A. Rowe Jr
011c7375e9 Which PR? I can't count them all. Get QUERY_STRING and PATH_INFO
working again.  Also rounds out our fix to work around negotiated
  directories which Greg Ames fixed; this addition in request.c simply
  shortcuts all further processing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93045 13f79535-47bb-0310-9956-ffa450edef68
2002-01-27 07:44:07 +00:00
William A. Rowe Jr
f2ec300d52 This otherwise ineffectual patch allows modules to perform internal
redirects of dirs into other resources, while still treating such a
  resource as a dir, based on the original apr_dir_read results.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92638 13f79535-47bb-0310-9956-ffa450edef68
2001-12-28 17:07:33 +00:00
Aaron Bannert
8a1532ee10 Get rid of identifiers called 'stat' so we don't conflict with the libc
'stat' symbol.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92625 13f79535-47bb-0310-9956-ffa450edef68
2001-12-27 18:12:15 +00:00
Aaron Bannert
0e12928c3c Just style changes. Really just 's/\t/ /' since the tabstop alignment
was pretty good. Added a couple braces and spaces here and there.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92624 13f79535-47bb-0310-9956-ffa450edef68
2001-12-27 18:07:22 +00:00
Ken Coar
d8e78dba8e Style-guide fixes, no functional changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91660 13f79535-47bb-0310-9956-ffa450edef68
2001-10-25 20:36:10 +00:00
William A. Rowe Jr
1338b5aa68 Restrict by content type and encoding before we go and try to drag in some
text to merge as headers and footers to autoindex pages.  This will escape
  index.gif from a bold attempt to use IndexHeader index ;)

  Also pass in the args to the subrequest, for anyone trying to decode what
  the user is looking at.  A great example of this coming up.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91609 13f79535-47bb-0310-9956-ffa450edef68
2001-10-20 18:54:54 +00:00
William A. Rowe Jr
ee283b4cf3 Assure that non-FancyIndexed listings properly shortcut dir entries,
and display and href the trailing slash, as well.

PR: 8206


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90364 13f79535-47bb-0310-9956-ffa450edef68
2001-08-19 18:58:19 +00:00
Ryan Bloom
6fdd45dc48 Update the Apache code to account for the XtOffset change in APR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90356 13f79535-47bb-0310-9956-ffa450edef68
2001-08-19 05:48:19 +00:00
William A. Rowe Jr
aee905a061 Fix a small bug that limited the description's width to the filename's width.
Submitted by:	Mladen Turk <mladen.turk@mail.inet.hr>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90162 13f79535-47bb-0310-9956-ffa450edef68
2001-08-14 19:46:21 +00:00
Ryan Bloom
6e932b2870 Fix the new method code. We need to cast 1 to an apr_int64_t or it will
be treated as a 32-bit integer, and it will wrap after being shifted
32 times.
Submitted by:	Cody Sherr <csherr@covalent.net> and
		Ryan Morgan <rmorgan@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90090 13f79535-47bb-0310-9956-ffa450edef68
2001-08-11 04:04:13 +00:00
William A. Rowe Jr
ecfff91535 Thanks rbb, and the modproxy-dev autobuild report for pointing these out.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89983 13f79535-47bb-0310-9956-ffa450edef68
2001-08-07 15:15:53 +00:00
William A. Rowe Jr
a7632f5040 All mod_autoindex query parsing is now quietly quashed with the
IndexOption IgnoreClient.  The IndexOption SuppressColumnSorting
     still drops the column sort <a href>'s for the column headers, but
     IgnoreClient is required to ignore these Query options entirely.

     Introduced new mod_autoindex query argument parsing for F=[0|1|2]
     to allow the client to select plain, FancyIndexing or HTMLTable
     formatting, V=[0|1] to inhibit or enable version sorting, and
     P=pattern to return only specific files.  The old Query Arguments
     were reorganized as C=f for sorting column 'f' (same N, D, S, or M
     as before), and O=A|D for ordering ascending or descending.

     Docs and an Example are provided in mod_autoindex.html


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89981 13f79535-47bb-0310-9956-ffa450edef68
2001-08-07 12:54:31 +00:00
William A. Rowe Jr
5c1fdbd27d Formatted output changes only...
Introduced new mod_autoindex IndexOptions flags; SuppressIcon to
     drop the icon column and SuppressRules to drop the <hr> elements.
     These are necessary for HTML 3.2 final formatting rules.

     Introduced HTMLTable to create rudimentary HTML table listings
     (implies FancyIndexing).  Necessary for alternate charsets, since
     the columns are borked by multibyte characters.

     Re-Introduced the mod_autoindex IndexOptions flag TrackModified
     from Apache 1.3.15.  This is needed for two reasons, first, given
     multiple machines within a server farm, ETags and Last-Modified
     stamps won't correspond from machine to machine, and second, many
     Unixes don't capture changes to the date or time stamp of existing
     files, since these don't modify the dirent itself.
     [Originally for 1.3 by me]

     Re-Introduced the mod_autoindex InextOptions flag FoldersFirst
     and DirectoryWidth options from Apache 1.3.10.
     [Originally for 1.3 by Ken Coar]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89979 13f79535-47bb-0310-9956-ffa450edef68
2001-08-07 04:33:58 +00:00
Jeff Trawick
963d24145a remove a gcc warning, leave object code unchanged
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89911 13f79535-47bb-0310-9956-ffa450edef68
2001-08-03 21:44:34 +00:00
William A. Rowe Jr
912ccbe306 Save hundreds of cycles on every autoindex request by _not_ attempting
to to test the parent (..) sub request!  This patch also allows the user
  to see things that will redirect them.  That way, the lnk or dir within
  the directory is displayed correctly.

  Also allows an ALT text entry other than DIR by providing AddAlt
  ^^DIRECTORY^^, as the user (might) expect to be allowed to do.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89909 13f79535-47bb-0310-9956-ffa450edef68
2001-08-03 18:32:03 +00:00
William A. Rowe Jr
8b2fc6826c That's enough for tonight ... gheesh. Allow 2xx + OK (0) results from
the subrequest to go out to the client.  This doesn't address (..)
  anomilies, which I will address in the a.m.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89901 13f79535-47bb-0310-9956-ffa450edef68
2001-08-03 02:22:47 +00:00
William A. Rowe Jr
52e25595a6 Allow a slightly larger range of acceptable responses.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89900 13f79535-47bb-0310-9956-ffa450edef68
2001-08-03 02:17:44 +00:00
William A. Rowe Jr
94ff0163de Fix some major brokenness. We were not validating that the autoindex
subrequest'ed file was valid, and did not check a subrequest at all if
  the user didn't use FancyIndexing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89899 13f79535-47bb-0310-9956-ffa450edef68
2001-08-03 01:31:26 +00:00
William A. Rowe Jr
913809b6b2 Begone ancient beast. IndexOptions FancyIndexing is sufficiently less
confusing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89897 13f79535-47bb-0310-9956-ffa450edef68
2001-08-03 01:00:12 +00:00
William A. Rowe Jr
7cd0d1ced8 Throw back in the newline, just for source legibility.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89770 13f79535-47bb-0310-9956-ffa450edef68
2001-07-29 21:26:52 +00:00
William A. Rowe Jr
6575e586ae Correct a subtle reflow problem (evident in Mozilla Gecko/20010505) that
<hr>'s within <pre> tags (entirely illegal in the first place :) are not
  adjusted on window resize.  By moving the second <hr /> into the <pre>
  block, at least the two rules are consistent.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89769 13f79535-47bb-0310-9956-ffa450edef68
2001-07-29 21:24:51 +00:00
William A. Rowe Jr
ce46d6ee9e Minor quibble, <li> can and should be a balanced tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89754 13f79535-47bb-0310-9956-ffa450edef68
2001-07-28 01:33:10 +00:00