Followon to r1671396: add misiing newline in new server-status output.

Followon to r1671396: Remove unwanted redundant output introduced by that commit.

Add more data to "?auto" view of server-status. Although mod_status source code calls this the "short_report", the docs and the API flag call it "Machine Readable" resp. "STAT_OPT_AUTO". So IMHO the data shown should be on par with the html version.

SECURITY (CVE-2014-0226): Fix a race condition in scoreboard handling, which could lead to a heap buffer overflow. Thanks to Marek Kroemeke working with HP's Zero Day Initiative for reporting this. * include/scoreboard.h: Add ap_copy_scoreboard_worker. * server/scoreboard.c (ap_copy_scoreboard_worker): New function. * modules/generators/mod_status.c (status_handler): Use it. * modules/lua/lua_request.c (lua_ap_scoreboard_worker): Likewise. Reviewed by: trawick, jorton, covener, jim Submitted by: jorton, covener

this is broken... pull out

This is useful info for mod_status ;)

Add useful mod_status info... try to determine last time a specific vhost was accessed/used.

CVE-2012-3499 and CVE-2012-4558 Be sure to escape potential troubled strings

Break out loadavg from Apache load.... one is quick, the other isn't so much, and so why load things up when wanting just the server loadavg?

minor name change, but I expect most will just want/need/use the current load average, so simplify the name

Would be nice to have some sort of canonical definition of server loading for Apache. So create a struct that holds some useful data. The hope is that for those platforms that lack getloadavg(), people will write replacements.

follow-on to r1097070: axe unnecessary trailing comma

Add lots of unique tags to error log messages

Cleanup effort in prep for GA push: Trim trailing whitespace... no func change

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

Code cleanup: replace apr_table_set with non-copying apr_table_setn in a few places Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>

Display information about asynchronous connections in the server-status PR: 44377

Fix handling of cumulative system time

Merge repeated calls of ap_rputs. Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr> PR: 51330

Follow on to 1057048: In the map of active workers, don't print spaces for scoreboard slots which aren't used due to ThreadsPerChild < ThreadLimit or MaxClients/ThreadsPerChild < ServerLimit; simply omit those slots from the display. Workers in those slots which are gracefully exiting (from a previous generation with a different MPM config) will be displayed, and the map will shrink as those workers exit.

Add in a configuration generation... this is independent of MPM gen, just in case we ever switch MPMs at a graceful ;)

clarify that the displayed IP address may not be the public address, as suggested by wrowe

Display the local IP address in server-status. This can be useful for HTTPDs behind load balancers.

mod_status: Don't show slots which are disabled by MaxClients as open. PR: 47022 Submitted by: Jordi Prats <jordi prats gmail com>, Stefan Fritsch

Avoid unnecessariy initialisation before we test mod_status's handler name.

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

* We need to return an int as result of the pre_config hook.

Refactor mod_status out of the ExtendedStatus toggle picture, as other modules can and should be able to use this scoreboard information. Rename suggestions for such a directive are welcomed. Note that mod_status toggles the default, to present the ExtendedStatus for server operators, whenever it is loaded. Docs changes to follow.

Bring back OS/2 support. Reverses r758929 with a little bit of conflict resolution.

Quit hiding the previous request information while the subsequent request is partially read

axe unmaintained 1.3-era code to support AUX, SunOS, IRIX, Next, Tandem, MPE, LynxOS, QNX, and UnixWare

remove OS/2 platform support

Introduce a new set of APIs to allow MPMs to be proper modules instead of integral parts which share global variables, functions, and macros with the rest of httpd. Converted now: prefork, worker, event, simple, WinNT* *WinNT hasn't been built or tested, and relies on a hack to include the WinNT mpm.h to disable Unixy MPM support routines in mpm_common.c

Remove all references to CORE_PRIVATE.

Modified default refresh value to 10 secs so that its possible to correct a typo.

* Ensure refresh parameter is numeric to prevent a possible XSS attack caused by redirecting to other URLs. Reported by SecurityReason. Submitted by: Mark Cox, Joe Orton Reviewed by: security@httpd.apache.org

Add in SeeRequestTail directive, to handle the shortcoming of only storing 63 bytes of the request, when the requests are longer than that and only vary towards the end; eg: GET /disk1/storage/apache/htdocs/images/image-store1/food/fruits/seeded/apples.jpg GET /disk1/storage/apache/htdocs/images/image-store1/food/fruits/seeded/pears.jpg GET /disk1/storage/apache/htdocs/images/image-store1/food/fruits/seeded/plums.jpg

