core: ensure that MPMs return an error on runtime failure and hence that httpd's main process also exits with an error.

Fix printf format spotted by cppcheck. Untested.

Add missing APLOGNO. Refactor some lines to keep APLOGNO on the same line as ap_log_error, when applicable. Split lines longer than 80. Improve alignment.

Now allow MPMs to call ap_log_common()

cppCheck: kill two warnings about incorrect printf parameters. 'worker_thread_count' is unsigned

Add lots of unique tags to error log messages

Rename MaxClients to MaxRequestWorkers which describes more accurately what it does.

fill in conn_rec::current_thread for WinNT, NetWare, and OS/2 MPMs

Add child_status hook for tracking creation/termination of MPM child processes. Add end_generation hook for notification when the last MPM child of a generation exits. end_generation is implemented completely by core using the child_status hook run by the MPM. simple and mpmt_os2 MPMs don't currently run the child_status hook, so neither hook is invoked with those MPMs.

the mpm-note-child-killed hook is just for state sync between ap_{reclaim,relieve}_child_processes() and their callers the NetWare and OS/2 MPMs don't use that

mpm_common.c implements a handful of config directives; the related state has to be re-initialized to the default values at pre-config time, but that was handled inconsistently by the MPMs, resulting in unexpected behavior when some of the directives were removed across restart move that necessary initialization from the MPMs to common code run from core's pre-config; MPMs that need to override defaults can do so by running after core's pre-config (the NetWare MPM now does that) the DEFAULT_MAX_REQUESTS_PER_CHILD compile setting wasn't useful enough to keep the simple MPM wasn't consistent in which of these directives were respected and which weren't, and that hasn't changed (see procmgr.max_requests_per_child vs. ap_max_requests_per_child)

Removed duplicate global; removed obsolete cast.

Added require prototypes conditionally to CFLAGS for NETWare; added header includes for getting protos.

remove more unused variables revove some obsolete comments netware file is untested

Code cleanup: replace strncpy by apr_cpystrn or apr_pstrmemdup Submitted by: Takashi Sato <takashi lans tv com> PR: 43432

Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take advantage of per-module loglevels

Log command line on startup, so there's a record of command line arguments like -f. Suggested by Shaya Potter. [Dan Poirier] PR: 48752

remove dead code related to the accept mutex

follow up r791309 with additional changes to accommodate the new MPM interfaces (some old API variables are now private, support retrieval of the MPM generation, implement the mpm_note_child_killed hook)

first hacks to make mpm_netware usable again; not ready yet!

stop exporting APACHE_MPM_DIR to modules -- unclear why this was ever necessary, and it makes no sense with loadable MPMs axe the unnecessary MPM_DIR build variable move the stray APACHE_SUBST(MPM_LIB) from configure.in to server/mpm/config.m4, where the other MPM_foos are handled

axe the unnecessary AP_MPM_HARD_LIMITS_FILE

Remove all references to CORE_PRIVATE.

Remove ap_graceful_stop_signalled from all MPMs.

Destroy pmain pool when exiting ap_mpm_run() so that cleanups registered in modules' child_init hooks are performed (e.g., mod_log_config and mod_dbd).

Replace ap_get_server_version with ap_get_server_banner() and ap_get_server_description(). High-level summary: The full server version information is now included in the error log at startup as well as server status reports, irrespective of the setting of the ServerTokens directive. Third-party modules must now use ap_get_server_banner() or ap_get_server_description() in place of ap_get_server_version().

