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.

s/equivalant/equivalent/ in comments

Code clean up (remove useless memory allocation) Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr> PR: 52648

definAtely

Add lots of unique tags to error log messages

Fix apr_status_t being passed as loglevel

Remove more log message prefixes that are now redundant as the the error log format includes the module name.

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

Add more (trace) logging to the ap_scan_script_header*() functions Add ap_scan_script_header*_ex() functions that take a module index for logging. Make mod_cgi, mod_cgid, mod_proxy_fcgi, mod_proxy_scgi, mod_isapi use the new functions.

Fix a few warnings about use of uninitialized values.

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

Prevent future developers from being as easily confused; prefix the registered callback function names with regfnXxx.

revert r918671; these four functions don't need to be addressible except via the function pointers in the EXTENSION_CONTROL_BLOCK

follow up to r918665: These particular functions can't be static because they're part of ISAPI, so use a different mechanism to quiet the gcc warnings.

fix these warnings: mod_isapi.c:488: warning: no previous prototype for ‘GetServerVariable’ mod_isapi.c:590: warning: no previous prototype for ‘ReadClient’ mod_isapi.c:807: warning: no previous prototype for ‘WriteClient’ mod_isapi.c:863: warning: no previous prototype for ‘ServerSupportFunction’ mod_isapi.c:1407: warning: no previous prototype for ‘isapi_handler’

SECURITY: CVE-2010-0425 (cve.mitre.org) mod_isapi: Do not unload an isapi .dll module until the request processing is completed, avoiding orphaned callback pointers. Submitted by: Brett Gervasoni <brettg senseofsecurity.com>, trawick Reviewed by: trawick, wrowe

Correctly evaluate the HTTPS condition string. PR: 40573 Submitted by: Matt Eaton <asf divinehawk.com>

Where any response is sent, return OK from the handler. Where there is no response (but a status code) return the code. This patch adds a great number of debugging emits for failed ap_pass_brigade calls, to help diagnose failure cases, and disambiguates OK from APR_SUCCESS. PR: 40470 Submitted by: wrowe, Matt Eaton <asf divinehawk.com>

Revert a regression introduced in the recent overhauls of mod_isapi. PR 40470 points out that we no longer handle ate == headlen, where there is a headers-only response from the isapi app to the server. This patch restores the previous behavior of pending those headers until some amount of body response is ready to be sent to the client.

update license header text

Solve 416291, but in a more elegant manner, and with a little more attention to clearing the subreq and determining that an r->filename existed.

Stop appending a backslash if some trailing slash is present. For cross platform isapi we aught to find out what to add from apr, slash or backslash, but can't think of the trivial answer at this hour. PR: 15993

mod_isapi: Handle "HTTP/1.1 200 OK" style status lines correctly, the token parser worked while the resulting length was misinterpreted. We were also off by one in apr_cpystrn which demands room for the trailing null be counted. PR: 29098 Submitted by: Brock Bland <bbland serena.com>

We need to pay alot more attention here to ap_pass_brigade. PR 30022

mod_isapi: Ensure we walk through all the methods the developer may have employed to report their HTTP status result code. PR: 16637, 30033 Submitted by: Matt Lewandowsky <matt iamcode.net> Reviewed by: William Rowe

* server/core.c (default_handler): Use apr_brigade_insert_file() to append the file to the brigade. * server/protocol.c (ap_send_fd), modules/proxy/mod_proxy_http.c (spool_reqbody_cl), modules/cache/mod_mem_cache.c (recall_body), modules/cache/mod_disk_cache.c (recall_body), modules/mappers/mod_negotiation.c (handle_map_file), modules/generators/mod_asis.c (asis_handler), modules/dav/fs/repos.c [DEBUG_GET_HANDLER] (dav_fs_deliver), modules/arch/win32/mod_isapi.c (ServerSupportFunction): Likewise.

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

Eliminate last win32-isms, SetLastError becomes apr's set_os_error operation. It unfolds the error code on win32, so we have to pre-fold it. On unix there is no folding.

Escape from casting purgatory, which the Solaris cc compiler will not treat as lvalues.

Unsure why win32 never noticed this, but the value returned is a const char*

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.

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

