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

340 Commits

Author SHA1 Message Date
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
d5c24720dc Commit 1 of 2 to:
1. rename ap_rset_content_type to ap_set_content_type
2. reverse the arguments on the call to aligh with ap_set_content_length


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94056 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 17:41:55 +00:00
Bill Stoddard
470edb9dd8 First commit to introduce accessor function to set r->content_type..
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94027 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 01:58:47 +00:00
Bill Stoddard
9443a2ac8e Fix some formatting
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93985 13f79535-47bb-0310-9956-ffa450edef68
2002-03-17 22:20:50 +00:00
William A. Rowe Jr
65a37752ec Eliminate potential ap_server_root_relative segfaults, with the input
of Jeff Trawick's style changes to the first patches.  Doesn't include
  the fixes to ssl [more complex], and we won't trap errors that involve
  ap_serverroot, since we presume that was normalized on the way in.
  Therefore, testing ap_server_root_relative(DEFAULT_FOO) cases
  should never become necessary.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93965 13f79535-47bb-0310-9956-ffa450edef68
2002-03-16 18:26:58 +00:00
William A. Rowe Jr
2e8d8b0bdd A coworker discovered that really bogus path names segfault the server
on Win32.  ap_server_root_relative() doesn't have an apr_status_t result,
  so we are limited in what we can figure out - but 99.99% of the time,
  the file's path is just plain bogus.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93956 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 15:31:17 +00:00
Jeff Trawick
2df1a02f72 deal with the rename of kill_after_timeout to APR_KILL_AFTER_TIMEOUT
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93940 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 22:19:14 +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
Sander Striker
40d1a65be5 Resolve the issue Jeff pointed out in his recently added comment. That
is, prevent a possible segfault or finding a tag in reused memory.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93854 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 13:30:24 +00:00
Jeff Trawick
89c2a46020 add a comment to point out a potential segfault
tweak an existing comment to make it a little more clear


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93853 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 11:48:32 +00:00
Bradley Nicholes
44fc00ac6a Need to check if the userdir is absolute before it gets split apart by ap_getword()
Also fixed up the !HAVE_DRIVE_LETTERS case (such as NetWare) where
the volume delimiter ( colon ) is not in an absolute position.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93780 13f79535-47bb-0310-9956-ffa450edef68
2002-03-07 22:36:07 +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
Bradley Nicholes
e6d10bff2d Switching from a project build file to GNU make files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93665 13f79535-47bb-0310-9956-ffa450edef68
2002-03-01 22:21:25 +00:00
William A. Rowe Jr
402a038805 Whoh boy that's rough... We sometimes like to answer SIGHUP in the
parent process, don't we?

  This -was- post-fork() in 1.3, but with the massive restructuring,
  we inadvertantly now whack the parent process.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93587 13f79535-47bb-0310-9956-ffa450edef68
2002-02-27 03:52:20 +00:00
Brian Pane
365a01fe4e Updated the mapper lock to use apr_global_mutex_t instead
of apr_proc_mutex_t


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93467 13f79535-47bb-0310-9956-ffa450edef68
2002-02-18 01:31:56 +00:00
Brian Pane
7ae884c5ee Converted the rewrite mapper lock to the new lock API
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93445 13f79535-47bb-0310-9956-ffa450edef68
2002-02-16 21:57:17 +00:00
William A. Rowe Jr
3d4731f15d Address the issue raised on list that users with a LanguagePriority
directive alone expect 'ForceLanguagePriority Prefer' behavior even
  if that directive is omitted.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93383 13f79535-47bb-0310-9956-ffa450edef68
2002-02-13 02:55:17 +00:00
Ken Coar
d19986c33b Change the 'we turned /foo into http://host/foo' log message
to DEBUG; no reason to clutter people's log files with this
	when it's supported behaviour.  Of course, they can find out
	about the performance impact by LogLeveling Debug. :-)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93251 13f79535-47bb-0310-9956-ffa450edef68
