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

1286 Commits

Author SHA1 Message Date
William A. Rowe Jr
e9710c17ca Testing reveals a nasty side effect of this aftn's patch, this is the fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89450 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 23:18:30 +00:00
William A. Rowe Jr
d4c82f83ea Pull harry, difficult to read sub_req_common_validation() into its own
function so that it's apparent that this is common code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89447 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 21:48:53 +00:00
William A. Rowe Jr
a7a28bd8c0 Here, finally are a few cleanups of my fat fingers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89444 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 20:57:14 +00:00
William A. Rowe Jr
07f1f1f5ea Now, introduce ap_sub_req_lookup_dirent() for processing apr_finfo_t
results from mod_negotiation and mod_autoindex.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89443 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 20:53:36 +00:00
William A. Rowe Jr
449207bd36 Pull the common cruft from ap_sub_req_lookup_*() fns.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89442 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 20:46:52 +00:00
William A. Rowe Jr
e3a7a230e7 Sorry, second pass, working on legibility. This patch introduces the
fill_in_sub_req_vars function to propogate the rnew values, but doesn't
  yet hook it in.  Note that there are two discrepancies, apparently
  pretty bad ones, that have been moved after the 'common code' so the
  next patch becomes pretty simple.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89441 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 20:44:00 +00:00
William A. Rowe Jr
ec222e4248 Revert changes in 1.7, I had applied the patch incorrectly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89439 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 20:30:49 +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
8ba66cccaf Move duplicated rnew cloning from apr_ap_sub_req_lookup_*() functions,
and add an ap_sub_req_lookup_dirent() to create a subrequest from the
  results of an apr_dir_read() for mod_negotiation and mod_autoindex.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89437 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 20:09:24 +00:00
William A. Rowe Jr
7a5c5c4965 Add additional query datum to the MPMs.
Harrie Hazewinkel <harrie@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89433 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 17:43:51 +00:00
Jeff Trawick
bc3508337c hide the generation of the httpd.exp header from the build messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89431 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 17:11:52 +00:00
Jeff Trawick
6ee771ecbd get strcasecmp() prototype available on AIX
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89429 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 10:15:37 +00:00
Jeff Trawick
e943e56bcc add the AcceptMutex directive to the perchild MPM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89423 13f79535-47bb-0310-9956-ffa450edef68
2001-06-26 17:44:49 +00:00
Jeff Trawick
6aeb7aadb4 add support for the AcceptMutex keyword to the threaded MPM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89421 13f79535-47bb-0310-9956-ffa450edef68
2001-06-26 17:27:40 +00:00
Jeff Trawick
9d62a720c0 get rid of a duplicate assignment of ap_server_conf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89419 13f79535-47bb-0310-9956-ffa450edef68
2001-06-26 16:33:14 +00:00
Jeff Trawick
058288ed08 add the AcceptMutex directive and related processing to prefork MPM
the directive syntax is as suggested by JimJag a few days ago


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89418 13f79535-47bb-0310-9956-ffa450edef68
2001-06-26 15:13:02 +00:00
Jeff Trawick
1ea247fe52 fix a comment describing how we kill off a single child process
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89416 13f79535-47bb-0310-9956-ffa450edef68
2001-06-26 10:59:16 +00:00
Cliff Woolley
94dc5573dd The bucket_foo_create() functions do not need to use calloc() because
all of the members of the apr_bucket struct are always explicitly
initialized anyway... malloc() should be used instead.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89389 13f79535-47bb-0310-9956-ffa450edef68
2001-06-19 18:48:21 +00:00
Cliff Woolley
cd399fff26 Remove a duplicated check for -DONE_PROCESS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89386 13f79535-47bb-0310-9956-ffa450edef68
2001-06-18 19:09:55 +00:00
Jeff Trawick
03a0359eb8 As with Apache 1.3, use priority APLOG_INFO (instead of APLOG_ERR) for
log messages which report network errors writing to the client.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89384 13f79535-47bb-0310-9956-ffa450edef68
2001-06-18 12:38:17 +00:00
Brian Havard
041c1cc9ae OS/2: Automate export of global variables from core.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89376 13f79535-47bb-0310-9956-ffa450edef68
2001-06-16 04:00:50 +00:00
Jeff Trawick
740a93ba5d Fix brokenness when ThreadsPerChild is higher than the built-in
limit.  We left ap_threads_per_child at the higher value which
led to segfaults when doing certain scoreboard operations.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89375 13f79535-47bb-0310-9956-ffa450edef68
2001-06-15 18:33:09 +00:00
Ryan Bloom
afaf899642 Back out the change to allocate files out of the main request pool, and
implement pool-based setaside for FILE and MMAP buckets.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89370 13f79535-47bb-0310-9956-ffa450edef68
2001-06-14 22:56:12 +00:00
Jeff Trawick
7627b275ab fix some more signalling issues:
. in ONE_PROCESS mode, bail out immediately for SIGHUP and
  SIGINT

  Note that if you send HUP or INT and have cgid then cgid won't
  go away.  If you generate the interrupt signal from the httpd
  terminal then cgid will go away, [I guess] because SIGINT gets sent
  to the process group.  Perhaps just_die() needs to have logic to
  send to other processes in the group for ONE_PROCES mode

