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

1509 Commits

Author SHA1 Message Date
Victor J. Orlikowski
ceaaa461fe Ooopsie. Some unintended things slipped in.
Backing them out.
Sorry.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89290 13f79535-47bb-0310-9956-ffa450edef68
2001-06-07 10:31:09 +00:00
Victor J. Orlikowski
d3feaed25f Generate httpd.exp on the fly.
This should allow DSOs to work on AIX, without the headache of maintaining
the httpd.exp file.
This is adapted from OS/2's generation of ApacheCoreOS2.def.
There exist a few bugs still:
    1) mod_dav and mod_proxy may not yet work, due to certain namespace issues.
    2) Some symbols may need to be added, a la core_header.def
Once these have been fixed, the old httpd.exp file will be deleted.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89288 13f79535-47bb-0310-9956-ffa450edef68
2001-06-07 10:03:29 +00:00
Jeff Trawick
0094a39006 don't add BYTERANGE, CONTENT_LENGTH, or HTTP_HEADER for
subrequests; they only make sense for main requests and
internal redirects


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89283 13f79535-47bb-0310-9956-ffa450edef68
2001-06-07 01:14:24 +00:00
Chuck Murcko
bd71fdf9ac Use apr-util's date functions now
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89280 13f79535-47bb-0310-9956-ffa450edef68
2001-06-06 21:51:58 +00:00
Ryan Bloom
f4fb429209 Make mod_echo use filters for all communication with clients.
Submitted by:	Ryan Morgan <rmorgan@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89279 13f79535-47bb-0310-9956-ffa450edef68
2001-06-06 21:28:20 +00:00
Jeff Trawick
e1464feb18 use apr-util's apr_date_parse_http() instead of the to-be-removed
ap_parseHTTPdate()

(proxy needs to make similar changes)

build changes forthcoming...

Submitted by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89277 13f79535-47bb-0310-9956-ffa450edef68
2001-06-06 19:30:54 +00:00
Jeff Trawick
2745ce6e2d filters should return APR status codes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89274 13f79535-47bb-0310-9956-ffa450edef68
2001-06-06 12:48:45 +00:00
Jeff Trawick
d1571eb1b2 initialize local condition_var var to keep garbage out of struct
header_entry->condition_var and avoid a segfault later

(untested, but it looks good to me :) )


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89273 13f79535-47bb-0310-9956-ffa450edef68
2001-06-06 10:43:46 +00:00
Jeff Trawick
2ef9ae8db7 ap_getword_conf wants const char **, not char **
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89272 13f79535-47bb-0310-9956-ffa450edef68
2001-06-06 00:54:06 +00:00
Bill Stoddard
80ed810f66 Extend mod_headers to support conditional driven Header
add, append and set. Use SetEnvIf to set an envar and conditionally
add/append/set headers based on this envar thusly:

     SetEnvIf TSMyHeader value HAVE_TSMyHeader
     Header add MyHeader "%t %D" env=HAVE_TSMyHeader

If the request contains header "TSMyHeader: value" then header
MyHeader: "t=xxxxxxxxxx D=yyyy" will be sent on the response.

Update mod_headers.html.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89271 13f79535-47bb-0310-9956-ffa450edef68
2001-06-05 21:44:48 +00:00
Ryan Bloom
2abe50dc9a Fix the reset_filters function. If we set r->output_filters to NULL,
then we also have to reset the connection's filters.
Submitted by:	John Sterling <sterling@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89269 13f79535-47bb-0310-9956-ffa450edef68
2001-06-04 21:43:08 +00:00
Jeff Trawick
265814910c void * isn't compatible with a function pointer; deal with retrieving a
function pointer from apr_hash_get()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89263 13f79535-47bb-0310-9956-ffa450edef68
2001-06-04 10:43:50 +00:00
Ben Laurie
7093cbc4f5 Function declaration must be a prototype.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89260 13f79535-47bb-0310-9956-ffa450edef68
2001-06-03 11:21:51 +00:00
Graham Leggett
a10b0be85c Optimise reset_filter() in http_protocol.c
PR:
Obtained from:
Submitted by:	Greg Stein
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89256 13f79535-47bb-0310-9956-ffa450edef68
2001-06-01 22:14:01 +00:00
Bill Stoddard
e99265048e Extend Header add|set|append support to accept format strings for the
header values.  Configure thusly:

Header add MyHeader "%t %D yadda"

%t is the time the request was received relative to CUT since the epoch measured in microseconds.
%D is the time delta from the time the request was received to the time the headers are sent
on the wire. To facilitate parsing the header response, %D results in the string D=xxx and
%t results in the string t=xxx. Thus the config directive above will result in this header
being included in the response:

