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

2008 Commits

Author SHA1 Message Date
William A. Rowe Jr
91cd7755cd Negotiation once allowed any file, of any filename extension, to be
served.  The original patch to mod_negotation eliminated all extensions
  that did not reflect filename extensions associated with negotiation
  variables, unless the user expressly specified the file name with those
  filename extensions.

  This patch [attributed to me] was vetoed at its inception, it was provided
  as an alternative for those who had to have the current behavior.

  There is now another alternative patch that would introduce the
  MultiviewsMatch directive to mod_mime, for consideration and discussion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91405 13f79535-47bb-0310-9956-ffa450edef68
2001-10-10 19:43:37 +00:00
William A. Rowe Jr
d41d182fe6 Short of removing the headers filter, this is the best asis can do.
Note that all body replies were entirely broken (thanks for helping
  me notice this, Greg :)

  Asis still needs patching for huge files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91401 13f79535-47bb-0310-9956-ffa450edef68
2001-10-10 18:37:35 +00:00
Justin Erenkrantz
f624792711 Allow mod_so to be enabled by default even if no shared libraries from the
core are requested.

If you want to disable shared library support, pass --disable-so to
configure (as always).  This will enforce that your httpd can NOT use
shared libraries - which may be a good thing for you to do.

Justin added the APR_HAS_DSO check per discussion on-list between Aaron,
Ryan, Greg, and the rest of the peanut gallery.  This should allow us
to not build mod_so when it isn't supported.  However, the rest of the
configure scripts need to know that shared objects aren't supported and
complain accordingly.  (sharedobjs = yes, error out?)

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91393 13f79535-47bb-0310-9956-ffa450edef68
2001-10-10 05:04:40 +00:00
Greg Ames
29c24582cf allow file extentions specified by AddHandler, AddInputFilter, and
AddOutputFilter to be ignored when matching the URI.

Submitted by:	Bill Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91376 13f79535-47bb-0310-9956-ffa450edef68
2001-10-09 01:45:20 +00:00
Greg Stein
3c43502494 Get rid of some byterange handling code; it doesn't apply in Apache 2.0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91374 13f79535-47bb-0310-9956-ffa450edef68
2001-10-09 00:48:51 +00:00
Greg Stein
900a4ce759 Don't set r->status_line. Apache uses that in preference to any other status
line, thinking we've set a custom status. Of course, it says "200 OK" no
matter what error we happen to return(!).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91372 13f79535-47bb-0310-9956-ffa450edef68
2001-10-08 23:10:37 +00:00
Ian Holsman
dd713bba3b dechunking filter removed.
add HTTP_IN filter after the headers have been parsed.
so that the HTTP_IN can check them ;-)
Still not 100% if this works properly, but I don't get
the chunking numbers displayed on my browser,
so it's better than what was there.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91370 13f79535-47bb-0310-9956-ffa450edef68
2001-10-08 21:49:17 +00:00
Greg Stein
173d083ed0 HTTP_IN was attempting to process the PEEK mode. This threw off
check_pipeline_flush(), making it think another request was available (when
it wasn't). Apache would avoid flushing the prior request and block on
reading the next request. (of course, the client wasn't sending the next
one, cuz it was still waiting for the results of the first one)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91366 13f79535-47bb-0310-9956-ffa450edef68
2001-10-08 20:12:50 +00:00
Ian Holsman
4bd8279a92 initial port of new Request-mode HTTP_IN filter to proxy.
Status: It serves a reverse-proxy page.. but SLOWLY.
VERY SLOWLY.
still looking at why, but now it serves pages instead of dumping core.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91363 13f79535-47bb-0310-9956-ffa450edef68
2001-10-08 19:25:35 +00:00
William A. Rowe Jr
3a5f40f85b I don't know if these are correct, just my best alien guess.
I also don't suspect we want to add test/ to the modules/ makefile,
  since test won't be distributed with the tarball.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91332 13f79535-47bb-0310-9956-ffa450edef68
2001-10-06 05:09:08 +00:00
William A. Rowe Jr
6b3d6e66ab Some other modules here are argueably tests ... but these are nothing
but tests.  No end user would ever be interested in 'experimenting'
  with them :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91331 13f79535-47bb-0310-9956-ffa450edef68
2001-10-06 05:07:03 +00:00
William A. Rowe Jr
06ced8a978 Legibility counts for something, so does eliminating bogus ssize_t
products from pointer subtraction ;)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91329 13f79535-47bb-0310-9956-ffa450edef68
2001-10-06 04:41:37 +00:00
William A. Rowe Jr
d0646a92a6 Add some mime magic to the Win32 build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91291 13f79535-47bb-0310-9956-ffa450edef68
2001-10-04 19:38:16 +00:00
Justin Erenkrantz
d18a2bcce3 Ah, I didn't see that churn is only used on input - rename the function
to match churn_output.  =)