. the die_now flag should be static

. please_die_gracefully() is no longer needed


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89369 13f79535-47bb-0310-9956-ffa450edef68
2001-06-14 15:46:44 +00:00
Jeff Trawick
ff01b91f5f For SIGHUP in the server processes, we attempt to go away immediately,
just as for SIGTERM.  If we deadlock because of some module or library
issue then SIGKILL will come soon enough.

Stop dorking with SIGTERM and SIGHUP in make_child().  That makes it
kind of hard for the caller to set up for ONE_PROCESS mode.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89368 13f79535-47bb-0310-9956-ffa450edef68
2001-06-14 15:26:48 +00:00
Jeff Trawick
d68538c726 fix a bad call to ap_log_error (missing the errno/apr_status_t parameter)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89367 13f79535-47bb-0310-9956-ffa450edef68
2001-06-14 14:26:54 +00:00
Jeff Trawick
98b897339d catch SIGWINCH in the parent process and set appropriate flags
so that we write to the pod to tell the servers to go away


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89366 13f79535-47bb-0310-9956-ffa450edef68
2001-06-14 14:07:07 +00:00
Jeff Trawick
7a881a69f2 fix a format string used for apr_status_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89365 13f79535-47bb-0310-9956-ffa450edef68
2001-06-14 13:27:37 +00:00
Greg Stein
e5640cedcc Define a hook for fetching management/status items.
This patch was submitted by Ian Holsman. Greg revised some names, applied
the Apache style, and namespace-prefixed the public symbols. Minor bugfix in
the use of the hook implementation macro.

Submitted by: Ian Holsman <IanH@cnet.com>
Reviewed by: Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89364 13f79535-47bb-0310-9956-ffa450edef68
2001-06-13 20:11:45 +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
Greg Ames
4419b1ab32 Fix seg faults and/or missing output from mod_include. The
default_handler was using the subrequest pool for files and
MMAPs, even though the associated APR structures typically
live longer than the subrequest.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89354 13f79535-47bb-0310-9956-ffa450edef68
2001-06-12 19:03:08 +00:00
Jeff Trawick
aac11200a9 fix the bindprocessor() code selection; we need to test for the
presence of the bindprocessor() function, not for sys/processor.h,
which exists on some systems that don't have bindprocessor()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89352 13f79535-47bb-0310-9956-ffa450edef68
2001-06-12 14:04:12 +00:00
Jeff Trawick
405d7ea1f5 get threaded.c to compile on non-AIX systems which have sys/processor.h
if we want to call bindprocessor(), we should check for bindprocessor(),
not some header file

(prefork and perchild to be fixed shortly)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89351 13f79535-47bb-0310-9956-ffa450edef68
2001-06-12 12:55:22 +00:00
Victor J. Orlikowski
206c3f2700 Clean up formatting.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89347 13f79535-47bb-0310-9956-ffa450edef68
2001-06-11 23:43:22 +00:00
Victor J. Orlikowski
f8e50ad56d Make the processor unbinding/re-binding stuff on AIX work again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89341 13f79535-47bb-0310-9956-ffa450edef68
2001-06-11 21:41:56 +00:00
Jeff Trawick
c50b9eaa62 back out a change from last week that reversed the meaning of pod_in and
pod_out; after that change, all read and write syscalls on the handles
failed because pod_in was only readable and pod_out was only writable

