1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Commit Graph

771 Commits

Author SHA1 Message Date
William A. Rowe Jr
c182bbe3b2 The fix requires a bump
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94637 13f79535-47bb-0310-9956-ffa450edef68
2002-04-13 19:58:04 +00:00
Ryan Bloom
3333b6a612 Bump after the tag and roll
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94475 13f79535-47bb-0310-9956-ffa450edef68
2002-04-05 22:17:34 +00:00
William A. Rowe Jr
e866b9da24 Whoops, missed this. Moved these symbols to mod_core.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94469 13f79535-47bb-0310-9956-ffa450edef68
2002-04-05 20:55:38 +00:00
Ryan Bloom
1481a06a22 Bump for the 2.0.35 tag. Just waiting for Will's commit to actually do
the tag.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94466 13f79535-47bb-0310-9956-ffa450edef68
2002-04-05 20:05:05 +00:00
Jeff Trawick
674fcdd0b9 ignore generated file ap_config_layout.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94435 13f79535-47bb-0310-9956-ffa450edef68
2002-04-04 20:00:38 +00:00
Sander Striker
d14107e925 Remove hardcoded paths from MPMs and move them to a more central
place.  Expand paths in httpd-std.conf in a similar fashion as we do
in our headers.

Submitted by:	Pier Fumagalli <pier@betaversion.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94431 13f79535-47bb-0310-9956-ffa450edef68
2002-04-04 09:15:44 +00:00
Cliff Woolley
7d0712e89f Match the new APR_BUCKET_BUFF_SIZE. We want this to be slightly less than
8KB to leave room for the various allocators' internal structures while
still fitting into a total of 8KB.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94356 13f79535-47bb-0310-9956-ffa450edef68
2002-04-01 05:43:47 +00:00
Jim Jagielski
536cfa19ee Syncing makes no sense now
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94309 13f79535-47bb-0310-9956-ffa450edef68
2002-03-29 16:21:48 +00:00
Jim Jagielski
70bb2575ea The old, legacy (and unused) code in which the scoreboard was totally
and completely contained in a file (SCOREBOARD_FILE) has been
removed. This does not affect scoreboards which are *mapped* to
files using named-shared-memory at all. This implies that scoreboards
must be based, at some level, on native shared memory (mmap, shm_open,
shmget, whatever), but the code has assumed that for quite awhile
now. Having the scoreboard be *based* on a file makes no sense today.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94306 13f79535-47bb-0310-9956-ffa450edef68
2002-03-29 14:33:50 +00:00
Cliff Woolley
3e2ce19baf BUCKET FREELISTS
Add an allocator-passing mechanism throughout the bucket brigades API.