Yes, I'm slowly working on fixing mod_ssl...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91289 13f79535-47bb-0310-9956-ffa450edef68
2001-10-04 17:50:39 +00:00
Ryan Bloom
e4322fb2e1 Fix --enable-mods-shared processing. If most is specified,
then all modules that can be compiled as shared modules are.  This
was done by adding a module config specifier, static, which denotes
that a module can not be compiled as a DSO.

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91262 13f79535-47bb-0310-9956-ffa450edef68
2001-10-03 17:47:51 +00:00
Ryan Bloom
0ccb72edfb Remove an old comment. This config.m4 is numbered 9, which is the
highest possible number, so it is garaunteed to be in the last batch.  Any
module config.m4 should just use a number < 9 to ensure that this continues
to work.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91259 13f79535-47bb-0310-9956-ffa450edef68
2001-10-03 17:31:13 +00:00
Jeff Trawick
e4b78cbf4c rename variable "except" to avoid colliding with a macro of the
same name on Tru64


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91253 13f79535-47bb-0310-9956-ffa450edef68
2001-10-03 13:10:16 +00:00
William A. Rowe Jr
e28085508f Fix a mismatching issue, where index.html.foo.en had recognized .html and
.en components, and exceptions index and foo.  This patch will ignore the
  'missing' exception html from the request, and go on to test the exception
  foo in the list.

  This does -not- imply that a request for index.foo will succeed, in the
  example above.  The pattern match tests index.foo[.*] so we wouldn't find
  index.html.foo.anything.  The pattern matching proposed at one time by
  Francis Daly would allow index.foo to succeed as well [although many to
  many matching is dangerous, see comments in this patch.]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91249 13f79535-47bb-0310-9956-ffa450edef68