MMN major bump required; this API is altogether inconsistent, transparent types should be opaque, opaque types should be transparent. Solve one aspect, follow the _by_indexes() example for ap_get_scoreboard_worker family of functions, and the primary one will now accept the abstracted conn_rec value of sbh to find that connections slot.

Non-functional change. Simple cleanup. PR: 42805

Fix CVE-2006-5752: * modules/generators/mod_status.c (status_handler): Specify charset in content-type to prevent browsers doing charset "detection", which allows an XSS attack. Use logitem-escaping on the request string to make it charset-neutral. Reported by: Stefan Esser <sesser hardened-php.net>

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().

update license header text

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

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

worker MPM/mod_status: Support per-worker tracking of pid and generation in the scoreboard so that mod_status can accurately represent workers in processes which are gracefully terminating. New child processes with worker MPM can take over slots of individual threads within gracefully terminating processes. Sometimes this is a problem (too many of these gracefully terminating processes), so it is helpful to have mod_status provide the information required to recognize these processes.

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

* modules/generators/mod_status.c: Mark private global variables as static.

fix name of The Apache Software Foundation

fix copyright dates according to the first check in

apply Apache License, 2.0

update license to 2004.

mod_status: Report total CPU time accurately when using a threaded MPM. Note: It worked before with linuxthreads and it still does. But now it works with normal thread implementations too. PR: 23795

fix mod_status compilation on Win32 (stolen from mod_dav). We should consider a rename of AP_*_HOOK_* to CORE_*_HOOK_* ;-)

Add optional hook to extend mod_status output. * configure.in: Add modules/generators to include path. * Makefile.in: Install mod_status.h. * modules/generators/mod_status.h: New file. * modules/generators/mod_status.c: Implement ap_run_status_hook. (status_handler): Run status hooks.

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

Replaced APR_USEC_PER_SEC division with apr_time_sec macro

Send output to the next filter even on header_only requests in mod_status and mod_info

tweak "requests currently being processed". It is confusing to not have old generation requests included after a graceful restart. But we shouldn't count workers who are starting up. OTOH, the "ready" counter needs to pay attention to the generation, so it stays in sync with how p_i_s_m counts idle workers.

stop using APLOG_NOERRNO in calls to ap_log_[pr]error()

Skip a potentially heavyweight call to sysconf, plus some local variable initializations, in the common case where the request is not for the server status page

move a loop-invariant computation out of the thread loop and at the same time quiet a gcc warning (it assumed that thread_limit could be zero, which would leave ps_record uninitialized when referenced after the end of the thread loop)

PR: Obtained from: Submitted by: Ryan Morgan <rmorgan@covalent.net> Reviewed by: dougm, jimjag Change mod_status to use scoreboard accessor functions so it can be used in any MPM without having to be recompiled.

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

First commit to introduce accessor function to set r->content_type..

Simplify s/APR_OS_PROC_T_FMT/APR_PID_T_FMT/, apr_os_foo entities aren't for external consumption.

speed up the short_report path... we were unnecessarily walking the scoreboard Submitted by: Stas Bekman

Factor out a bunch of commonality between the HAVE_TIMES path and the !HAVE_TIMES path. This will help avoid future errors similar to the ones fixed earlier today. The code change also has the benefit of getting the paren-matching feature of some editors to work properly.

fix a couple of formatting bugs in the !HAVE_TIMES path (somebody forgot to convert floating point format to long integer format when APR-izing the time)

make mod_status a little faster by checking for an active server sooner in the main loop clean up the main loop by continuing when the server isn't active instead of introducing yet another level of nesting

Update our copyright for this year.

zap some crufty NO_GETTIMEOFDAY code Submitted by: Stas Bekman Reviewed by: Jeff Trawick