mod_isapi: GetServerVariable returned improperly terminated header fields given "ALL_HTTP" or "ALL_RAW". PR: 20656 Submitted by: Jesse Pelton <jsp pkc.com> Reviewed by: Jeff Trawick

mod_isapi: send_response_header() failed to copy status string's last character. PR: 20619 Submitted by: Jesse Pelton <jsp pkc.com> Reviewed by: Jeff Trawick

mod_isapi: GetServerVariable("ALL_RAW") returned the wrong buffer size. PR: 20617 Submitted by: Jesse Pelton <jsp pkc.com> Reviewed by: Jeff Trawick

fix name of The Apache Software Foundation

fix copyright dates according to the first checkin

apply Apache License, Version 2.0

update license to 2004.

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

Confirmed by Milan Kosina that this code was still broken - I realized we weren't updating stat correctly, and shouldn't have been trying to pass the status, but the headers instead, from WriteClient(). This way we can actually count the bytes consumed and begin treating the rest as body contents.

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

Allow headers (if not already passed by other means) to be sent via WriteFile() since the foxisapi and other thunks seem to indicate that headers within the WriteFile() operation are expected to succeed. Also assure that all ->completion callbacks get the original size of the document.

Fix several cut 'n paste errors identified by Juergen Heckel.

Stop unsetting the 'empty' query string result with a NULL argument in ecb->lpszQueryString, eliminating segfaults for some ISAPI modules. PR: 14399 Submitted by: Detlev Vendt <detlev.vendt@brillit.de>

mod_isapi: Fix an issue where HSE_REQ_DONE_WITH_SESSION notification is received before the HttpExtensionProc() returns HSE_STATUS_PENDING. [John DeSetto <jdesetto@radiantsystems.com>, William Rowe] PR: 11918

Fix for PR 10216 ... we should not return the status unless we want the core to ap_die for us. If we've handled the response (as determined by a new response_sent flag) then the server does not need to do so.

The documentation says: ISAPIReadAheadBuffer defaults to 49152 bytes, which is exactly 48 kb. But the module actually uses a default of 48192 bytes. This seems to be a typo. Instead of changing the documentation I attached a patch for mod_isapi.c to set the default value of ISAPIReadAheadBuffer to 49152. Submitted by: Astrid Ke�ler <kess@kess-net.de>

A half hour to waste waiting for builds... this is what you get. mod_isapi will build and run on OSX... presume others as well unless I choose some awful errno values for portability. PR: Obtained from: Submitted by: Reviewed by:

Change conn_rec->keepalive to an enumerated value of AP_CONN_UNKNOWN AP_CONN_CLOSE AP_CONN_KEEPALIVE This also fixes a problem where ap_discard_request_body would not discard the body when keepalive was 0. This actually meant the keepalive status was unknown *not* closed, but no one ever remembered that. This problem was seen with mod_dav sending error responses (as reported by Karl Fogel). Suggested by: Greg "this isn't the '80s" Stein Reviewed by: Greg Ames

Use lowercased macros

Use the new APR_TIME_FROM_SEC() wrapper

Feedback appreciated - I'm guessing that we can trust the isapi app opened file handles correctly for the TransmitFile case.

Solve a bug identified by Sebastian that we would always reaquire the lock immediately instead of stalling for the isapi module's thread to complete its work. This requires the new changes to thread_mutex that introduce a guarenteed APR_THREAD_MUTEX_UNNESTED flag. Reported by: Sebastian Hantsch <Sebastian.Hantsch@t-online.de>

Bug one of two, INIT_FLAG better pair with set_flag_slot. Submitted by: Sebastian Hantsch <Sebastian.Hantsch@t-online.de>

Clean up isapi_load, removing the request_rec arg [which we never need], and using the given server and request rather than deref'ing r->server [which segfaulted ISAPILoadModule in the 1.73 rev.] Reported by: Sebastian Hantsch

Renames: APR_XtOffset -> APR_OFFSET APR_XtOffsetOf -> APR_OFFSETOF

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

Short of final troubleshooting and diagnostics, this patch introduces Async support via the ISAPIFakeAsync directive [default - still off.]

Fixes to; * accept HTTP/1.1 ### Status results [another bogus convolution.] * accept status+headers in status or headers [alone]. * fix I/O completion (correct the order of args.) * fix a number of bugs and behavior flukes in TransmitFile. * fix bug #8740 [truncated output due to bad status return]

