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

71 Commits

Author SHA1 Message Date
Jim Jagielski
427c85bd23 Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:39:32 +00:00
Eric Covener
b1b5e91608 improve (but preserve searchable parts of) the error message when Options
-Indexes is about to trigger a 403 in mod_autoindex, with a pointer
to mod_dir about how the DirectoryIndex might have been the real culprit.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1147339 13f79535-47bb-0310-9956-ffa450edef68
2011-07-15 22:32:42 +00:00
Eric Covener
089fe8d519 Add a mod_dir option to allow the used DirectoryIndex to
be externally redirected.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1147327 13f79535-47bb-0310-9956-ffa450edef68
2011-07-15 21:45:57 +00:00
Jeff Trawick
2223171dd9 gratuitous style change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031614 13f79535-47bb-0310-9956-ffa450edef68
2010-11-05 15:05:39 +00:00
Stefan Fritsch
affc4cf328 save some memory by using cmd->temp_pool instead of cmd->pool in some places
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1002156 13f79535-47bb-0310-9956-ffa450edef68
2010-09-28 13:19:33 +00:00
Nick Kew
4ace82f934 Merge mod_dir fixups to avoid possible ordering issues noted by trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@978903 13f79535-47bb-0310-9956-ffa450edef68
2010-07-24 17:12:02 +00:00
Stefan Fritsch
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 16:59:50 +00:00
Nick Kew
8c13e8877c Change Fallback to FallbackResource after extensive discussion with
wrowe and DrBacchus.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@815502 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 21:41:05 +00:00
Nick Kew
608b02264e Change "DefaultHandler" to "Fallback" as discussed on list and
today on IRC, in the hope that everyone will be satisfied.
PR: 47184 + subsequent veto of original directive name


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@815380 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 16:10:21 +00:00
Nick Kew
99dfebc752 mod_dir: Change DefaultHandler to DefaultMapping, and document it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@795450 13f79535-47bb-0310-9956-ffa450edef68
2009-07-18 23:49:20 +00:00
Nick Kew
1d0a22fad6 Fix bug in r785425 (dereference null pointer when not configured)
and add a couple of comments.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@785457 13f79535-47bb-0310-9956-ffa450edef68
2009-06-17 00:31:10 +00:00
Nick Kew
f7ff190d74 Add DefaultHandler directive to mod_dir.
PR 47184


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@785425 13f79535-47bb-0310-9956-ffa450edef68
2009-06-16 21:57:25 +00:00
Ruediger Pluem
362b77f64b * The nitpicker of the space police. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@713504 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 20:44:53 +00:00
Eric Covener
316120949e temporary dbg message and unnecessary continue, per rpluem review
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@713487 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 20:10:29 +00:00
Eric Covener
e4fbdf0e35 change short-lived behavior of "DirectoryIndex None" based on feedback from wrowe:
Doesn't search for anything:
  DirectoryIndex disabled

Does search for literal "disabled":
  DirectoryIndex disabled foo.
  DirectoryIndex foo disabled 
  DirectoryIndex disabled disabled 

Does search:
  DirectoryIndex disabled.html



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@713462 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 19:25:03 +00:00
Eric Covener
a5d6364e88 *) mod_dir: Support "DirectoryIndex None"
Suggested By André Warnier <aw ice-sa.com> [Eric Covener]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@706001 13f79535-47bb-0310-9956-ffa450edef68
2008-10-19 12:35:42 +00:00
Dirk-Willem van Gulik
862722ebf4 Sub-requests are created and used with two purposes; sometimes
simply to 'see' what a request would do; as to fill out an SSI,
validate access or similar - and is then discarded. And sometimes
as the precursor to becoming the actual request; e.g. when mod_dir
checks if an /index.html can be served for a '/'.

In the latter case it is important to preserve the output filters
'for real'; whereas in the first case they have to be reset to
purely the minimal proto filters (if at all). This patch instates
the output filters in 3 cases where sub-requests are/may in fact
be used as the real request later on.

This is a relatively risky change (which should not be back-ported 
without further discussion) and may break caches in combination 
with internal redirects/vary/negotiation in subtle ways.

See the thread starting at [1] and in particular the general 
concerns of rpluem at [2] with respect to sub requests 
and (fast_)internal redirects possibly needing a more 
thorough overhaul.

1: http://mail-archives.apache.org/mod_mbox/httpd-dev/200802.mbox/ajax/%3c335D1A4B-25E2-4FF1-8CDF-5010A7FBD293@webweaving.org%3e
2: http://mail-archives.apache.org/mod_mbox/httpd-dev/200802.mbox/%3c47ACE1D4.4060702@apache.org%3e



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@620133 13f79535-47bb-0310-9956-ffa450edef68
2008-02-09 15:04:57 +00:00
Roy T. Fielding
de659cbed0 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 20:33:53 +00:00
Colm MacCarthaigh
dd95d7c37c Update the copyright year in all .c, .h and .xml files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:11:27 +00:00
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:11:44 +00:00
Colm MacCarthaigh
86751a71e4 Explain why we have the regular file typecheck. No functional changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@291672 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 16:51:41 +00:00
Paul Querna
b0a7a77363 Do not check the value of r->handler.
This allows the use of SetHandler for an entire directory, and since we already check via the stat structure if this is a directory, there is no reason for this extra check, which causes a regression since 1.3.