Introduce a check_config phase between pre_config and open_logs, to allow modules to review interdependent configuration directive values and adjust them while messages can still be logged to the console. The open_logs phase is already used somewhat for this purpose by certain MPMs (winnt, prefork, worker, and event) but only by forcing their functions ahead of the core ap_open_logs() function, and since this phase runs after the ap_signal_server function during startup, it can not be used to generate messages on the console when restarting. Add the check_config phase to mod_info and mod_example. Handle relevant MPM directives during this phase and format messages for both the console and the error log, as appropriate. Bounds and sanity checks on the values of the MPM directives are handled in sequence in this phase instead of in the various directive handling functions, since those functions (e.g., set_max_clients()) may not be called at all if their directives do not appear in the configuration files, and even if they are called, there is no guarantee that this will occur in any particular order. Remove from the worker and event MPMs the code in the pre_config phase that alters the configuration node tree by re-ordering ThreadsPerChild ahead of MaxClients. This code is effective but insufficient; for example, if ServerLimit follows MaxClients, the test against server_limit in set_max_clients() is invalid. (In practice, this only results in incorrect or absent warnings on the console, because server_limit is set to its configured value when the main loop re-runs the configuration process.) Prevent ap_threads_per_child from exceeding thread_limit in the winnt, worker, and event MPMs. This situation could occur if ThreadsPerChild was not specified in the configuration files and ThreadLimit was set to a value smaller than DEFAULT_THREADS_PER_CHILD, because set_threads_per_child() would never be called and therefore its bounds check against thread_limit would not be performed. Remove from the winnt, prefork, worker, and event MPMs the changed_limit_at_restart flag. Set the first_server_limit and first_thread_limit values during the first execution of the check_config function, and use them to detect changes to ServerLimit and ThreadLimit across restarts and issue appropriately formatted warnings. Remove the comments about the error log being a "bit bucket"; this was true when the code was originally committed in r92530 but that was due to a bug fixed in r92769. Be consistent about setting all MPM configuration directive values in the pre_config phase. Rephrase and reformat the console and log file messages relating to MPM configuration directives to be consistent across all MPMs. Use briefer messages when logging to the error log than to the console. Update miscellaneous stale comments and messages (e.g., reference to daemons_min_free in worker and event MPMs, "prefork open_logs" in winnt MPM, and StartServers in netware MPM). The winnt, netware, beos, and mpmt_os2 MPMs should be tested by developers with access to those platforms, especially the winnt MPM, which has unique logic with respect to distinguishing between parent and child processes during the configuration phases. Update the English documentation for the worker MPM's ThreadsPerChild directive, which no longer needs to precede other MPM directives in the configuration files if it has a non-default value. The German (.de) and Japanese (.ja) translations should be updated by developers fluent in those languages.

update license header text

Update the copyright year in all .c, .h and .xml files

No functional change: remove "internal" tab spacing/formatting.

No functional change: more indenting/formatting changes due to tabbing

No functional Change: Removing trailing whitespace. This also means that "blank" lines consisting of just spaces or tabs are now really blank lines

No functional change: simple detabbing of indented code.

Allow httpd on NetWare to build using either the standard socket libraries or the Winsock libraries.

Make sure that the secure listen sockets that are created and injected into the ap_listeners lists by mod_nw_ssl are handled correctly so that they remain open and reused across restarts.

Update copyright year to 2005 and standardize on current copyright owner line.

Fixing various compiler error when compiling against the latest version of LibC SDK

Fix a typo and clean up some tab characters. Submitted by: Guenter Knauf <gk@gknw.de>

*) SECURITY: CAN-2004-0174 (cve.mitre.org) Fix starvation issue on listening sockets where a short-lived connection on a rarely-accessed listening socket will cause a child to hold the accept mutex and block out new connections until another connection arrives on that rarely-accessed listening socket. With Apache 2.x there is no performance concern about enabling the logic for platforms which don't need it, so it is enabled everywhere except for Win32. [Jeff Trawick] (already in 2.0.49, propagating to mirrors now)

Adapt the mpm_netware version of the ThreadStackSize directive to the common version

Report the NetWare socket error since we are using native socket calls

fix name of The Apache Software Foundation

fix copyright dates according to the first checkin

apply Apache License, Version 2.0

Commenting out the DBINFO define

Adding missing parenthesis in DBINFO code

update license to 2004.

Added mpm_state to ap_mpm_query() for the NetWare MPM

Fix the display of the terminate and restarting console messages

Add restart and shutdown thread counters to the console display

revert my previous commit. when 2.0 and 2.1 were not in sync, i went with what was in 2.0 because it was more recent, but it turns out that was the wrong choice. reverts to 2.0 to follow

forward-port Brad's commit to the 2.0 branch that gets rid of the explicit bucket_alloc_destroy(), which is redundant

switch to APR 1.0 API (which is still in flux) because of the changes to the argument lists of apr_mmap_dup and apr_socket_create, 2.1-dev won't build with apr and apr-util's 0.9 branch anymore