MyHeader: t=991424704447256 D=3775428 yadda


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89255 13f79535-47bb-0310-9956-ffa450edef68
2001-06-01 19:55:48 +00:00
Bill Stoddard
bb2677a9e1 Return "1" to apr_table_do()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89254 13f79535-47bb-0310-9956-ffa450edef68
2001-06-01 19:34:23 +00:00
Graham Leggett
222ffd4bea Add a check to ap_die() to make sure the filter stack is sane and
contains the correct basic filters when an error occurs. This fixes
a problem where headers are not being sent on error.
PR:
Obtained from:
Submitted by:	John Sterling
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89253 13f79535-47bb-0310-9956-ffa450edef68
2001-06-01 17:35:07 +00:00
Graham Leggett
1fe44dacde Move the addition of default AP_HTTP_HTTP_HEADER filters to the
insert_filter phase so that other filters are not bypassed by default.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89252 13f79535-47bb-0310-9956-ffa450edef68
2001-06-01 17:26:19 +00:00
Bill Stoddard
18ce869320 Add the 'echo' option to mod_headers Header directive. Use the new option
like this:

Header echo regex

If a header received on a request matches regex, it is copied to the response
headers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89250 13f79535-47bb-0310-9956-ffa450edef68
2001-06-01 02:58:44 +00:00
Jeff Trawick
e47fad222b handle the SERVER_IDLE_KILL state in some of the ExtendedStatus=On
output

I don't have 100% confidence in my guess as to why some of the state labels
are in bold and some aren't (e.g., "<b>Write</b>" vs. "Graceful".  Hopefully
any rhyme or reason to it is maintained with my change.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89249 13f79535-47bb-0310-9956-ffa450edef68
2001-05-31 18:10:04 +00:00
Jeff Trawick
303a191fdd a worker being cleaned up is not processing a request; filter out such
workers when counting the number of requests being processed

we won't count such workers as idle either, since they aren't available
to process new requests


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89248 13f79535-47bb-0310-9956-ffa450edef68
2001-05-30 14:14:26 +00:00
Martin Kraemer
4723ee4c43 Add description strings for AuthDb*File
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89246 13f79535-47bb-0310-9956-ffa450edef68
2001-05-30 10:22:19 +00:00
Doug MacEachern
654a74cbae back out filter change that is preventing headers to be sent
PR:
Obtained from:
Submitted by: john sterling
Reviewed by:	dougm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89239 13f79535-47bb-0310-9956-ffa450edef68
2001-05-30 05:18:33 +00:00
Ben Laurie
74ec9a1ba4 Remove many redundant semicolons.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89237 13f79535-47bb-0310-9956-ffa450edef68
2001-05-28 15:50:27 +00:00
Ben Laurie
75c38c984e Merging was bollocks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89236 13f79535-47bb-0310-9956-ffa450edef68
2001-05-28 15:49:17 +00:00
Victor J. Orlikowski
69ad06ffee Change strtok() calls to use apr_strtok().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89221 13f79535-47bb-0310-9956-ffa450edef68
2001-05-23 15:13:02 +00:00
William A. Rowe Jr
23e0039f1b Need to have apxs for building such things
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89214 13f79535-47bb-0310-9956-ffa450edef68
2001-05-23 13:31:05 +00:00
Victor J. Orlikowski
0382ec68fa YAPJBUJ.
(Yet Another Proxy Janitor Botched-Up Job).
Need to be looking for APR_SUCCESS here, not HTTP_OK.
Obtained from: Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89213 13f79535-47bb-0310-9956-ffa450edef68
2001-05-23 06:43:46 +00:00
Victor J. Orlikowski
a040b3c7bf Bletch. The Proxy Janitor botches the job again.
Thanks to Ian Holsman for the catch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89210 13f79535-47bb-0310-9956-ffa450edef68
2001-05-23 03:39:44 +00:00
Ken Coar
e0a0b2ec59 Checkpoint my mod_example work. It does not work correctly yet,
and certainly should not be used until it does, but at least it
	compiles (with a couple of warnings).  I am adding examples of
	all the missing hooks to it; this is definitely a work in progress
	right now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89205 13f79535-47bb-0310-9956-ffa450edef68
2001-05-22 20:40:57 +00:00
Victor J. Orlikowski
2a5472f674 Fixes to proxy, after util-uri move, plus fixes to the .mak file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89204 13f79535-47bb-0310-9956-ffa450edef68
2001-05-22 19:37:13 +00:00
Roy T. Fielding
43b9634ceb Moved util_uri to apr-util/uri/apr_uri, which means adding the apr_
prefix to all of the uri functions (yuck), changing some includes,
and using APR error codes instead of HTTP-specific error codes.

Other notes to test this patch:
- You need to delete the util_uri.h file - exports picks up on this.
- I'd like to remove the apr_uri.h from httpd.h, but that might
  increase the complexity of this patch even further.  Once this patch
  is accepted (in some form), then I can focus on removing apr_uri.h
  from httpd.h entirely.  I need baby steps (heh) right now.
