summaryrefslogtreecommitdiffstats
path: root/server (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Commit 2 of 2 to:Bill Stoddard2002-03-202-2/+2
| | | | | | | | 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
* Bring 2.0 up to parity, a bit, with how much info we provide toJim Jagielski2002-03-207-17/+46
| | | | | | | | | | | | | 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
* No sense in opening this event when it's already opened in the parent.William A. Rowe Jr2002-03-201-1/+16
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94050 13f79535-47bb-0310-9956-ffa450edef68
* Here's the patch that really sucks. old_listeners points to an arrayWilliam A. Rowe Jr2002-03-201-5/+4
| | | | | | | | | | | | | | | | | of apr_socket objects already destroyed by their cleanups, and in any case they now live in invalid memory. Extend their lifetimes. This implies that the process pool grows on every restart for no good reason. One possible solution is to let the old pconf survive until the new pconf is alive. Another is to create the listeners in a subpool of process->pool, destroyed after the old_listeners are closed. Either which way, a better solution exists, but this closes the immediate bug. [How haven't we been segfaulting in unix on restarts before this patch, gurus?] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94048 13f79535-47bb-0310-9956-ffa450edef68
* More process lifetime changes, and simplify some ambigious cruft.William A. Rowe Jr2002-03-201-12/+16
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94046 13f79535-47bb-0310-9956-ffa450edef68
* Fix a few listener-related lifetime issues [they are created in theWilliam A. Rowe Jr2002-03-201-4/+4
| | | | | | | open logs phase, only once.] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94041 13f79535-47bb-0310-9956-ffa450edef68
* The source of some ills ... there is no reason to keep going if theWilliam A. Rowe Jr2002-03-201-21/+23
| | | | | | | | | | scoreboard exists. I suspect this should be a general cleanup as well [at the end of ap_create_scoreboard.] But calling ap_run_pre_mpm with the process->pool should take care of a clobbered scoreboard shm on graceful restart. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94040 13f79535-47bb-0310-9956-ffa450edef68
* The pre_mpm hook creates server-lifetime objects (or at least, for theWilliam A. Rowe Jr2002-03-207-7/+7
| | | | | | | generations across graceful restarts.) They should use the process pool. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94039 13f79535-47bb-0310-9956-ffa450edef68
* When restarting [always graceful on Win32], we don't repeat pre_mpmWilliam A. Rowe Jr2002-03-201-1/+6
| | | | | | | (Unix doesn't, we shouldn't either.) [Ryan Bloom] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94032 13f79535-47bb-0310-9956-ffa450edef68
* Make the listener thread stop accepting new connections and exitJeff Trawick2002-03-203-83/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanly at graceful restart time. This is a basic requirement of reliable graceful restarts (the kind that won't drop connections). This allows a future fix to make worker threads hang around until they service all connections previously accepted by the listener thread. The old mechanism of doing a dummy connection to wake up the listener thread in each old child process didn't work. It didn't guarantee that (in the main thread) the byte was read from the pod and global variables were set before the listener thread grabbed the connection. It didn't guarantee that a child process in the new generation didn't get some of the dummy connections. Rather than burn extra syscalls adding a unique socket or pipe to the poll set (and breaking single listen unserialized accept in the same change), this uses a signal sent from the main thread to the listener thread to break it out of the poll or accept. (We don't worry about breaking it out of the optional mutex because the child process holding the mutex will break out of poll/accept and release the mutex, allowing a child blocked in the mutex to get it. Eventually all children blocked in the mutex will come out.) Since the listener thread now exits reliably, the main thread joins it. PR: Obtained from: Submitted by: Reviewed by: git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94031 13f79535-47bb-0310-9956-ffa450edef68
* get the start thread to exit when we have reached termination butJeff Trawick2002-03-201-0/+12
| | | | | | | | | | | | | | it is still trying to create worker threads previously, after a non-graceful restart followed by a terminate you could see a bunch of log messages showing the parent repeatedly sending SIGTERM and finally SIGKILL to one or more children... with this change, the sequence of messages should stop very soon add a comment to start_threads() describing a current problem git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94030 13f79535-47bb-0310-9956-ffa450edef68
* Final commit to add ap_rset_content_type accessor. Add AddOutputFiltersbyTypeBill Stoddard2002-03-202-33/+39
| | | | | | | 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
* be a little more specific in a thread-create error messageJeff Trawick2002-03-191-1/+1
| | | | | | | | | it is helpful to distinguish between a failure creating the first thread (listener) vs. a failure creating one of n worker threads git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94025 13f79535-47bb-0310-9956-ffa450edef68
* "apachectl stop" shouldn't send the gracefully-terminate char downJeff Trawick2002-03-191-1/+3
| | | | | | | | the pod... the child processes need to know that it isn't a graceful termination and they shouldn't wait for old connections to finish git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94024 13f79535-47bb-0310-9956-ffa450edef68
* forgot the actual changeIan Holsman2002-03-191-22/+0
| | | | | | | | | | PR: Obtained from: Submitted by: Reviewed by: git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94020 13f79535-47bb-0310-9956-ffa450edef68
* get rid of unnecessary code to track the number of worker threadsJeff Trawick2002-03-191-13/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94017 13f79535-47bb-0310-9956-ffa450edef68
* Fix a hang condition with graceful restart and prefork MPMJeff Trawick2002-03-182-14/+26
| | | | | | | | | | | | | in the situation where MaxClients is very high but much fewer servers are actually started at the time of the restart. The way we notify an entire generation to die at once is changed so that we don't have to use the pod (and deal with the ease of filling the kernel pipe buffer). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93999 13f79535-47bb-0310-9956-ffa450edef68
* prefork and worker:Jeff Trawick2002-03-182-0/+10
| | | | | | | | after allocating a new scoreboard, make sure the right generation is stored in the global score git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93998 13f79535-47bb-0310-9956-ffa450edef68
* don't check for EINTR after a call to apr_file_write();Jeff Trawick2002-03-181-4/+1
| | | | | | | you'll never see it git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93997 13f79535-47bb-0310-9956-ffa450edef68
* Fix for vhosts where the hostname is followed by '.'Brian Pane2002-03-181-2/+2
| | | | | | | | PR: 9187 Submitted by: Ryan Cruse <ryan@estara.com> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93988 13f79535-47bb-0310-9956-ffa450edef68
* Seems like this is the end of the compiler emits on Win32, once again.William A. Rowe Jr2002-03-181-2/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93987 13f79535-47bb-0310-9956-ffa450edef68
* Spell out the merged log name, if we succeeded in merging the pathWilliam A. Rowe Jr2002-03-181-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93986 13f79535-47bb-0310-9956-ffa450edef68
* get the prototype for ap_recent_ctime()Jeff Trawick2002-03-171-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93980 13f79535-47bb-0310-9956-ffa450edef68
* Use the "recent time" cache to optimize timestamp generation forBrian Pane2002-03-172-1/+46
| | | | | | | | | | | | | 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
* Simplify s/APR_OS_PROC_T_FMT/APR_PID_T_FMT/, apr_os_foo entities aren'tWilliam A. Rowe Jr2002-03-163-3/+3
| | | | | | | for external consumption. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93969 13f79535-47bb-0310-9956-ffa450edef68
* Eliminate potential ap_server_root_relative segfaults, with the inputWilliam A. Rowe Jr2002-03-165-25/+68
| | | | | | | | | | | 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
* Axe unused variableWilliam A. Rowe Jr2002-03-151-2/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93961 13f79535-47bb-0310-9956-ffa450edef68
* clean up the use of apr_sockaddr_t (stay out of family-specificJeff Trawick2002-03-151-9/+6
| | | | | | | struct sockaddr* as much as possible) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93960 13f79535-47bb-0310-9956-ffa450edef68
* Allow URIs specifying CGI scripts to include '/' at the endJeff Trawick2002-03-151-0/+14
| | | | | | | | | | (e.g., /cgi-bin/printenv/) on AIX and Solaris (and other OSs which ignore '/' at the end of the names of non-directories). PR: 10138 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93952 13f79535-47bb-0310-9956-ffa450edef68
* Since noone seemed to have a real problem with it, change !! toSander Striker2002-03-151-1/+1
| | | | | | | something that raises fewer questions. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93949 13f79535-47bb-0310-9956-ffa450edef68
* Update the mpms to call the new allocator/pools APISander Striker2002-03-154-4/+19
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93943 13f79535-47bb-0310-9956-ffa450edef68
* deal with the rename of kill_after_timeout to APR_KILL_AFTER_TIMEOUTJeff Trawick2002-03-141-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93940 13f79535-47bb-0310-9956-ffa450edef68
* Added code to extract the current address space name so that eachBradley Nicholes2002-03-141-3/+16
| | | | | | | instance of Apache can be identified by the address space that it is running in git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93934 13f79535-47bb-0310-9956-ffa450edef68
* Some lingering debug cruft that isn't neededWilliam A. Rowe Jr2002-03-141-3/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93930 13f79535-47bb-0310-9956-ffa450edef68
* Use fprintf to stderr over printf. Better yet - replace with theWilliam A. Rowe Jr2002-03-141-13/+13
| | | | | | | logger, but my brain just isn't quite there tonight. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93929 13f79535-47bb-0310-9956-ffa450edef68
* My [sixth?] major revamp of service.c. Traded an event for a mutexWilliam A. Rowe Jr2002-03-143-233/+72
| | | | | | | | | | | | to the service_init completion, expanded timeouts, moved SERVICE_STOPPED message posting to the main thread since sometimes, in odd cirumstances, our SCM thread wasn't resumed prior to termination, and ripped the code for the stderr logs to use nt_eventlog.c instead. And generally tried to make the code just a little bit more grokable [as if such a thing is really possible.] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93928 13f79535-47bb-0310-9956-ffa450edef68
* Cleanup the eventlogger code, and split it into its own source.William A. Rowe Jr2002-03-142-0/+230
| | | | | | | [got the copyright correct, no less.] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93927 13f79535-47bb-0310-9956-ffa450edef68
* Now that we test ownership of the listeners in listen.c, -k "start"William A. Rowe Jr2002-03-141-9/+29
| | | | | | | | | | | | can no longer hang on to the listeners after it checks that they are free. Also, we cannot be checking listeners if we are using -k "config" to alter the service config, since the service might be running as we try this, and we cannot check the listeners in -k "restart", since we are pretty certain they are owned by the running service we are about to try restarting.. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93926 13f79535-47bb-0310-9956-ffa450edef68
* The be-certain-we-own-the-socket patch to listen.c fails if we hangWilliam A. Rowe Jr2002-03-141-0/+1
| | | | | | | | on to the originals after duplicating sockets. If you dup, you aught to be closing the source. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93925 13f79535-47bb-0310-9956-ffa450edef68
* Our ap_listeners were binding to IIS sockets, other Apache instances'William A. Rowe Jr2002-03-141-0/+23
| | | | | | | | | | listeners, the bottoms of peoples' shoes, etc. Wait to set SO_REUSEADDR on Win32 until the parent is certain the port is all ours. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93924 13f79535-47bb-0310-9956-ffa450edef68
* Fix win32 compile breakage.Bill Stoddard2002-03-131-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93922 13f79535-47bb-0310-9956-ffa450edef68
* Update our copyright for this year.Roy T. Fielding2002-03-1360-60/+60
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93918 13f79535-47bb-0310-9956-ffa450edef68
* Move the quick_handler comment to the new quick handler location. Do notBill Stoddard2002-03-131-7/+27
| | | | | | | | call quick handler on a dirent subrequest. This fixes a nasty problem in mod_cache where it was serving up content on a dirent subrequest. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93915 13f79535-47bb-0310-9956-ffa450edef68
* simplify the way we find the family of an apr_sockaddr_tJeff Trawick2002-03-131-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93914 13f79535-47bb-0310-9956-ffa450edef68
* Fix the calculation of thread_num in the worker score structure.Jeff Trawick2002-03-131-1/+1
| | | | | | | | Submitted by: Stas Bekman Reviewed by: Jeff Trawick git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93900 13f79535-47bb-0310-9956-ffa450edef68
* simplify the way we find the family of an apr_sockaddr_tJeff Trawick2002-03-133-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93884 13f79535-47bb-0310-9956-ffa450edef68
* Style Police comming through...Sander Striker2002-03-121-162/+194
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93852 13f79535-47bb-0310-9956-ffa450edef68
* Make this look a bit better.Sander Striker2002-03-111-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93843 13f79535-47bb-0310-9956-ffa450edef68
* Style Police comming through...Sander Striker2002-03-111-169/+209
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93842 13f79535-47bb-0310-9956-ffa450edef68
* Style Police comming through...Sander Striker2002-03-111-25/+65
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93833 13f79535-47bb-0310-9956-ffa450edef68