2002-02-05 11:35:57 +00:00
Ken Coar
dc161e96cc If the RedirectMatch target is an abs_path, make it an absoluteURI
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93143 13f79535-47bb-0310-9956-ffa450edef68
2002-01-31 20:38:08 +00:00
Greg Ames
699e8f8d80 fix redirects for directories. fixup_dir was munging the URI before other
fixup hooks (such as fixup_redir in mod_alias) had a chance to redirect
the original directory URI.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93141 13f79535-47bb-0310-9956-ffa450edef68
2002-01-31 19:54:53 +00:00
Ken Coar
f06c74cd5a Fix RedirectMatch so it won't emit invalid Location fields.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93137 13f79535-47bb-0310-9956-ffa450edef68
2002-01-31 18:44:48 +00:00
William A. Rowe Jr
5a47e71a1b Many of our platform's apr_dir_read() aren't returning APR_FINFO_TYPE,
so we will take the long way through (and the long way for LNK's as well.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93080 13f79535-47bb-0310-9956-ffa450edef68
2002-01-29 17:46:30 +00:00
Jeff Trawick
20778bd6f0 const is nice
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93073 13f79535-47bb-0310-9956-ffa450edef68
2002-01-29 12:30:52 +00:00
Martin Kraemer
82684e7331 No need to use strcpy() where a ptr assignment is ok
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93072 13f79535-47bb-0310-9956-ffa450edef68
2002-01-29 09:09:47 +00:00
Greg Ames
a01fa5a9cb backing out fix for missing path info and query string. wrowe beat me to
it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93062 13f79535-47bb-0310-9956-ffa450edef68
2002-01-28 21:18:10 +00:00
Greg Ames
b7f4e23a1b handle_multi: pass along the original path info and query string if
we redirect due to negotiation

pointed out by: Bill Rowe

also, clarify what some code in handle_map_file is doing


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93061 13f79535-47bb-0310-9956-ffa450edef68
2002-01-28 18:43:19 +00:00
William A. Rowe Jr
ec31c6ad8e Shortcut where the resource has no language [discovered with no
DefaultLanguage in cgi-bin, resolving Greg Ames' observations, we
  had a lurking segfault.]

  This begs the question, what exactly did the fn do with no language
  in terms of serving content back in 1.3.  Should be reviewed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93046 13f79535-47bb-0310-9956-ffa450edef68
2002-01-27 07:47:30 +00:00
William A. Rowe Jr
011c7375e9 Which PR? I can't count them all. Get QUERY_STRING and PATH_INFO
working again.  Also rounds out our fix to work around negotiated
  directories which Greg Ames fixed; this addition in request.c simply
  shortcuts all further processing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93045 13f79535-47bb-0310-9956-ffa450edef68
2002-01-27 07:44:07 +00:00
Jeff Trawick
d78de7dc76 Fix a segfault in mod_rewrite's logging code caused by passing the
wrong config to ap_get_remote_host().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92827 13f79535-47bb-0310-9956-ffa450edef68
2002-01-11 13:38:28 +00:00
William A. Rowe Jr
30d1548be6 Fix a handful of AP_MODULE_DECLARE_DATA exports for .so modules.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92805 13f79535-47bb-0310-9956-ffa450edef68
2002-01-10 09:11:33 +00:00
William A. Rowe Jr
aff1454d34 *) Split all Win32 modules [excluding the core components mod_core,
mod_so, mod_win32 and the winnt mpm] into individual loadable
     modules, so the administrator may individually disable the former
     compiled-in modules by simply commenting out their LoadModule
     directives.  [William Rowe]

  *) Saved Win32 module authors and porters many future headaches, by
     duplicating the appropriate .h files such as os.h into the include
     directory, including in the build tree.  [William Rowe]

  Also noticed that version stamp resources weren't generated for proxy
  modules, this too is now fixed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92804 13f79535-47bb-0310-9956-ffa450edef68
2002-01-10 08:47:23 +00:00
Bradley Nicholes
3356d10c5b Code updates to allow Mod_Rewrite and Mod_Auth_DBM to build on NetWare
Submitted by: G�nter Knauf <gk@gknw.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92775 13f79535-47bb-0310-9956-ffa450edef68
2002-01-08 21:16:08 +00:00
William A. Rowe Jr
d9fe304191 Need a null language_priority array for an either/or choice in the
conf merge.  This does so.  The merges should be significantly quicker.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92696 13f79535-47bb-0310-9956-ffa450edef68
2002-01-01 19:09:05 +00:00
William A. Rowe Jr
e4a31acb58 Thanks Mr. Trawick, backtraces can be very enlightening.
This fixes two bugs, the segfault when researching index numbers,
  and another.  We don't hint anywhere that LanguagePriority is a
  cumulative setting, in fact the syntax doesn't suggest so either.
  Merges are always slow, there is no reason to make this even slower.

  So the patch has the LanguagePriority directive override any existing
  LanguagePriority list from an earlier container.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92695 13f79535-47bb-0310-9956-ffa450edef68