2001-10-03 01:18:22 +00:00
William A. Rowe Jr
73fcb0b7af Goodbye r->content_lanaguage (per vote from apache-1.3/STATUS).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91244 13f79535-47bb-0310-9956-ffa450edef68
2001-10-02 21:13:42 +00:00
William A. Rowe Jr
f39e60750a Clean up a couple of type warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91241 13f79535-47bb-0310-9956-ffa450edef68
2001-10-02 20:00:54 +00:00
William A. Rowe Jr
283b4711eb Two more loadable modules on Win32, thank you Gunther!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91221 13f79535-47bb-0310-9956-ffa450edef68
2001-10-01 17:01:30 +00:00
William A. Rowe Jr
92c68926f4 BIO_write returns an int. Whacha gonna do? Kill the last non-ab warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91220 13f79535-47bb-0310-9956-ffa450edef68
2001-10-01 16:07:17 +00:00
William A. Rowe Jr
d2f9c10bb0 Clean up some warnings by summing bytecounts into apr_off_t holders
instead of ulongs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91218 13f79535-47bb-0310-9956-ffa450edef68
2001-10-01 15:51:07 +00:00
William A. Rowe Jr
8b54a808a9 Remain consistent to the connection_rec, and use apr_off_t for remaining.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91216 13f79535-47bb-0310-9956-ffa450edef68
2001-10-01 15:48:15 +00:00
William A. Rowe Jr
1037fbd63d Kill off some expensive, unnecessary effort when we use max-age for
the usertrack cookie (and kill a warning in the process.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91215 13f79535-47bb-0310-9956-ffa450edef68
2001-10-01 15:47:12 +00:00
William A. Rowe Jr
c241623544 Should be no change to the execution - simply clean up two compiler
warnings, signed/unsigned mismatch in != and mismatched type for port.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91214 13f79535-47bb-0310-9956-ffa450edef68
2001-10-01 15:45:11 +00:00
Justin Erenkrantz
f493313f3a Kill two autoconf-related birds with one commit.
- substr used in APACHE_MODULE for the help string did not parse correctly
  with autoconf 2.50+ so we had to punt there anyway and use AC_HELP_STRING.
- Add APACHE_HELP_STRING define that will call AC_HELP_STRING on 2.50+
  (actually not 2.13 - look at the regex call) or do our custom variation
  of it.  This function can't have any extra spaces or it will be returned
  in the help string.  So noted.  If anyone can figure out how to insert
  a line break like 2.50+ does when we go over the 26th column, I'd
  appreciate it.  I tried and I'm way too tired to figure it out now.
  Adding this would greatly simplify two or three HELP_STRING uses.
- Switch all of those annoying WITH and ENABLE functions to use the
  APACHE_HELP_STRING.  This makes everything consistent now.  I've always
  had to go through and keep aligning everything every few months or so
  because I'm the only one who cares.  No more.  I refuse to do it any more!
  Use APACHE_HELP_STRING or be crucified.

Looks decent with autoconf-2.13 and autoconf-2.52.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91211 13f79535-47bb-0310-9956-ffa450edef68
2001-09-30 07:57:15 +00:00
Justin Erenkrantz
40304cb1ee Remove unnecessary initialization and add a comment about chunk_hdr's
scope.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91209 13f79535-47bb-0310-9956-ffa450edef68
2001-09-30 04:17:16 +00:00
Justin Erenkrantz
9846f649bf Switch to the corresponding apr_table_* macro rather than doing this
ourselves.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91207 13f79535-47bb-0310-9956-ffa450edef68
2001-09-30 01:37:20 +00:00
Justin Erenkrantz
0706716dbb Cleanup some needless initialization of the date variable and consolidate
the scope to only where necessary.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91206 13f79535-47bb-0310-9956-ffa450edef68
2001-09-30 01:17:13 +00:00
Justin Erenkrantz
66ee5533d3 Remove the lameo create_req hack and delay the addition of the HTTP_IN
filter until after we have read the headers.  This eliminates the status
hack that was in http_protocol.c and makes it all around better.

server/protocol.c now directly adds HTTP_IN filter - should we create a
specific hook for this?  (Could we do this as a post_read_request hook?)
I'm not terribly sure, but let's move it down to the lowest possible
place in ap_read_request.  We can change this detail later as we see fit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91192 13f79535-47bb-0310-9956-ffa450edef68
2001-09-29 08:48:59 +00:00
Justin Erenkrantz
fa9432b44a Remove bogus comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91190 13f79535-47bb-0310-9956-ffa450edef68
2001-09-29 08:29:18 +00:00
Justin Erenkrantz
08eb7609da Input filtering rewrite. Consolidate how we handle HTTP input parsing by
rearranging and rethinking some things.  The net result is that the HTTP
filter is now a request filter and is now only responsible for HTTP things.
The core input filter is now responsible for handling all of the dirty work.

Highlights:
- Removes the dechunk filter and merges it with ap_http_filter (aka HTTP_IN).
  The dechunk filter was incorrectly handling certain cases (trailers).
- Moves ap_http_filter from a connection filter to a request filter
  to support the consolidation above (it needs header info).
- Change support code to allow the http_filter to be a
  request filter (how the request is setup initially).
- Move most of the logic from HTTP_IN to CORE_IN (core_input_filter).
  HTTP_IN is now only concerned about HTTP things.  The core filter
  is now responsible for returning data.  It is impossible to
  consolidate dechunk and http without this because HTTP_IN previously
  buffered data.  As Greg has suggested, it may make sense to write
  some brigade functions that handle input (getline).  It should be
  fairly trivial to add these.  Some of the calls in ap_http_filter
  could be switched as well.

This is the original patch as submitted to dev@httpd on Monday, Sep.
24th.  Additional comments and some minor tweaks done after that
submission are coming up next.  This should allow people who reviewed
the original patch to see what has changed and review them piecemeal.

This test passes all current tests in httpd-test.  Please perform
chicken sacrifices to verify that this hasn't blown up your favorite
input.

Reviewed by:	Greg Stein, Ryan Bloom, and Cliff Woolley (buckets)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91189 13f79535-47bb-0310-9956-ffa450edef68
2001-09-29 08:17:11 +00:00
William A. Rowe Jr
efc6237983 We don't mind the .mak files hanging around, don't tell us about it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91183 13f79535-47bb-0310-9956-ffa450edef68
2001-09-28 17:50:22 +00:00
William A. Rowe Jr
f377305ac3 /home/cvs/httpd-2.0/ no longer tracks makefiles. But at least incorporate
all the new proxy modules into BaseAddr.ref for win32.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91182 13f79535-47bb-0310-9956-ffa450edef68
2001-09-28 17:49:00 +00:00
Graham Leggett
3ce4f34fd4 Fix the "merge" behaviour of the ProxyErrorOverride directive.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91172 13f79535-47bb-0310-9956-ffa450edef68
2001-09-28 10:33:39 +00:00
Graham Leggett
0617f1c78f Some style cleanups related to the ProxyErrorOverride function.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91171 13f79535-47bb-0310-9956-ffa450edef68
2001-09-28 10:23:32 +00:00
Victor J. Orlikowski
12d05cb79e Change ProxyHTTPOverrideReturnedErrors command to ProxyErrorOverride
Docs update to follow.
Submitted by: Ian Holsman <ianh@cnet.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91165 13f79535-47bb-0310-9956-ffa450edef68
2001-09-27 16:44:43 +00:00
Cliff Woolley
ed3a5bc69e Immortal data should go in an immortal bucket, not a pool bucket. It would
still work in a pool bucket, but only by coincidence.  At the very least, a
pool bucket is way more overhead than this poor unsuspecting little CRLF
needs to get by.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91160 13f79535-47bb-0310-9956-ffa450edef68
2001-09-27 04:01:10 +00:00
Ian Holsman
ae877f9e70 change command name so that it starts with 'Proxy'
fix the command so that it returns 'OK' instead of 'HTTP_OK'

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91155 13f79535-47bb-0310-9956-ffa450edef68
2001-09-26 19:58:10 +00:00
Jeff Trawick
8b31569e09 Currently, when the map-to-storage handler for TRACE returns DONE, the
caller -- ap_process_request_internal() -- catches that and returns
OK to its caller -- ap_process_request().  But ap_process_request(),
seeing OK, tries to run a handler.  It needs to skip that if the
request was completed in ap_process_request_internal().

Reviewed by:	William A. Rowe, Jr.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91095 13f79535-47bb-0310-9956-ffa450edef68
2001-09-20 17:54:51 +00:00
Victor J. Orlikowski
0f20722276 Clean up a compile warning on AIX.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91094 13f79535-47bb-0310-9956-ffa450edef68
2001-09-20 14:23:06 +00:00
Ian Holsman
65d5d7b65c Added New Option 'HTTPProxyOverrideReturnedErrors' which lets the server override
the error pages returned from the proxied server and replace them with the standard
server error handling on the main server.

Reviewed by:	Graham, Chuck


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91092 13f79535-47bb-0310-9956-ffa450edef68
2001-09-20 05:34:50 +00:00
Justin Erenkrantz
867166bede The call to apr_explode_localtime() in mod_log_config is one of the more
expensive operations in the httpd.  This patch attempts to reduce the
overhead by caching the result for 15 seconds.

Submitted by:	Brian Pane <bpane@pacbell.net>
Reviewed by:	Cliff Woolley, Ryan Bloom, Dean Gaudet, Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91083 13f79535-47bb-0310-9956-ffa450edef68
2001-09-19 06:53:26 +00:00
Justin Erenkrantz
f7a8e08284 Oftentimes, I make no sense whatsoever.
(Clean up comment, really...)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91081 13f79535-47bb-0310-9956-ffa450edef68
2001-09-19 06:25:07 +00:00
Justin Erenkrantz
ddc7f2f952 Fix case where an included file may change but the shtml file has not -
since we returned Last-Modified/ETag headers, we said that it was possibly
cacheable.  Wrong.

See RFC 2616 13.3.4 for more details (these are SHOULD/MAY clauses, so I
think we can discard them when we are dealing with dynamic data).

(Justin cleaned up the comment to cite RFC 2616.)

Submitted by:	Ian Holsman <ianh@cnet.com>
Reviewed by:	Justin Erenkrantz, Aaron Bannert, Brian Pane


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91080 13f79535-47bb-0310-9956-ffa450edef68
2001-09-19 06:20:32 +00:00
Justin Erenkrantz
cb8569e4f8 This patch eliminates the wasteful run-time conversion of method names from
strings to numbers in places where the methods are known at compile
time.

(Justin fixed the va_end() call to be correct.)

Submitted by:	Brian Pane <bpane@pacbell.net>
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91078 13f79535-47bb-0310-9956-ffa450edef68
2001-09-19 05:52:42 +00:00
Justin Erenkrantz
a8a56e00c5 Switch back to SIGUSR1 for graceful restarts on all platforms that
support it.  This defines a symbol called AP_SIG_GRACEFUL in
ap_config_auto.h which will have the appropriate signal value.  All
direct references to SIGWINCH have been replaced with AP_SIG_GRACEFUL.

On Linux 2.0, use SIGWINCH instead since SIGUSR1 is used by glibc
2.0's user-space threading library to control threads.  All later
versions of Linux/glibc don't have this problem.  (Not to mention the
security holes in older Linux versions which make it unsuitable for
use as a web server.)  If your platform doesn't have SIGUSR1, use the
appropriate mojo in configure to define what your graceful restart
signal should be.

In theory, a configure switch could be added to allow the admin to
specify the appropriate signal that should be used.  This is left
as an exercise to the reader for now.

The docs need to be updated.  Since the signal is now configurable,
just saying SIGUSR1 for graceful restart isn't completely true.  Also,
the apachectl functionality needs to be moved into httpd - this is
what Win32 does and it makes us consistent across platforms.

Roy issued a veto against use of SIGWINCH by default, so this should
resolve that veto.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91076 13f79535-47bb-0310-9956-ffa450edef68
2001-09-18 22:13:59 +00:00
Ryan Bloom
5db902f3a7 Allow VPATH builds for SSL.
Submitted by:	 Cody Sherr <csherr@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91074 13f79535-47bb-0310-9956-ffa450edef68
2001-09-18 20:31:37 +00:00
Greg Stein
eb8af5844e Simplify dav_propdb_define_namespaces(); since we're putting the value in
the pool (now), forget the stack-based buffer altogether.


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