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

1530 Commits

Author SHA1 Message Date
William A. Rowe Jr
033e91c288 Just a mssing brace
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89454 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 23:57:24 +00:00
William A. Rowe Jr
8977e18441 tls goodness for Win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89452 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 23:40:57 +00:00
William A. Rowe Jr
2d64e24da2 Deploy ap_sub_req_lookup_dirent() for the main loop. Note we _really_
need to further optimize this code, there are dozens of perhaps unnecessary
  stat calls, and meaningless #ifndef OS2 protections around apr_lstat()'s.
  OS2 has lstat (It's simply stat()) so we should pull the os-specific cruft.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89449 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 21:59:48 +00:00
William A. Rowe Jr
ac61d1a8f8 Employ the new ap_sub_req_lookup_dirent() function for mod_autoindex.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89448 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 21:54:16 +00:00
Cliff Woolley
29212e8c6b *) Account for the new pool parameter to apr_bucket_file_create()
and apr_bucket_file_make().

*) Simplify mod_file_cache's sendfile_handler by taking advantage
   the new ability of file buckets to handle files opened in XTHREAD
   mode.  [Also inlined some of the brigade construction stuff in
   mod_file_cache's handlers to save a palloc() or two.]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89438 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 20:18:09 +00:00
William A. Rowe Jr
eb25b54dd4 Win32/OS2 require APR_STATUS_IS_EFOO() tests, not == EFOO, since our
socket error codes vary.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89430 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 16:58:14 +00:00
Ian Holsman
f2f4dff204 Fixed up formatting (removed tabs)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89425 13f79535-47bb-0310-9956-ffa450edef68
2001-06-26 22:46:04 +00:00
Ian Holsman
acf7098338 ProxyPass & ProxyPass Reverse now can be specified in <Location> directives
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89424 13f79535-47bb-0310-9956-ffa450edef68
2001-06-26 22:32:49 +00:00
Bill Stoddard
040c05592a Fix problem handling FLUSH bucket in the chunked encoding filter.
Module was calling ap_rwrite() followed by ap_rflush() but the
served content was not being displayed in the browser. Inspection
of the output stream revealed that the first data chunk was
missing the trailing CRLF required by the RFC


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89422 13f79535-47bb-0310-9956-ffa450edef68
2001-06-26 17:40:58 +00:00
William A. Rowe Jr
e6bb83641f Filenames aught to be normalized to the serverroot, and server_root_relative
already canonicalizes names.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89382 13f79535-47bb-0310-9956-ffa450edef68
2001-06-18 05:39:10 +00:00
William A. Rowe Jr
546f8d040c Allow index.html.en and Index.html.FR to both be considered in negotation
on case insensitive platforms, only.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89381 13f79535-47bb-0310-9956-ffa450edef68
2001-06-18 05:36:33 +00:00
Jeff Trawick
bcda376bd4 "fix" a // comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89380 13f79535-47bb-0310-9956-ffa450edef68
2001-06-17 18:20:36 +00:00
Jeff Trawick
a672fcb9aa fix various // comments so they'll work portably
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89379 13f79535-47bb-0310-9956-ffa450edef68
2001-06-17 18:15:31 +00:00
Cliff Woolley
c091130eab * apr_brigade_partition() now returns an apr_status_t (finally!).
* did some code cleanups/optimizations in that function.
* updated Apache's byterange filter to handle the new prototype. added
  error handling to the byterange filter should apr_brigade_partition()
  ever fail, which it never will unless somebody either removes the earlier
  call to apr_brigade_length() for some unknown reason or invents a new
  bucket type that is of a predetermined length but which cannot be split
  natively (or which has a split that might fail).  might as well be
  future-proof.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89363 13f79535-47bb-0310-9956-ffa450edef68
2001-06-13 16:48:37 +00:00
Ryan Bloom
66a61c359d Add a pool to the ap_save_brigade prototype. This removes a todo from
the comments that is really necessary before the setaside stuff will
work properly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89362 13f79535-47bb-0310-9956-ffa450edef68
2001-06-13 13:44:40 +00:00
Bill Stoddard
e36b1ebae6 Extend mod_setenvif to support specifying regular expressions
on the SetEnvIf (and SetEnvIfNoCase) directive attribute field.
Example:  SetEnvIf ^TS*  [a-z].* HAVE_TS
will cause HAVE_TS to be set if any of the request headers begins
with "TS" and has a value that begins with any character in the
set [a-z]. [Bill Stoddard]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89353 13f79535-47bb-0310-9956-ffa450edef68
2001-06-12 17:06:04 +00:00
Bill Stoddard
0a9d23aa8f Enable SetEnvIf to handle taking a regex on the header name (SPECIAL_NOT case).
For example:

SetEnvIf ^TS* ^[a-z].*  HAVE_TS

will cause HAVE_TS to be set if a header beginning with TS appears in the request
and the value of that header starts with [a-z]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89325 13f79535-47bb-0310-9956-ffa450edef68
2001-06-09 15:57:06 +00:00
Victor J. Orlikowski
8ed4d7898a Ordering changes, for detection's sake.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89315 13f79535-47bb-0310-9956-ffa450edef68
2001-06-09 04:21:27 +00:00
Chuck Murcko
327be3721c moved CHANGES here
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89304 13f79535-47bb-0310-9956-ffa450edef68
2001-06-08 09:59:25 +00:00
Jeff Trawick
c35d9ddcba fix a thread-safety bug by using apr_strtok() instead of strtok()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89293 13f79535-47bb-0310-9956-ffa450edef68
2001-06-07 14:45:03 +00:00
Greg Stein
2c23513d9a correct the back-out of this change. it used to be ap_log_perror()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89291 13f79535-47bb-0310-9956-ffa450edef68
2001-06-07 10:38:13 +00:00
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