we could instead reverse the order of the parameters to apr_pipe_create
so that the descriptors returned by pipe() get put in the right place,
but it seems better to stick with APR terminology for what is the input
handle and what is the output handle


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89335 13f79535-47bb-0310-9956-ffa450edef68
2001-06-11 18:23:21 +00:00
Victor J. Orlikowski
0953339d3c Document the fact that this is now an autogenerated file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89334 13f79535-47bb-0310-9956-ffa450edef68
2001-06-11 17:52:37 +00:00
Victor J. Orlikowski
2f16b9f3b8 Make this little hack slightly more palatable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89321 13f79535-47bb-0310-9956-ffa450edef68
2001-06-09 08:28:08 +00:00
Victor J. Orlikowski
6126dd3289 Still needs to be built, though.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89320 13f79535-47bb-0310-9956-ffa450edef68
2001-06-09 08:20:11 +00:00
Victor J. Orlikowski
415ae0aa07 No, libtool shouldn't build this. :p
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89319 13f79535-47bb-0310-9956-ffa450edef68
2001-06-09 08:16:14 +00:00
Victor J. Orlikowski
37e2ad570b xlC isn't as accepting as gcc; make things tolerable for it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89318 13f79535-47bb-0310-9956-ffa450edef68
2001-06-09 08:06:38 +00:00
Victor J. Orlikowski
c2eed71a52 Add the missing AP[RU]_DECLARE_DATA symbols to httpd.exp.
httpd.exp should now be generated automatically.
Any missing symbols are now the fault of awk scripts.
Or rather, their authors. :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89316 13f79535-47bb-0310-9956-ffa450edef68
2001-06-09 06:33:50 +00:00
Jeff Trawick
107761ea76 pod_in shouldn't be non-blocking after all
Submitted by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89314 13f79535-47bb-0310-9956-ffa450edef68
2001-06-09 02:57:46 +00:00
Victor J. Orlikowski
8040c4ad75 Clean up this relative path too.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89312 13f79535-47bb-0310-9956-ffa450edef68
2001-06-08 20:36:09 +00:00
Jeff Trawick
fa787dcc29 the input handle to the pod (used by child processes) needs to be non-blocking
before this, no requests could be processed by prefork since after connect
from the client prefork would block reading the pod

the write handle to the pod probably doesn't have to be non-blocking, but
getting EAGAIN for the pipe-full condition, rather than blocking, is nice
for now since it would tend to indicate that something is FUBAR; on the other
hand, this probably needs to change in order to support more than 4K workers


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89310 13f79535-47bb-0310-9956-ffa450edef68
2001-06-08 16:53:10 +00:00
Ryan Bloom
0f8c1f462c We need to increment i during this for loop. Without this change, we will
end up in an infinite loop.
Submitted by:	Ryan Morgan


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89309 13f79535-47bb-0310-9956-ffa450edef68
2001-06-08 16:39:48 +00:00
Victor J. Orlikowski
dd5aea1264 DISTCLEAN, not EXTRACLEAN.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89307 13f79535-47bb-0310-9956-ffa450edef68
2001-06-08 14:49:20 +00:00
Victor J. Orlikowski
5bb62837d1 Make sure httpd.exp gets cleaned up only with a distclean, and not every time.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89306 13f79535-47bb-0310-9956-ffa450edef68
2001-06-08 14:43:02 +00:00
Greg Stein
0c0d157331 Convert the filter and brigade writing functions to return status values,
not byte counts.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89305 13f79535-47bb-0310-9956-ffa450edef68
2001-06-08 11:00:14 +00:00
Ryan Bloom
4ddaac5e95 It helps to write to the input side of the pipe, and read from the output
side.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89303 13f79535-47bb-0310-9956-ffa450edef68
2001-06-08 04:55:44 +00:00