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

2029 Commits

Author SHA1 Message Date
Aaron Bannert
bb447fc0c5 Cautiously avoiding the scoping issue that was discussed on the list,
I thought these other changes needed to go in; Namely that we don't
need to check if the brigade is empty twice in the loop, just once.
Added a comment for good measure.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91478 13f79535-47bb-0310-9956-ffa450edef68
2001-10-16 01:04:08 +00:00
Doug MacEachern
12749e4ff8 disabling mod_example ap_hook_{http_method,default_port}
breaks things such as httpd-test when http_method is "foo"
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91475 13f79535-47bb-0310-9956-ffa450edef68
2001-10-15 23:14:11 +00:00
William A. Rowe Jr
71c53ab7da Forgot the directive's note change for "Any"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91466 13f79535-47bb-0310-9956-ffa450edef68
2001-10-15 02:39:37 +00:00
Justin Erenkrantz
e1438a2d7c Fix the first bucket not getting chunked properly. The reason was that
we left the TE header in the output headers, so ap_set_keepalive didn't
set r->chunked to 1.  So, ap_http_header_filter wouldn't insert CHUNK
filter appropriately.  I have no clue how it chunked anything at all
before this patch, but hey, it looks right now.

Tested with Yahoo, Apple, apache.org, and /.
/. is interesting in that it sends both Conn: Close and TE: chunked.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91463 13f79535-47bb-0310-9956-ffa450edef68
2001-10-14 20:41:00 +00:00
Justin Erenkrantz
d55c3c855b Ensure that ap_http_filter can not be coersced into reading more than we
think is currently available.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91462 13f79535-47bb-0310-9956-ffa450edef68
2001-10-14 20:38:04 +00:00
Doug MacEachern
d1fb0f93fc x_handler() was not checking r->handler, leaving it to handle every request
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91454 13f79535-47bb-0310-9956-ffa450edef68
2001-10-13 01:53:46 +00:00
Cliff Woolley
81c669c420 Remove unused hard-coded definition of a SHELL_PATH.
Submitted by:	Hiten Pandya <hpandya@lycos.co.uk>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91453 13f79535-47bb-0310-9956-ffa450edef68
2001-10-12 21:39:40 +00:00
Justin Erenkrantz
f002d4e8fd Well, now I know what the bio_is_renegotiating call was for.
Place a big-ass comment there so that whomever comes next isn't stuck
at a cryptic call that they don't understand with a dinky comment.
Hopefully, this makes sense.  Someone more familiar with OpenSSL should
verify the comment.

This fix also requires the normalize call to be performed before
churn_input so that we don't enter churn_input with a 0-length ctx->b
brigade.

All httpd-test tests (except for the module/negotiation test) pass now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91442 13f79535-47bb-0310-9956-ffa450edef68
2001-10-12 06:27:04 +00:00
Justin Erenkrantz
4714a72ae4 If we passed the bucket to ap_pass_brigade (because it was EOS or FLUSH),
we shouldn't delete it.

Thanks to Doug for pointing out that something broke.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91441 13f79535-47bb-0310-9956-ffa450edef68
2001-10-12 04:59:19 +00:00
Justin Erenkrantz
fd1950344a Lose the magic number and use the central #define AP_IOBUFSIZE.
Hey, I've never seen it in actual use anywhere, so I didn't know.

Thanks to Roy for pointing it out.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91440 13f79535-47bb-0310-9956-ffa450edef68
2001-10-12 02:00:41 +00:00
Justin Erenkrantz
22c9145d8d Teach mod_proxy to live with the new filtering scheme.
Tested with www.yahoo.com (Conn: Close), www.apache.org (CL), and
www.apple.com (TE: Chunked).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91436 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 20:03:26 +00:00
Jeff Trawick
513f380012 fix a *printf() format
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91435 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 19:53:36 +00:00
Justin Erenkrantz
11b85e17ba Remove deprecated ap_dechunk_filter from header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91434 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 19:44:51 +00:00
William A. Rowe Jr
af7425b447 Aye, it's bogus. Something very odd about short terniary results on
this C[++] compiler here, wants to promote to the conditition's type :-/


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91424 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 14:04:11 +00:00
William A. Rowe Jr
d49a4bae99 Outch... fixed warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91423 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 14:02:38 +00:00
William A. Rowe Jr
0f93ac6408 Close the mod_mime file extension matching issue by (as Ken Coar suggests)
allowing users to continue to rely on the old 1.3 behavior of matching Any
  extensions, the strict behavior of matching NegotiatedOnly arguments, or
  including Handlers and Filters with the MultiviewsMatch directive for
  mod_negotiation control.  Unfortunately, the component matching occurs
  in mod_mime, so that's where this option must reside.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91419 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 13:27:05 +00:00
Ryan Bloom
0385ad938a Remove some warnings from the code. The buckets take a different
type for the length than the brigade functions do.  This moves the
len_read variable into the correct scope for the two times that it
is used, and defines it correctly for each scope.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91417 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 04:40:14 +00:00
Justin Erenkrantz
e3d203298e This is the mod_ssl input filtering rewrite. Lots of stuff here. I also
changed some of the style issues within the filtering code to conform to
the rest of the server.

Various incarnations of this patch have been posted to dev@httpd without
feedback.  Now that it passes all of the httpd-test cases (with the
exception of module/negotiation test which fails without mod_ssl anyway),
it is time to check it in.

Please review and test.  We are under C-T-R rules, so I'm going to take
advantage of that and commit it now.  I have tested this about as much
as I can and it seems to work from everything I can give to it.
Considering that mod_ssl was broken before this commit, this is an
improvement.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91414 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 01:49:21 +00:00
Justin Erenkrantz
5c26e8775c We can't pass in &r->remaining because we change that value on output to
be how many bytes we read.  This trounces on the r->remaining value, so
we must use a local variable and subtract that from r->remaining after we
read.
Reviewed by:	Aaron Bannert


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91413 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 01:40:32 +00:00
William A. Rowe Jr
09944eaafd Finish the switch to huge file support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91407 13f79535-47bb-0310-9956-ffa450edef68
2001-10-10 20:05:13 +00:00
William A. Rowe Jr
4fea103d28 Support huge files from mod_asis
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91406 13f79535-47bb-0310-9956-ffa450edef68
2001-10-10 20:02:40 +00:00
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