- I imagine that this might break a bunch of stuff in Win32 or other OS
  builds with foreign dependency files.  Any help here is appreciated.

This is a start...  -- justin

Submitted by:	Justin Erenkrantz
Reviewed by:	Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89198 13f79535-47bb-0310-9956-ffa450edef68
2001-05-22 01:31:12 +00:00
Graham Leggett
3fdc9ca62a Move the addition of default AP_HTTP_HTTP_HEADER filters to the insert_filter
phase so that other filters are not bypassed by default.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89196 13f79535-47bb-0310-9956-ffa450edef68
2001-05-21 23:47:21 +00:00
Ben Laurie
1d3443bd6a Yet more cleanup.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89180 13f79535-47bb-0310-9956-ffa450edef68
2001-05-20 15:43:31 +00:00
Ben Laurie
eb517580bd More cleanup.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89179 13f79535-47bb-0310-9956-ffa450edef68
2001-05-20 15:26:18 +00:00
Ben Laurie
883a3b25bf AP_ function for optional hooks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89178 13f79535-47bb-0310-9956-ffa450edef68
2001-05-20 14:13:33 +00:00
Ben Laurie
296c0e0690 More generic -> optional cleanup.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89177 13f79535-47bb-0310-9956-ffa450edef68
2001-05-20 12:56:52 +00:00
Ben Laurie
714c1f4db6 Long overdue name change from "generic hook" to "optional hook".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89176 13f79535-47bb-0310-9956-ffa450edef68
2001-05-20 12:45:50 +00:00
Ben Laurie
6dbc2131e3 Fix warnings.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89173 13f79535-47bb-0310-9956-ffa450edef68
2001-05-20 11:58:03 +00:00
Jeff Trawick
ffd9419a69 Tru64 cc is bitchy about trailing commas in an enum list.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89172 13f79535-47bb-0310-9956-ffa450edef68
2001-05-20 09:31:04 +00:00
Roy T. Fielding
0386b53b47 Change directive HeaderOut back to Header and HeaderIn to RequestHeader.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89170 13f79535-47bb-0310-9956-ffa450edef68
2001-05-20 06:58:07 +00:00
Bill Stoddard
cd1eca7994 Reimplement mod_headers as an output filter. mod_headers can now
add custom headers to inbound requests using the HeaderIn directive
and to responses using the HeaderOut directive. The Header
directive has been deprecated in favor of the HeaderOut directive.

Submitted by: Graham Leggett
Reviewed by: Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89165 13f79535-47bb-0310-9956-ffa450edef68
2001-05-19 20:12:05 +00:00
Ken Coar
da47986440 Fix function type to match hook declaration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89164 13f79535-47bb-0310-9956-ffa450edef68
2001-05-19 17:08:33 +00:00
Ben Laurie
2c26b2102e Cleanup.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89163 13f79535-47bb-0310-9956-ffa450edef68
2001-05-19 15:54:53 +00:00
Greg Stein
4a15681152 Make mod_dav_fs mirror whatever mod_dav was enabled with (static or shared)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89161 13f79535-47bb-0310-9956-ffa450edef68
2001-05-18 20:27:45 +00:00
Ken Coar
2b54256b59 Bring forward the NOESCAPE flag from 1.3..
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89158 13f79535-47bb-0310-9956-ffa450edef68
2001-05-18 18:38:42 +00:00
William A. Rowe Jr
fbb6f73fc3 We don't want these operations to end the stream, simply flush out
the contents.  It's up to any downstream filters to collect c-l or
  other stats when the handler has exited.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89156 13f79535-47bb-0310-9956-ffa450edef68
2001-05-18 17:26:22 +00:00
William A. Rowe Jr
40fb8176e6 Interesting, ISAPI thinks a 0 result is cool. Already patched in 1.3.20.
[Jessie Oberreuter <joberreu@moselle.com>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89154 13f79535-47bb-0310-9956-ffa450edef68
2001-05-18 16:12:06 +00:00
Roy T. Fielding
62367507a9 Change the make targets and rules to be consistent in all of the
Apache-owned source trees.  Sanity is a good thing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89140 13f79535-47bb-0310-9956-ffa450edef68
2001-05-18 00:48:57 +00:00
Jeff Trawick
551ecb9a9a Fix processing of the TRACE method. Previously we passed bogus
parms to form_header_field() and it overlaid some vhost structures,
resulting in a segfault in check_hostalias().
[Greg Ames, Jeff Trawick]

Note: Not being familiar with the TRACE method I compared the 2.0
output with 1.3.9 output.  The only difference is that with 2.0 we
get a Content-Length header field.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89138 13f79535-47bb-0310-9956-ffa450edef68
2001-05-17 18:04:18 +00:00