From Apache's standpoint, the apr_bucket_alloc_t* used throughout a given
connection is stored in the conn_rec by the create_connection hook.  That
means it's the MPM's job to optimize recycling of apr_bucket_alloc_t's --
the MPM must ensure that no two threads can ever use the same one at the
same time, for instance.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94304 13f79535-47bb-0310-9956-ffa450edef68
2002-03-29 08:17:26 +00:00
Bill Stoddard
7da34b011d Add a new parameter to the quick_handler hook to instruct
quick handlers to optionally do a lookup rather than actually
serve content. This is the first of several changes required fix
several problems with how quick handlers work with subrequests.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94240 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 22:42:16 +00:00
William A. Rowe Jr
74c77cc134 Up to .35 [no need to call out .35-dev in changes, that's just silly.]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94191 13f79535-47bb-0310-9956-ffa450edef68
2002-03-26 20:41:11 +00:00
William A. Rowe Jr
965709d8f7 Ready for .34 evaluation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94190 13f79535-47bb-0310-9956-ffa450edef68
2002-03-26 20:35:51 +00:00
Brian Pane
804f94d21f Changed mod_cgi to not do single-byte reads to consume the
script headers


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94151 13f79535-47bb-0310-9956-ffa450edef68
2002-03-23 23:19:41 +00:00
Sander Striker
b2bb3f6764 Update callers of apr_explode_gmt to apr_time_exp_gmt. The
function was renamed in apr.

Submitted by: Thom May <thom@planetarytramp.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94081 13f79535-47bb-0310-9956-ffa450edef68
2002-03-21 10:10:41 +00:00
Jim Jagielski
730e99e461 Fold the compiled-in knowledge of the allowable AcceptMutex settings into
its help entry. Requires the use of a extern string rather than a function
call for the initialization to be valid in the macro (Thx to Jeff!).
In the meantime, bump down the error logging until we deal with true
default and configured setting information ala 1.3.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94062 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 22:19:11 +00:00
Bill Stoddard
76bef9981f Commit 2 of 2 to:
1. rename ap_rset_content_type to ap_set_content_type
2. reverse the arguments to aligh with ap_set_content_length


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94057 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 17:44:13 +00:00
Jim Jagielski
a65170a84c Bring 2.0 up to parity, a bit, with how much info we provide to
the admin regarding valid values for AcceptMutex. Should also
tell 'em what "default" actually maps to, but that can wait.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94055 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 16:44:13 +00:00
Jeff Trawick
f3c3ebe7f5 ap_rset_content_type() should take const char * instead of char *
this is friendlier to callers and r->content_type is const char *
too so it isn't harmful

this fixes a fatal compile error with AIX+xlc


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94051 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 12:03:49 +00:00
Bill Stoddard
e9ec908a01 Final commit to add ap_rset_content_type accessor. Add AddOutputFiltersbyType
filters during call to ap_rset_content_type()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94028 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 02:05:43 +00:00
Greg Stein
0c4aa3ba41 Bump ap_mmn for the M_INVALID change. Add a note to CHANGES.
Submitted by: Dale Ghent <daleg@elemental.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94023 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 20:40:04 +00:00
Greg Stein
b9514876c3 The underlying change here was to add the new WebDAV/DeltaV methods
now that it has an RFC. At the same time, I revamped a good chunk of
the name <-> number mapping code in http_protocol.c

* add M_FOO constants for the new RFC 3253 (DeltaV) methods. label
  where each of the builtin methods comes from.

* moved METHOD_NUMBER_FIRST/LAST from http_protocol.h into
  http_protocol.c since they weren't used anywhere else and they
  weren't namespace-protected.

* create register_one_method() and use it to insert all builtin
  methods (at _init() time) and extended methods into the registry.

* add a lookup_builtin_method() to quickly map a method name to a
  builtin method number.

* rebuild ap_method_number_of() to use the new lookup function.

* revamp ap_method_name_of() to use the registry to locate the name
  for any method number. add a pool argument (no callers in the core
  code needed to be updated)

* revamp make_allow() to deal with the new method numbers and all
  extended methods.

* in mod_dav, use the new method numbers rather than registering the
  DeltaV methods.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94015 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 10:11:33 +00:00
Greg Stein
1616923b6e A little mgmt overhead for the mod_dav API change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94004 13f79535-47bb-0310-9956-ffa450edef68
2002-03-18 22:29:49 +00:00
Brian Pane
e3bfcb1430 Use the "recent time" cache to optimize timestamp generation for
the httpd error log

Background: According to some profile data that we collected on Solaris,
half the run time of ap_log_rerror() was spent in localtime(3).   With
this change, the recent-time cache ensures that the error logger won't
cause more than one localtime() call per second, no matter how high the
error rate is.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93977 13f79535-47bb-0310-9956-ffa450edef68
2002-03-17 05:13:12 +00:00
Martin Kraemer
9e64dafb95 Typo (noticed while browsing http://docx.webperf.org/)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93948 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 07:37:21 +00:00
Bill Stoddard
2d9939a923 Fix win32 compile breakage.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93922 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 22:34:46 +00:00
Roy T. Fielding
845cbfd508 Update our copyright for this year.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93918 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:48:07 +00:00
Aaron Bannert
b67fbc6004 Comments like this help keep the sanity of module authors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93783 13f79535-47bb-0310-9956-ffa450edef68
2002-03-07 22:55:03 +00:00
Greg Ames
1831fc04ee ap_rgetline: fix folding and partial line handling on ebcdic boxes. The
normal case worked OK, but due to the recursion and multiple exit points,
input bytes could go thru charset translation multiple times or not at all.

Suggested by: Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93776 13f79535-47bb-0310-9956-ffa450edef68
2002-03-07 22:08:46 +00:00
Justin Erenkrantz
3058b601ff As hinted on dev@httpd, change filter naming schemes to match our
expectations of their usage.

The reason that we should make this change now is that we have changed
the implied meaning of AP_FTYPE_HTTP_HEADER - some users of this should
be PROTOCOL while others should be CONTENT_SET.  In order to clarify it,
toss all of the bogus names and force the filter writers to make sure
they understand what they are doing.

CONTENT_SET is new (horrible name - change if you have better idea), but
it indicates that it should run between RESOURCE and PROTOCOL.
mod_deflate is the ideal CONTENT_SET filter.

The changed type names are:
CONTENT is now RESOURCE.
HTTP_HEADER is now PROTOCOL.  However, most filters that used HTTP_HEADER
may want CONTENT_SET.  (Only things like POP and HTTP belong as PROTOCOL.)

MMN bump since all filters need to be recompiled due to filter reordering.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93756 13f79535-47bb-0310-9956-ffa450edef68
2002-03-07 09:27:17 +00:00
Ryan Bloom
116497445f Remove the prev pointer from the filter chain. This removes
the complexity of trying to set the filter chain correctly, with the
side-effect of forcing us to walk the entire chain whenever we add
a filter.  Since the filter chains are small, the decrease in
complexity is worth it.
Reviewed by:	Allan Edwards


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93745 13f79535-47bb-0310-9956-ffa450edef68
2002-03-07 02:09:30 +00:00
Ryan Bloom
7551d5f748 bump after the tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93737 13f79535-47bb-0310-9956-ffa450edef68
2002-03-06 18:09:09 +00:00
Ryan Bloom
92df075c1b Push for a new tag.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93734 13f79535-47bb-0310-9956-ffa450edef68
2002-03-06 18:00:14 +00:00
Ian Holsman
da35725071 apr-utils rename apr_ansi_time_to_apr_time and
apr_exploded_time_t.

PR:
Obtained from:
Submitted by:	Thom May <thom@planetarytramp.net>
Reviewed by:	Ian Holsman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93733 13f79535-47bb-0310-9956-ffa450edef68
2002-03-06 17:55:38 +00:00
Ryan Bloom
cf46062b53 I forgot to bump the mmn.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93684 13f79535-47bb-0310-9956-ffa450edef68
2002-03-03 06:05:58 +00:00
Ryan Bloom
0d7f234515 This finishes the mod_dir/mod_negotiation bug. This final part of the
solution ensures that we don't lose filters if they are added later than
we expect.  The problem could be seen if a connection filter was added
after a request-based filter was added in the past.  The problem was that
the request-based filters pointed to the first filter in the connection
record, so the new connection filter was never called.  Now, all filters
are put on their correct filter lists, and we are sure to always update
all pointers when adding a filter.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93683 13f79535-47bb-0310-9956-ffa450edef68
2002-03-03 06:04:08 +00:00
Ryan Bloom
9ac46ee310 Fix the mod_dir/mod_negotiation bug, where redirects and sub requests
were not getting the correct filters.  This is done by creating a location
in the request rec that holds protocol level filters.  Protocol level
filters survive for one request, from the time the request is received
from the user to the time the response is sent.  r->output_filters now
stores the request level filters, which are only valid for the lifetime
of one request_rec.

This patch works, but it is not complete.  The second half of the problem
is that add_any_filter doesn't check where it puts the filters that it
adds, so it is possible for filters to be put on this wrong list, and
for filters to be lost completely during request processing.  That half
of the fix will be coming in the next day or so.

Submitted by:	Will Rowe, Justin Erenkrantz, Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93682 13f79535-47bb-0310-9956-ffa450edef68
2002-03-03 02:15:52 +00:00
Jeff Trawick
3b5912070c document the ctx parameter to the add-input-filter functions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93596 13f79535-47bb-0310-9956-ffa450edef68
2002-02-27 15:36:23 +00:00
Doug MacEachern
4cdb6b8dec ap_calc_scoreboard_size() needs to be exported for win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93590 13f79535-47bb-0310-9956-ffa450edef68
2002-02-27 04:10:19 +00:00
Brian Pane
2df244dfda Added ap_get_input_filter_handle() and ap_get_output_filter_handle()
Submitted by:	Ryan Morgan
Reviewed by:	Brian Pane


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93544 13f79535-47bb-0310-9956-ffa450edef68
2002-02-23 03:12:31 +00:00
Ian Holsman
567662b514 bump bumpty bump
Placing the thread-limit and server-limit values, those which define the
size of internal structures in the scoreboard, actually into the
scoreboard allow third-party applications to access those structures.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93525 13f79535-47bb-0310-9956-ffa450edef68
2002-02-21 04:05:21 +00:00
William A. Rowe Jr
a6ceb1511a Fix the close-on-sendfile bug where Win32 would transmit a single
sendfile bucket and then lose it's socket, and fix a comment.

Submitted by:  Ryan Morgan <rmorgan@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93524 13f79535-47bb-0310-9956-ffa450edef68
2002-02-21 02:19:39 +00:00
Aaron Bannert
d2fe7ba429 Placing the thread-limit and server-limit values, those which define the
size of internal structures in the scoreboard, actually into the
scoreboard allow third-party applications to access those structures.

Submitted by:	Adam Sussman <myddryn@vishnu.vidya.com>
Reviewed by:	Aaron Bannert


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93523 13f79535-47bb-0310-9956-ffa450edef68
2002-02-21 01:30:06 +00:00
Bill Stoddard
b1e828a3bf This fixes a bug in mod_status on Windows where restart time was not
properly initialized.

Move ap_restart_time into the scoreboard global area so the child process
on non-forking platforms can have access to it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93502 13f79535-47bb-0310-9956-ffa450edef68
2002-02-19 21:09:27 +00:00
Justin Erenkrantz
6700fa91fb Introduce AddOutputFilterByType directive.
AddOutputFilterByType DEFLATE text/html

(I will add docco soon, I promise.  If someone beats me to it, cool...)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93490 13f79535-47bb-0310-9956-ffa450edef68
2002-02-19 04:45:53 +00:00
Aaron Bannert
0cff6e8f58 Implement new ScoreBoardFile directive logic. This affects how we
create the scoreboard's shared memory segment. We now have the best of
both worlds:

if config specifies ScoreBoardFile
  create name-based shared memory, errors are fatal
else /* we get to choose */
  create anonymous shared memory
  if ENOTIMPL
    create name-based shared memory from DEFAULT_SCOREBOARD
  else
    errors are fatal

This gives us the flexibility to have anonymous shared memory (on platforms
that support it) as well as name-based shared memory when third-party
programs want access to our scoreboard.

The ap_scoreboard_fname static variable is now owned by the scoreboard.c
file, and no longer by the MPMs. The MPMs MUST NOT set ap_scoreboard_fname
to a default, since that will override the default creation logic and
only allow name-based segments.

Submitted by:	Aaron Bannert
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93434 13f79535-47bb-0310-9956-ffa450edef68
2002-02-15 20:48:19 +00:00
Justin Erenkrantz
e82b063203 Welcome to .33-dev.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93414 13f79535-47bb-0310-9956-ffa450edef68
2002-02-14 07:32:51 +00:00
Justin Erenkrantz
9e1fd9da4a Bump for .32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93412 13f79535-47bb-0310-9956-ffa450edef68
2002-02-14 07:31:55 +00:00
Greg Ames
9ad90284cd if a child detects a resource shortage on accept(), limit the rate of fork()s
to 1 per second until the situation clears up.

Inspired by: Martin Kraemer


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93366 13f79535-47bb-0310-9956-ffa450edef68
2002-02-11 23:20:16 +00:00
Bradley Nicholes
d9998aa77b Updated to use the newer locking API's. This file should probably be moved
to the httpd-ldap with the rest of the auth_ldap stuff.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93339 13f79535-47bb-0310-9956-ffa450edef68
2002-02-08 18:32:50 +00:00