fix the calculation of request time in mod_status (currently nobody sets the start/stop times so this fix isn't immediately apparent) Submitted by: Stas Bekman Reviewed by: Jeff Trawick

The style police at work. (Justin took a minor pass at this on top of Sander's patch.) Submitted by: Sander Striker <striker@apache.org> Reviewed by: Justin Erenkrantz

De-tabify...

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.

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.

Stop using HARD_SERVER_LIMIT/HARD_THREAD_LIMIT all over the place and instead use the mpm query function to retrieve those limits and use those dynamically-retrieved values when walking the scoreboard.

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)

fix a *printf() format

Clean up some warnings by summing bytecounts into apr_off_t holders instead of ulongs.

Fix the new method code. We need to cast 1 to an apr_int64_t or it will be treated as a 32-bit integer, and it will wrap after being shifted 32 times. Submitted by: Cody Sherr <csherr@covalent.net> and Ryan Morgan <rmorgan@covalent.net>

don't count workers in processes which aren't actively serving requests. it is necessary to check for the generation as well as "quiescing", in the case of a restart where no workers have seen the PoD yet.

mod_status: don't include workers from dead or quiescing processes in the "requests currently being processed" or "idle" counts also, change term from "servers" to "workers" - servers sounds like what you call the whole thing

More pendantic changes for HTML 3.2/4.01 Transitional compliance, and XHTML 1.0 legibility. One XHTML issue remains, <td nowrap>, which has an issue that "attribute minimization is not supported in XML". Since ?notables drops that thorny issue, I'm ignoring this for now.

Some cast magic for intentional float/int transformations, but I have no idea what exactly this computation was trying to accomplish... req_time = (long)(((ws_record.stop_time - ws_record.start_time) * 1000) + ((ws_record.stop_time - ws_record.start_time) / 1000));

scratch an old itch - give lingering close its own state in the scoreboard. clean up SERVER_ACCEPTING and SERVER_QUEUEING (never set) while I'm at it.

fix pid numbers in mod_status output when using a threaded mpm. pid_buffer was being indexed by worker slot during initialization, then by process slot when generating output. This saves a little storage and a few cycles, too.

handle the SERVER_IDLE_KILL state in some of the ExtendedStatus=On output I don't have 100% confidence in my guess as to why some of the state labels are in bold and some aren't (e.g., "<b>Write</b>" vs. "Graceful". Hopefully any rhyme or reason to it is maintained with my change.

a worker being cleaned up is not processing a request; filter out such workers when counting the number of requests being processed we won't count such workers as idle either, since they aren't available to process new requests

Make first phase changes to the scoreboard data structures in preparation for the rewriting of the scoreboard per my posted design notes. [Paul J. Reder]

minor scoreboard/status improvements: . get the SS field in extended status output formatted correctly (seconds since beginning of request shouldn't be a huge negative number :) ) . use APR_OS_PID_T_FMT and pid_t where appropriate in mod_status to avoid casting, some of which may have been broken on some architectures

Get rid of some Apache 1.x OPTIMIZE_TIMEOUTS cruft. Other logic in 1.3 which used this stuff would send SIGALRM to children in certain circumstances.

Changes required to make prefork clean up idle children properly. There was a window during which a starting worker deadlocks when an idle cleanup arrives before it completes init. Apache then keeps trying to cleanup the same deadlocked worker forever (until higher pids come along, but it still will never reduce below the deadlocked pid). Thus the number of children would not reduce to the correct idle level.

Fix a problem displaying status when a threaded MPM is used. The line int indx = (i * HARD_THREAD_LIMIT) + j; in the vicinity of the change was bad; k needed to be added instead of j. I swapped the use of j and k in this section so that i and j had the same meaning as in an earlier nested loop. I suspect that the difference in meaning is what led to the bug.

Goodbye ap_send_http_header

Performance: apr_now() was being called for -all- requests. Call it only for calls to server-status. This module is still a mess...

Update copyright to 2001

Add an apr_short_interval_time. This allows us to use an apr_interval_time for apr_time_t - apr_time_t values.

Fix the seg fault in mod_status.c. This changes the up_time to an interval_time. The segfault is caused by apr_vformatter not understanding %lld, so we also had to change that to %qd, which solves that problem.

Remove some warnings from mod_status.

PR: Obtained from: Submitted by: Get req/sec and bytes/sec status reporting working. Still lots of type warnings but this is a bit better than before.

more module build cleanup, removing warnings and some link errors (from when apr_ ctype macros weren't available)

get _SC_CLK_TCK defined on Tru64 (and probably some other systems as well); it works without it on systems which define HZ or don't have times

renaming various functions for consistency sake see: http://apr.apache.org/~dougm/apr_rename.pl PR: Obtained from: Submitted by: Reviewed by:

More mod_status work... Get Current Time, Restart Time and Server uptime displaying properly.

Begin restructuring scoreboard code to enable adding back in the ability to use IPC other than shared memory. Get mod_status working on Windows again. Still to do: Rename some of the function APIs. Replace all calls to reinit_scoreboard with ap_create_scoreboard. Add back in support for scoreboard files.

Should consider APRizing the entire module. For now, use HAVE_TIMES to indicate if we have the necessary structures. This is part of getting mod_status working on Windows

Bring mod_status for 2.0 back in line with mod_status for 1.3. This is basically a straight port of the 1.3 module to 2.0. The MPMs need to be modified a bit to work with mod_status, but prefork, mpmt_pthread, and dexter have already been changed. I will fix perchild tonight. There is a lot of common code that can be abstracted, and there seems to be a small bug with regard to what mpmt_pthread and dexter report as current connections. ExtendedStatus does work again, although until the bug mentioned above is fixed, it isn't as useful on mpmt_pthread and dexter. Next week, I will look at allowing other modules to add data to the STATUS page and possibly to the scoreboard itself.

Eliminate a gp fault on mpm_winnt since we don't have a scoreboard table.

The big change. This is part 3 of the apr-util symbols rename, please see the first commit of srclib/apr-util/include (cvs apr-util/include) for the quick glance at symbols changed.

Provide apr_pool_t arg to register_hooks, since anything they do in that step -must- be done with a pool that will not outlive the cmd pool, from which they may have been dynamically loaded.

adjust remaining modules to use the new handler hook method (Alan Edwards) bring back the old handler prototype by reusing r->handler (dougm) PR: Obtained from: Submitted by: Reviewed by:

Renamed all MODULE_EXPORT symbols to AP_MODULE_DECLARE and all symbols for CORE_EXPORT to AP_CORE_DECLARE (namespace protecting the wrapper) and retitled API_EXPORT as AP_DECLARE and APR_EXPORT as APR_DECLARE. All _VAR_ flavors changes to _DATA to be absolutely clear. Thank you Greg, for the most obvious suggestion.

prefix libapr functions and types with apr_

PR: Obtained from: Submitted by: Reviewed by: Reverse out all _EXPORT_VAR changes back to their original _VAR_EXPORT names for linkage (API_, CORE_, and MODULE_).

This patch corrects the issues from the AP_EXPORT and linkage specification arguments to the ap_hooks.h declarations. As with the APR_ and AP_ patches, API_VAR_EXPORT becomes API_EXPORT_VAR, and MODULE_VAR_EXPORT becomes MODULE_EXPORT_VAR. I will be happy to revert the inclusion of ap_config.h from httpd.h if this bothers anyone. More individual modules need to be patched if we do so. The API_EXPORTs all moved into central storage in the ap_config.h header. Without WIN32 or API_STATIC compile time declarations, these macros remain no-ops. This patch also moves the following data from http_main to http_config: const char *ap_server_argv0; const char *ap_server_root; ap_array_header_t *ap_server_pre_read_config; ap_array_header_t *ap_server_post_read_config; ap_array_header_t *ap_server_config_defines; And the following variables had already moved into ap_hooks.c: ap_pool_t *g_pHookPool; (initialized now in http_config) int g_bDebugHooks; (out of http_config) const char *g_szCurrentHookName; (out of http_config) The changes to http_main.c are in preparation for that module to move out to a seperate .exe for win32. Other platforms will be unaffected, outside of these changes.

Update to Apache Software License version 1.1

Fix all the License issues. Including: s/Apache Group/Apache Software Foundation/ s/1999/2000/ s/Sascha's license/ASF license

This is a huge change to the configure system. Basically, this name space protects most, if not all, of the Apache macros. This has been tested on Linux using all of the Unix MPM's. The biggest push was that Apache's httpd.h header file can no longer include the ap_config.h file. Most of the other files include this themselves now. Submitted by: Ryan Bloom and Manoj Kasichainula

time overhaul: - ap_time_t is a 64-bit scalar, microseconds since epoch - ap_exploded_time_t corresponds to struct tm with a few extras probably broken on anything except linux.

A few more tweaks to finish the modules work. Now, all of the modules compile correctly with Apache 2.0. This does run, but it hasn't been tested any more than simply compiling and running the server.

Fix a bug in mod_status. ap_ht_time expects an ap_time_t type, instead of a time_t now.

Add a connection status table to replace the old function of the scoreboard. It allows MPMs to implement their own mechanism for the status table and allows any module to add its own per-connection status entries.

Changed pools to contexts. Tested with prefork and pthread mpm's. I'll check this out tomorrow and make sure everything was checked in correctly.

Changes to mod_status so that the two new states for threads are recognized and reported properly. Submitted by: Ryan Bloom

Apache 1.3.9 baseline for the Apache 2.0 repository. Obtained from: Apache 1.3.9 (minus unused files), tag APACHE_1_3_9 Submitted by: Apache Group