2002-01-01 19:01:39 +00:00
Jeff Trawick
2013bfb0f6 get rid of an unused variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92664 13f79535-47bb-0310-9956-ffa450edef68
2001-12-30 14:30:44 +00:00
William A. Rowe Jr
cdeaee2ced Introduce the ForceLanguagePriority options;
Prefer will circumvent a Multiple Choices by electing the first matching
  language from the LanaguagePriority list.

  Fallback will circumvent a None Acceptable by electing the first
  language found from the LanaguagePriority list.

  This breaks [expectedly] the negotiation tests.  They need review.
  My test results will be posted to dev.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92655 13f79535-47bb-0310-9956-ffa450edef68
2001-12-30 04:14:20 +00:00
Jeff Trawick
57b42f96ac handle the disappearance of apr_lock_create_np() and
apr_proc_mutex_create_np() and the new parameter to
apr_lock_create() and apr_proc_mutex_create()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92653 13f79535-47bb-0310-9956-ffa450edef68
2001-12-29 23:16:24 +00:00
Jeff Trawick
570b020eae get rid of an unused variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92643 13f79535-47bb-0310-9956-ffa450edef68
2001-12-28 22:19:50 +00:00
William A. Rowe Jr
f1633e0410 Once again, if mod_dir will perform an internal redirect into a
RESPONSE BODY (as opposed to 'something else' of it's own generation)
  it needs to make the caller aware of the results (e.g. an included
  subrequest) so the caller can decide if the result is suited (e.g.
  including text/html only, but refusing to include other binary results.)

  Since we can know everything about the results of the mod_dir processing
  by the fixups phase, let it perform all resolutions before the caller
  of ap_process_request_internal makes it's decisions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92641 13f79535-47bb-0310-9956-ffa450edef68
2001-12-28 17:20:41 +00:00
Aaron Bannert
f40331c0f2 Modified for clarity.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92445 13f79535-47bb-0310-9956-ffa450edef68
2001-12-13 08:32:48 +00:00
Jeff Trawick
9e735801e3 fix mod_actions.exp, which got broken when we sanitized the names of
the module structures

add mod_vhost_alias.exp


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92274 13f79535-47bb-0310-9956-ffa450edef68
2001-12-01 04:16:32 +00:00
Brian Pane
5998b7f194 optimization: short-circuit out of the mod_actions handler if there are no actions defined in the config
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92162 13f79535-47bb-0310-9956-ffa450edef68
2001-11-24 10:13:29 +00:00
Ian Holsman
86b792b21c Modify post_config hook so that it can return a error,
causing the server not to start.
previous method was to call exit(1) which would not fail
gracefully

PR:
Obtained from:
Submitted by:
Reviewed by:	(Idea only Jeff Trawick)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92144 13f79535-47bb-0310-9956-ffa450edef68
2001-11-23 16:35:22 +00:00
Brian Pane
077ac3eb39 optimized away a strlen call in alias_matches()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92138 13f79535-47bb-0310-9956-ffa450edef68
2001-11-22 21:19:02 +00:00
Ken Coar
06243788dd Typo fixit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92033 13f79535-47bb-0310-9956-ffa450edef68
2001-11-19 15:27:39 +00:00
Aaron Bannert
b77471f71c Convert mod_rewrite's INTRAPROCESS lock to the newly supported
apr_thread_mutex_t type lock. Passes all rewrite.t tests.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91941 13f79535-47bb-0310-9956-ffa450edef68
2001-11-14 08:03:18 +00:00
Aaron Bannert
3e59c439e3 Convert tabs to spaces, and a couple other style changes. No functional
changes. I checked with the rewrite.t perl-framework test to make sure
it still passes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91940 13f79535-47bb-0310-9956-ffa450edef68
2001-11-14 07:50:00 +00:00
Justin Erenkrantz
f503777680 Resolve the mod_dir overaggressive redirection problem seen with non-GET
requests for WebFolders.
Reviewed by:	Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91894 13f79535-47bb-0310-9956-ffa450edef68
2001-11-13 05:10:24 +00:00
Ian Holsman
eea38d7c2e This patch changes the apr_table_elts macro so that it provides
access to the internals of an apr_table_t via a const pointer
instead of the current non-const pointer.


Submitted by:	Brian Pane <BPane@pacbell.net>
Reviewed by:	Ian Holsman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91860 13f79535-47bb-0310-9956-ffa450edef68
2001-11-11 22:31:04 +00:00
Justin Erenkrantz
8fec8816d9 If shared modules are requested and mod_so is not available, produce a
fatal config-time error.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91844 13f79535-47bb-0310-9956-ffa450edef68
2001-11-11 01:58:12 +00:00