PR: 25435


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@233369 13f79535-47bb-0310-9956-ffa450edef68
2005-08-18 20:10:26 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
André Malo
acbb11eddf make trailing-slash-behaviour configurable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104154 13f79535-47bb-0310-9956-ffa450edef68
2004-07-03 16:43:39 +00:00
André Malo
a688f06b19 fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102618 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:31:03 +00:00
André Malo
3d75c8c079 fix copyright dates according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102572 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 12:27:14 +00:00
André Malo
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +00:00
André Malo
d472c53a87 allow proxying of directoryindex'd resources
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102332 13f79535-47bb-0310-9956-ffa450edef68
2004-01-14 00:41:25 +00:00
André Malo
fb07607180 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:26:26 +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
Aaron Bannert
a44ccba9da Only style fixes (tabs, blocks, spelling).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95128 13f79535-47bb-0310-9956-ffa450edef68
2002-05-16 05:20:46 +00:00
Bill Stoddard
9443a2ac8e Fix some formatting
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93985 13f79535-47bb-0310-9956-ffa450edef68
2002-03-17 22:20:50 +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
Greg Ames
699e8f8d80 fix redirects for directories. fixup_dir was munging the URI before other
fixup hooks (such as fixup_redir in mod_alias) had a chance to redirect
the original directory URI.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93141 13f79535-47bb-0310-9956-ffa450edef68
2002-01-31 19:54:53 +00:00
Jeff Trawick
570b020eae get rid of an unused variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92643 13f79535-47bb-0310-9956-ffa450edef68
2001-12-28 22:19:50 +00:00
William A. Rowe Jr
f1633e0410 Once again, if mod_dir will perform an internal redirect into a
RESPONSE BODY (as opposed to 'something else' of it's own generation)
  it needs to make the caller aware of the results (e.g. an included
  subrequest) so the caller can decide if the result is suited (e.g.
  including text/html only, but refusing to include other binary results.)

  Since we can know everything about the results of the mod_dir processing
  by the fixups phase, let it perform all resolutions before the caller
  of ap_process_request_internal makes it's decisions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92641 13f79535-47bb-0310-9956-ffa450edef68
2001-12-28 17:20:41 +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
William A. Rowe Jr
13cff90a55 Two cases we are certain of canonical correctness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90586 13f79535-47bb-0310-9956-ffa450edef68
2001-08-23 21:05:42 +00:00
William A. Rowe Jr
7c91bb33c3 Kill some deadwood
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89945 13f79535-47bb-0310-9956-ffa450edef68
2001-08-06 18:50:53 +00:00
Jeff Trawick
35a2fa5361 Under certain circumstances, Apache did not supply the
right response headers when requiring authentication.
[Gertjan van Wingerde <Gertjan.van.Wingerde@cmg.nl>] PR#7114
(This is a port of the change that went into Apache 1.3.19.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88901 13f79535-47bb-0310-9956-ffa450edef68
2001-04-20 15:38:24 +00:00
Greg Stein
8970167b7c do the redirection for GET requests only
Submitted by: Ryan Bloom and Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88305 13f79535-47bb-0310-9956-ffa450edef68
2001-02-24 22:40:49 +00:00
Ryan Bloom
36c56ce722 Split the mod_dir fixup into two parts. The first determines if this
is a MOVED_PERMANANTLY response, and is done from the fixup.  The second
is a handler that redirects to an index.html page.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88263 13f79535-47bb-0310-9956-ffa450edef68
2001-02-21 17:54:41 +00:00
Ryan Bloom
2edc2edcf6 Make mod_dir use a fixup for sending a redirect to the browser.
Before this, we were using a handler, which doesn't make much
sense, because the handler wasn't generating any data, it would
either return a redirect error code, or DECLINED.  This fits the
current hooks better.
Submitted by:	Ryan Morgan <rmorgan@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88255 13f79535-47bb-0310-9956-ffa450edef68
2001-02-21 01:04:39 +00:00
Roy T. Fielding
381f88d56a Update copyright to 2001
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88184 13f79535-47bb-0310-9956-ffa450edef68
2001-02-16 04:26:53 +00:00
Doug MacEachern
88d3406f9a renaming various functions for consistency sake
see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88019 13f79535-47bb-0310-9956-ffa450edef68
2001-02-08 07:45:33 +00:00
William A. Rowe Jr
59bbd68bec The big change. This is part 3 of the apr-util symbols rename, please
see the first commit of srclib/apr-util/include (cvs apr-util/include)
  for the quick glance at symbols changed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87731 13f79535-47bb-0310-9956-ffa450edef68
2001-01-19 07:04:36 +00:00
William A. Rowe Jr
40655f8641 Provide apr_pool_t arg to register_hooks, since anything they do in that
step -must- be done with a pool that will not outlive the cmd pool, from
  which they may have been dynamically loaded.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87697 13f79535-47bb-0310-9956-ffa450edef68
2001-01-17 15:52:12 +00:00
Doug MacEachern
40391fb9f2 adjust remaining modules to use the new handler hook method (Alan Edwards)
bring back the old handler prototype by reusing r->handler (dougm)
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87617 13f79535-47bb-0310-9956-ffa450edef68
2001-01-08 23:55:12 +00:00
Ben Laurie
45f620672d Make handlers use hooks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87604 13f79535-47bb-0310-9956-ffa450edef68
2001-01-07 19:55:59 +00:00
Greg Stein
d0968eb9af add the "next filter" parameter to the rest of the ap_sub_req_* calls.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87076 13f79535-47bb-0310-9956-ffa450edef68
2000-11-23 13:03:46 +00:00