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

6142 Commits

Author SHA1 Message Date
Ryan Bloom
4d4ce3209a Port the MaxClients changes from the worker MPM to the threaded
MPM.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91483 13f79535-47bb-0310-9956-ffa450edef68
2001-10-16 04:02:28 +00:00
William A. Rowe Jr
5e3b2442bf Fix the little bits o' breakage I introduced with the last two
'theoretical' corrections.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91482 13f79535-47bb-0310-9956-ffa450edef68
2001-10-16 02:23:42 +00:00
William A. Rowe Jr
75ed984cc7 directory_walk trounced existing path_info declarations. I suspect _this_
was Greg Ames bug...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91481 13f79535-47bb-0310-9956-ffa450edef68
2001-10-16 02:19:42 +00:00
William A. Rowe Jr
940a7786c7 Streamline this function, and append the trailing slash for any directories
that are resolved.  Needs to be more tightly coupled to the dir_walk
  optimized cache.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91480 13f79535-47bb-0310-9956-ffa450edef68
2001-10-16 02:15:45 +00:00
William A. Rowe Jr
317c6358d8 This will probably fix recent breakage to mod_negotation and httpd.test,
as well as the /manual/ returning docroot/index.  Need to look for another
  solution.  I'm suspecting path_info is possibly broken.

  Reverts 1.68, as suggested by Brian Havard.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91479 13f79535-47bb-0310-9956-ffa450edef68
2001-10-16 01:57:45 +00:00
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
Victor J. Orlikowski
0215683198 Removed outdated apache.exports references
Submitted by: Aaron Bannert <aaron@clove.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91472 13f79535-47bb-0310-9956-ffa450edef68
2001-10-15 21:58:04 +00:00
Ryan Bloom
72352266ff Fix a typo in the configure script. This get AIX building cleanly.
Submitted by:	Jens-Uwe Mager <jum@helios.de>
Reviewed by:	Aaron Bannert <aaron@clove.org> and Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91471 13f79535-47bb-0310-9956-ffa450edef68
2001-10-15 17:28:01 +00:00
Greg Ames
ad334fdd90 insure that a '*' in <VirtualHost *> or NameVirtualHost * matches all ports.
The recent change to eliminate the Port directive exposed this problem.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91470 13f79535-47bb-0310-9956-ffa450edef68
2001-10-15 15:32:14 +00:00
William A. Rowe Jr
4cf572780c My badness (well, I tried)
Mladen Turk's <mturk@mappingsoft.com> corrections for recent cleanups


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91469 13f79535-47bb-0310-9956-ffa450edef68
2001-10-15 15:29:03 +00:00
William A. Rowe Jr
6e625429e8 rotatelogs will be apr-ized at some point, make this simple.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91467 13f79535-47bb-0310-9956-ffa450edef68
2001-10-15 03:02:48 +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
William A. Rowe Jr
0b6b51130b That's Any, not All
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91465 13f79535-47bb-0310-9956-ffa450edef68
2001-10-15 02:22:34 +00:00
William A. Rowe Jr
8b13416443 Clarify the new MultiviewsMatch directive. I wanted this down on 'paper',
even if it isn't proofread - please feel free to touch up.

  BTW - the new 'cleaned' formatting really stinks for hand-editing,
  the indentation really needs works.  Our per-directive meta-info is
  the ugliest aspect.  Would be good if the cleanup code could be customized
  to make the html not only clean, but legible ;)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91464 13f79535-47bb-0310-9956-ffa450edef68
2001-10-15 02:19:00 +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
Martin Kraemer
320c229e8b Fix broken links
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91461 13f79535-47bb-0310-9956-ffa450edef68
2001-10-14 15:35:04 +00:00
Joshua Slive
503e6301ad htmltidy made a little mess of the <pre> environment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91457 13f79535-47bb-0310-9956-ffa450edef68
2001-10-13 17:46:49 +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
Ryan Bloom
49ad5a4fd3 Make sure we install apxs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91449 13f79535-47bb-0310-9956-ffa450edef68
2001-10-12 18:23:19 +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
271ef8a2e8 Another one bites the dust.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91437 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 20:04:16 +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
Greg Ames
db8132bab4 fix another seg fault.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91431 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 16:28:23 +00:00
Joshua Slive
27a0eae116 Eventually I'll get this right.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91430 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 15:23:07 +00:00
Joshua Slive
127c61598e Squeeze the example down to fit on one line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91425 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 14:18:28 +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
Joshua Slive
b3f3d5b310 Convert to html.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91422 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 14:00:24 +00:00
Joshua Slive
0b5c3d8135 TransferLog is (sort of) deprecated, and people never seem to realize
that you can use this with CustomLog.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91421 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 13:56:52 +00:00
William A. Rowe Jr
792583d421 Ok, this formats a whole lot cleaner, and (I believe) makes a bit more
sense.  Also provides a rundown of C89 common date format strings, for
  those users who don't have man strftime [It still points out that add'l
  format options may b available, see strftime.]

  Also, I believe _most_ installations require the TransferLog "|bin/
  path to rotatelogs, no?  Other question - how to reformat to html?
  Which utility does so?


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91420 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 13:42:58 +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
cc570d9e45 Fix a typo in the configure script. The argument is --enable-mods-shared,
but we documented it as --enable-mod-shared.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91418 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 04:50:57 +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
Ryan Bloom
705737ea79 Fixed the configure script to add a LoadModule directive to
the default httpd.conf for any module that was compiled
as a DSO.

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91415 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 03:42:53 +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
Justin Erenkrantz
5902e1f3e3 The problem here is that we are getting some zero-length buckets at the head
of our brigade - which are in isolation okay.  In this situation, they
must be removed by the call to APR_BRIGADE_NORMALIZE.

The way we partition the buckets means that we will never remove the
zero-length bucket from the head - causing an infinite loop.  We read only
a single bucket now - previously partition with the blocking reads would
read multiple buckets - but it forced having a defined length which we
agreed was bogus.

Therefore, if we have a zero-length bucket at the head, we would then try
to partition and split at the zero-point of the brigade.  That combination
doesn't actually remove the zero-length bucket - it is still there - causing
an infinite loop because we'll never go past the zero-length bucket.

This call was originally present in core_input_filter.  I think it might
be better to fix partition/split/etc to eliminate a zero-length bucket
and skip it.  But, I'm not 100% sure that needs to happen.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91412 13f79535-47bb-0310-9956-ffa450edef68
2001-10-11 01:38:28 +00:00
Justin Erenkrantz
e109fb066b We also need to increment *readbytes when we find a match in the middle of
a bucket.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91411 13f79535-47bb-0310-9956-ffa450edef68
2001-10-10 22:14:10 +00:00
Ryan Bloom
721c27eba2 Make the error messages from apachectl refer to the actual name of the
executable, not "httpd".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91409 13f79535-47bb-0310-9956-ffa450edef68
2001-10-10 21:17:05 +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
Justin Erenkrantz
4efc873183 Yeah, let's just return this segment to how it was a few hours ago.
If the status code is anything other than SUCCESS for PEEK, it isn't
good.  Just return the value.

(I thought it should be this, but I wasn't 100% sure.  Peer review == good.)

Submitted by:	Will Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91404 13f79535-47bb-0310-9956-ffa450edef68
2001-10-10 19:19:16 +00:00