Fix GetServerVariable() to return the buffer consumed, including the terminating NULL. Bug: 8934

Replace our Event HANDLE with an apr_thread_mutex_t, and add completion logic to WriteClient/TransmitFile.

One last commit for tonight I'd postponed ... take variable names within mod_isapi out of Eastern Europe. Hungarian now applies to ISAPI and MS defined fields of structures, only.

Now for the major refactoring. Introduce mod_isapi.h, as we have had untold problems with compatibility between different Visual Studio and PlatformSDK users [based on their generation of the MS ISAPI header.] This header is coded from scratch in native APR types. Replace the apr_array_t with an apr_hash_t, mutex protected, to allow us to preload and late-load isapi modules. This closes a significant bug with trafficed sites using uncached isapi modules, where one would be closing the module just as another request is opening it [as if for the first time.] This would cause some ISAPI modules to crash. Now that we load modules for the lifetime of the server, a simple graceful restart is all that's required to unload all the non-precached modules. Crack out all FAKE_ASYNC code while we complete it. Total support for the Completion Context callback and end-of-request termination is required before we can toggle this on. My next commit; complete fake async support. But this was all I'd had in me for one night.

Part 3 of the ISAPI overhaul. Reframe the 'server conf' into 'dir conf' options, creating one single cache of loaded modules [heck, that's what it was before.] This allows finer grained control of specific modules that must be 'configured' around to deal with their peculiarities. This actually saves much code when we can use global config accessors. Grant the module cache it's own pool, and straighen up some other nits. No other substantial changes in this pass.

Part two; nearly inconsequential - Made the log message prefix ISAPI: (rather than ISAPI with no trailing colon) and normalized some variables and static fn names to 'apache names' rather than MSisms.

Part one of a several-fold overhaul to isapi. This part simply normalizes the module to the usual order of config-cmds/helpers/ handlers/setup.

After review and testing against all of the PSDK examples (see http://www.apache.org/~wrowe/ for commentary on building the examples and making them work) ... this disable-optimization should no longer be required.

AcceptPathInfo was totally backwards... it would reject when set to on and by default and accept when set to off for the default handler, and would reject only if set to accept for mod_cgi(d) and mod_isapi. PR: 8234

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.

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.

Style touchup

Another potential ap_server_root_relative failure.

Update our copyright for this year.

Fix a handful of AP_MODULE_DECLARE_DATA exports for .so modules.

Add the ability to pass flags to both apr_file_open and apr_mktemp. The reason for this, is that it is very possible to want a temp file that isn't deleted when the file is closed. It also makes sense to have the flags in the apr_file_t if possible.

Apply the converse of the AcceptPathInfo patch for isapi's/cgi's. The default behavior remains, accept PATH_INFO, but it may be expressly revoked with AcceptPathInfo Off

Resolved segfault in mod_isapi when configuring with ISAPICacheFile. PR: 8563, 8919

change so that it doesn't rely on the structure of the apr_table's elt internal structure

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)

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

There is no errno using apr. A quick grep reveals a dozen or so files with serious errno problems, particularly in mod_dav :(

We already extract e for subprocess_env, and set SECURE_SERVER_PORT for real.

ap_server_root_relative will take care of this canonical_file call.

fix some homophonic issues in comments, as well as some mispelings found near "its" or "it's" (helping our 4th grader with homework, couldn't help but grep)

Flush the off_t compiler emits from mod_isapi

Some odd XXX fixups that are closed (or unneeded)

*) 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.]

We don't want these operations to end the stream, simply flush out the contents. It's up to any downstream filters to collect c-l or other stats when the handler has exited.

Interesting, ISAPI thinks a 0 result is cool. Already patched in 1.3.20. [Jessie Oberreuter <joberreu@moselle.com>]

Damnable casts Submitted by: Jessie Oberreuter <jessieo@westside.com>

Hmmm... missed one. There has to be a better home for this.

Fix Windows compile breaks caused by mod_core.h foobar

Update copyright to 2001

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

Use the appropriate APR_FINFO_flags for the apr_stat/lstat/getfileinfo calls to avoid ownership and permissions on Win32 when they are not required, and until they are implemented.

The changes required for the APR_FINFO_wanted argument to apr_stat/lstat/getfileinfo. These are -NOT- optimal, they are simply the required changes to get the server working. The size of the patch is a warning about how we need to really look at what we are trying to accomplish with all of these stat/lstat calls.

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.

Some missing exports

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:

Fix uninitialized badness

add the "next filter" parameter to the rest of the ap_sub_req_* calls.

Disable two features, with warnings, if a relatively Win32 SDK headers are not available (e.g. stock distribution of MSVC 5.0). Submitted by: Jeff Trawick Reviewed by: Will Rowe

Change to buckets for isapi output. Still requires emulation of IO Completion/Async behavior, but a non-async REQ_HSE_TRANSMIT_FILE is now implemented.

Movin on over from 1.3.13-dev : this patch fixes the problem of nasty popup windows alerting an Admin that the isapi isn't working, and simplifies mod_isapi by relying on dso.

Roll forward fixes identified for 1.3.13-dev. Note... this module still needs more control over async emulation, etc. Submitted by: Jesse Pelton [jsp@PKC.com]

Here it is, the Win32 part of the big canonical errors patch. The reason is really, really simple. If we ever choose to mix clib and dos error codes, they criss-cross and don't line up, but they share the same number space. As I wrote the new APR_IS_ERROR macros, I realized we were about to shoot ourselves in the foot. These changes nearly entirely affect Win32 only. The next big patch will affect all of the rv == APR_ENOENT type problems throughout the system. PR: Obtained from: Submitted by: Reviewed by:

Ok... I've been waiting to find out what happens when we commit to two trees at once. To that end, this is the caching and rather stable 2.0 mod_isapi, with the docs brought over from 1.3 and freshened a bit.

Whoops... that there was a handle I left hanging (and growing).

_not_ up to 100%, but some structural changes to make the rest easier. PR: Obtained from: Submitted by: Reviewed by:

Just Typos. PR: Obtained from: Submitted by: Reviewed by:

Forward port 1.3 overhaul of isapi to 2.0. Yes - it's blatently obvious that this should be 'bucketized', but the sequence I will follow is: *) compatibility of sources *) extension to async + transmitfile emulated support *) localization of ISAPI* directives to Directory, File blocks *) addition of ISAPI caching *) recode for buckets. I'm actually looking forward to the mod_cgi bucketization as a model. PR: Obtained from: Submitted by: Reviewed by:

Get mod_isapi.c to compile with the level of Win32 headers which ship with VC++ 5.0.

Fix win32 compile break.

Remaining cleanup of ap_ -> apr_ and AP_ -> APR_ transformation... see src/lib/apr/apr_compat.h for most details. Also a few minor nits to get Win32 to build. PR: Obtained from: Submitted by: Reviewed by:

prefix libapr functions and types with apr_

Another day's progress... little changes, but just establishing the baseline for fully implementing extensions. Filters... that's still a little way away. This demonstrates the HSE_STATUS_PENDING result wait event trap, so we let another thread keep working till we get the HSE_REQ_DONE_WITH_SESSION request. Cleaned up callback names and tossed bunches of stuff in the isapi_cid (connection/request) and the isapi_loaded (dll details) for future caching optimizations. PR: Obtained from: Submitted by: Reviewed by:

Undo the damage to mod_isapi (leave placeholders for new functions though) and add APR_EOL_STR to log files (precomiled, of course :) PR: Obtained from: Submitted by: Reviewed by:

Missing apr_strings.h - hope this wasn't destined for some global header. PR: Obtained from: Submitted by: Reviewed by:

blast the old names for the status codes

Fix Win32 compile break caused by Ryan's stat cleanup.

back out APR_ prefix for TRUE,FALSE

prefix TRUE,FALSE with APR_

Replace ERROR constant with TODO_ERROR to flag these for review. ERROR is a Windows.h constant of 0, or success, and is unrelated to the error codes!

Win32: First cut at getting mod_isapi working under 2.0 Submitted by: William Rowe

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

Remove most of the annoying "re ap_context_t mplement" mis-replacements by what I think is their real meaning. Guys, I didn't verify all of this, please have a close look at my "fixes". Thanks.

Fix faulty comparison. MSVC TRUE == 1 while Borland TRUE == -1 PR: 4333, 4887 Submitted by: Sergey Verlan

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.

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