Updated the various MPM's to use the new bucket_alloc_create_ex API when necessary. Which is to say that it's necessary in all cases except for prefork, where the change to apr-util to have it use the allocator from the pool passed in is already sufficient. Reviewed by: Jean-Jacques Clar, Sander Striker, Brad Nicholes

Make sure that the global ap_max_mem_free is initialized along with the other MPM globals whenever HTTPD is started or restarted.

Simplify the per-thread pool handling in the NetWare MPM

Make sure that bucket allocator for each worker thread is created from a thread specific pool. This prevents multiple threads from trying to clean up the same pool at the same time.

Need to report a select() error vs a timeout. Also avoid hogging the CPU on an error.

Fixed a small logic problem when printing out the console command help Submitted by: Ulrich Neumann <U_Neumann@gne.de>

finished that boring job: update license to 2003. Happy New Year! ;-))

Enabled the -n parameter on NetWare to allow the administrator to rename the console screen

Register for the SERVERDOWN event to allow Apache to shutdown gracefully when the NetWare OS is shutdown

Force the screen to close on exit() if the -E option was specified on the command line

Don't hold the Apache screen open when it exits with an error if all of the error messages are going to a file anyway. In other words, don't hold the screen open if the -E <filename> command line parameter is used.

Switched to the APR_STATUS_IS_XXX macros

Don't bother destroying the memory pools and buckets for each thread at during shutdown since it will all be cleaned up at termination anyway.

Removed unnecessary pool cleanup after a restart or shutdown

Hold the Apache screen open on NetWare if exit() is called for any reason during initialization and configuration of the main Apache process.

http occurances to update for apr_socket_opt_get/set

Add a new directive: MaxMemFree. MaxMemFree makes it possible to configure the maximum amount of memory the allocators will hold on to for reuse. Anything over the MaxMemFree threshold will be free()d. This directive is usefull when uncommon large peaks occur in memory usage. It should _not_ be used to mask defective modules' memory use.

Re-architected the select()/accept() loop to allow all threads to rely on select() to signal when data is ready rather than only allowing a single thread at a time to be signaled by select(). This allows Apache to pull the requests off of the listen queue as fast as winsock will allow without latency introduced by the accept mutex.

Now that we have the functionality in apr, we can now have 2.0's startup message regarding AcceptMutex (what we are using and what the default is) "fully" match what is present in 1.3. PR: Obtained from: Submitted by: Reviewed by:

Switched to using atomic operations for tracking the active threads rather than having to lock and unlock a mutex.

Catch up with the apr_allocator_set_owner -> apr_allocator_owner_set renames in APR.

Fixing a memory leak with the threads bucket_allocator. We were allocating too much and not freeing up enough. On a thread exit the bucket and the transaction pool need to be cleaned up. When the MPM exits, the main pool needs to be cleaned up.

stop using APLOG_NOERRNO in calls to ap_log_?error()

Readjusting how the bucket alloc is done for each worker thread. Allocate the bucket once per thread rather than on every request. This change increases our performance significantly.

Add some additional shutdown synchronization so that we don't get the OS message to force the module to unload.

Readjustment of where the bucket is being allocated now that they are being cleaned up. Need to move the call to after apr_pool_clear() so that it doesn't get cleanup too soon and never reallocated.

Closed up some holes where a thread could escape and exit without releasing the mutex. This would leave all of the other threads deadlocked.

Added a call to apr_bucket_alloc_destroy() to the clean_child_exit() code that is called when each worker thread terminates. This stopped the memory leak.

Check for a NULL pointer in the case of the OS address space

Replaced a hack for getting the address space with the real API

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:

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.

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:

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:

The pre_mpm hook creates server-lifetime objects (or at least, for the generations across graceful restarts.) They should use the process pool.

Update the mpms to call the new allocator/pools API

Added code to extract the current address space name so that each instance of Apache can be identified by the address space that it is running in

Update our copyright for this year.

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

Create a new pool allocator for each worker thread

Implemented the handling of the SIGABRT signal.

Reintroduce the create_connection hook. This hook is required to enable modules to completely take over all network i/o from the core.

Fixed the unload process so that the console command gets properly unregistered. This fixes the 88 unreleased resources after termination

Removed the call for now to shutdown the listeners so that threads don't end up stuck on blocking socket calls during shutdown. I need to figure out a cleaner way of preventing this problem.

This patch restores most of Ryan's patch (11/12/2001) to remove the client_socket from the conn_rec. Diffs from Ryan's patch include: - rename the create_connection hook to install_transport_filters - move the point of invocation of the hook till after the call to after ap_update_vhost_given_ip to enable the hook to use vhost config info in its decision making.

The pre_config hook now takes a return value. This allows modules to cause the server to bail out under error conditions.

fix the problem where a scoreboard init failure could leave mod_cgid stranded a pre_mpm hook can now return failures, so problems in ap_create_scoreboard percolate back to a place where Apache can exit cleanly

Remove the create_connection hook and put the client_socket back into the conn_rec. The create_connection_hook has a design flaw that prevents it from making decisions based on vhost information.

Updated the command line keyword to Apache2 and also modified the shutdown code for unloading the NLM

Implemented a checkunload callback to allow apache to be unloaded using the Unload console command. Also changed the nlm name and console command to APACHE2.

Combination of blocking and nonblocking accept loop

This patch eliminated from the _SHARED_ segment of the scoreboard all pointer math. This is required for portable scoreboards. vhost becomes the 'vhost name string' so it now survives ap_generation clicks. next was apparently never used. This patch also accounts for the changes to the apr_shm api, and gives Win32 the magic of a shared scoreboard. Breakage aplenty on non-win32 platforms, I suspect, but this radical surgery, and culling of unused functions, was really, really needed.

Reworked the accept() loop to avoid an extra call to select() just to determine if there is work to do. Made the calls to accept() non-blocking.

for the netware MPM, move HARD_THREAD_LIMIT back to mpm_default.h where the other user-tunable compile-time parameters are HARD_SERVER_LIMIT stays in mpm_netware.c since it can't really be changed

Reworked the select/accept loop to try to rely less on select to determine if there is work to do.

fix some references to the wrong constant (HARD_SERVER_LIMIT vs. HARD_THREAD_LIMIT)

Change core code to allow an MPM to set hard thread/server limits at startup.

Clean up GNU compiler issues on NetWare Submitted by: Pavel Novy

Changed a variable name to avoid a NetWare LibC global conflict. Submitted by: Pavel Novy [novy@feld.cvut.cz]

Pull lingering close out of the pool cleanup phase. This was causing too many bugs. Instead, it is called where it used to be called. I have abstracted some of the logic out of the lingering close so that it gets the socket from the connection using the core's conn_config vector. This is in anticipation of a change to use a hook for the lingering close, which I hope to do soon.

Add the server_rec argument back to the create_connection hook. Submitted by: Greg Stein

Misc. cleanups and performance enhancements

Remove commas from the end of the macros that define directives that are used by MPMs. Previous to this patch, you would use these macros without commans, which was unlike any other directives. Now, after the macro, you must have a comma. This makes the macros look more like the rest of the directives. I know this is cosmetic, and I was going to leave it alone, but when I found out that it bothered Cliff too, I decided to fix it after all. Submitted by: Ryan Bloom and Cliff Woolley

Remove more network logic from the MPMs. Essentially, each MPM can define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK, which tells Apache to disable_nagle on the accepted socket.

Begin to abstract out the underlying transport layer. The first step is to remove the socket from the conn_rec, the server now lives in a context that is passed to the core's input and output filters. This forces us to be very careful when adding calls that use the socket directly, because the socket isn't available in most locations.

Remove ap_lingering_close from all of the MPMs. This is now done as a cleanup registered with the connection_pool. I have also turned ap_lingering_close into a static function, because it is only used in connection.c. This is the next step to consolidating all of the socket function calls. ap_lingering_close will only be added if the core is dealing with a standard socket.

Fix the spelling of the AP_MPMQ_MIN_SPARE_DAEMONS and AP_MPMQ_MAX_REQUESTS_DAEMON macros. Better to do it now rather than later. **WARNING** This will of course break the compile on any third-party MPMs you might have floating around, but it's a really quick change to make.

Added the secondary command line hander for manipulating a running instance of Apache from the console.

NetWare MPM cleanup

Updated to the new locking API's

NetWare doesn't have processes so no need to detach something that doesn't exist

First cut at the MPM for NetWare