core: Cleanup the request soon/even if some output filter fails to handle the EOR bucket.

ap_die(): follow up to r1657881. Use log level DEBUG for AP_FILTER_ERROR => HTTP_INTERNAL_SERVER_ERROR.

http: Make ap_die() robust against any HTTP error code and not modify response status (finally logged) when nothing is to be done.

*) SECURITY: CVE-2013-5704 (cve.mitre.org) core: HTTP trailers could be used to replace HTTP headers late during request processing, potentially undoing or otherwise confusing modules that examined or modified request headers earlier. Adds "MergeTrailers" directive to restore legacy behavior. Submitted By: Edward Lu, Yann Ylavic, Joe Orton, Eric Covener Committed By: covener

also copy r->invoke_mtx when creating a subrequest

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

Further clarify the naming of the entity that originates the request by calling that entity a useragent instead of a client.

Add lots of unique tags to error log messages

Introduce a per connection "peer_ip" and a per request "client_ip" to distinguish between the raw IP address of the connection and the effective IP address of the request.

Introduce a per request version of the remote IP address, which can be optionally modified by a module when the effective IP of the client is not the same as the real IP of the client (such as a load balancer).

Downgrade some more error messages about broken client behavior to level info.

Remove MPM-private stuff from conn_state_t

Fix 3xx responses with local URLs as ErrorDocument

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

fix some grammar mistakes, mostly in comments

PR50349: Honor 'AcceptPathInfo OFF' during internal redirects, such as per-directory mod_rewrite substitutions. This would be left floating around in the request_rec with a pcalloc'ed value, so the core fixup hook thought some module had overridden it.

More trace logging

* modules/http/http_request.c (internal_internal_redirect): For a subrequest, preserve any filters in the output filter chain which were not specific to the subrequest across the redirect (where f->r does not point to the subreq's request_rec). PR: 17629

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

Add ap_process_request_after_handler to the exported list for mod_serf

Because the redirect-request survives logging, we don't have the same exposure as subrequests, and this change would have doubled the headers. Revert this bit of the headers_in 'consistification' Noted by rpluem.

Correctly align the behavior of headers_in to be consistent with the treatment of headers_out, resolving PR 48359 by keeping subrequest scope changes out of the main request headers. This ensures that all requests-without-bodies behave as the requests-with-bodies code has. Mitre: CVE-2010-0434

We shouldn't need to create r->allowed_methods twice!

Preserve port over internal redirection PR#35999 A four-year-old buglet!

only call mutex functions if APR_HAS_THREADS

Hopefully the final fix for the subreq/filter issue. The prob was that we at this point could still have some stale and incorrect refs when we adjusted the f-stack. So move the update earlier so when we adjust, we're affecting r. RŸdiger and Jim pretty much simultaneously :)

reset chain if we need to...

* Correctly remove the SUBREQ_CORE filter from the filter chain if we do an internal fast redirect and if the new redirected request is NO subrequest. This fixes at least one of the possible subtle issues mentioned in the comment to r620133.

Import the core parts of the DTrace patch. This is a modified and updated version of what was submited by Theo before: <http://mail-archives.apache.org/mod_mbox/httpd-dev/200805.mbox/%3C6AFBCFE8-4CCA-4A02-8A43-F9170689695D@omniti.com%3E> Note, this does not hook it up into the build system at this time, because the original patch was a little too creative there. Submitted By: Theo Schlossnagle <jesus omniti.com>

* Avoid sending no answer at all if a custom error page causes an AP_FILTER_ERROR.

* modules/http/http_request.c (ap_process_async_request): Fix warning: 'return' with a value, in function returning void

Introduce Suspendable Requests to the Event MPM. Using this basic framework, you can return SUSPENDED from an HTTP Handler, and then register a callback that is invoked by the MPM at a later time. This initial version only supports _timers_ as callbacks, but in the future I would like to add things like wait for socket activity, on a socket specified by the handler. Once in a callback, It is then the responsibility of the callback fucntion to finish the HTTP Request handling, but this alows you to do cool things like a fully async proxy, COMET support, or even rate limiting. To prove I'm not insane, I've inlcuded an example module, mod_dialup. You can configure it like this: <Location "/docs"> ModemStandard "V.32" </Location> And for static files inside that path, you will be rate limited to V.32 speeds, aka 9.6 kilobits/second. Does anyone besides Rüdiger read commit emails :-) ? I know there are likely huge problems with this, but I would like to see how far we can push the Event MPM, figure out what to do better, if there is anything, and then really dive into the 3.0 development before ApacheCon. * server/mpm/experimental/event/fdqueue.h: (timer_event_t): New structure to hold timer events and callback functions. * server/mpm/experimental/event/fdqueue.c (ap_queue_empty): Modify to also look at Timer Ring. (ap_queue_init): Initialize Timer Ring. (ap_queue_push_timer): New function, pushes a timer event into the queue. (ap_queue_pop_something): Renamed function, returns a timer event or a socket/pool for a worker thread to run. * server/mpm/experimental/event/event.c (process_socket): If the connection is in SUSPENDED state, don't force it into linger mode yet, the callback will have to take care of that. (push_timer2worker): New shortcut function, pushes timer event into queue for a worker to run. (timer_free_ring): New global data structure to recycle memory used by timer events. (timer_ring): New global data structure to hold active timer events. (g_timer_ring_mtx): Thread mutex to protect timer event data structures. (ap_mpm_register_timed_callback): New Function, registers a callback to be invoked by the MPM at a later time. (listener_thread): Calculate our wakeup time based on the upcoming Event Queue, and after pollset_poll runs, push any Timers that have passed onto worker threads to run. (worker_thread): Call new queue pop method, and if the Timer Event is non-null, invoke the callback. Once the callback is done, push the structure onto the timer_free_ring, to be recycled. (child_main): Initialize new mutex and ring structures. * server/config.c (ap_invoke_handler): Allow SUSPENDED aa valid return code from handlers. * modules/http/http_core.c (ap_process_http_async_connection): Don't close the connection when in SUSPENDED state. * modules/http/http_request.c (ap_process_request_after_handler): New function, body pulled from the old, ap_process_async_request. Split to let handlers invoke this so they don't need to know all of the details of finishing a request. (ap_process_async_request): If the handler returns SUSPENDED, don't do anything but return. * include/ap_mmn.h: Bump MMN. * include/ap_mpm.h (ap_mpm_register_timed_callback): New function. * include/httpd.h: (SUSPENDED): New return code for handlers. (request_rec::invoke_mtx): New mutex to protect callback invokcations from being run before the original handler finishes running. (conn_state_e): Add a suspended state. * include/http_request.h (ap_process_request_after_handler): New function to make it easier for handlers to finish the HTTP Request. * modules/test/config.m4: Add mod_dialup to build. * modules/test/mod_dialup.c: New rate limiting module, requires the Event MPM to work.

Remove all references to CORE_PRIVATE.

- In AP_MODE_SPECULATIVE ap_core_input_filter returns APR_SUCCESS and an empty brigade in the case that a non blocking read from the socket returned APR_EAGAIN. So getting an empty brigade also shows that no data is present in the input filter. While this reduces the number of false positives for "real data" in the input filter the behaviour is not as good as before 533820 because if there are only CRLF's in the input filter we do not flush, but we should. To fix this it seems that a simulation of AP_MODE_EATCRLF is needed inside of check_pipeline. - Destroy brigade bb at the end of the function.

check_pipeline: use AP_MODE_SPECULATIVE to check for data in the input filters to accomodate mod_ssl's input filter. AP_MODE_EATCRLF is essentially a no-op in that filter. this fixes missing imbedded graphics etc when using the Event MPM with mod_ssl with HTTP pipelining enabled in the browser. the pipelined requests after the first were never read from mod_ssl's input filter. it might reduce unneeded flushes with other MPMs.

Follow up to r451287, use APR_STATUS_IS_TIMEUP instead of comparing against APR_TIMEUP directly. * modules/http/http_request.c (ap_process_request): Use APR_STATUS_IS_TIMEUP.

* Notice a timeout as an error message. This might be valuable for detecting clients with broken network connections or possible DoS attacks.

update license header text

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

PR 36090 Fix recursive ErrorDocument handling

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

Allocate the brigade containing the EOR bucket from the connection pool, rather than the request pool, because the core output filter may need to reference the brigade immediately after deleting the EOR bucket (and thus the request pool). This fixes a coredump encountered when running t/TEST on an httpd compiled with "--enable-pool-debug."

Async write completion for Event MPM (backported from async-dev branch to 2.3 trunk)

Redesign of request cleanup and logging to use End-Of-Request bucket (backport from async-dev branch to 2.3 trunk)

* modules/http/http_request.c (ap_allow_methods): add missing va_end call

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

Keep track of time taken to process requests again.

Compile Fix for Netware Port with CodeWarrior. Noticed By: <normw@bocnet.com.au>

The Event MPM. Designed to minimize Apache's KeepAlive overhead. This MPM depends on the current APR-trunk for new features added to the apr_pollset interface. Currently the underlying operating system must support KQueue or EPoll. Status: Should work as a drop in replacement for all non-ssl servers. SSL Requests that use HTTP 1.1 Pipelining do not currently work. Testing: I have tested it with Linux 2.6, FreeBSD 5.2.1, and OS X 10.3. Originally based on the patch by Greg Ames.

* modules/http/http_request.c (ap_internal_redirect): Call quick_handler when we do an internal redirect to allow caching. This allows mod_dir requests to be cached. Reviewed by: Bill Stoddard

fix name of The Apache Software Foundation

fix copyright dates according to the first check in

apply Apache License, Version 2.0

internal_fast_redirect: take over important request_rec members

update license to 2004.

Set the scoreboard state to indicate logging prior to running logging hooks so that server-status will show 'L' for hung loggers instead of 'W'.

Rework of the recursion stopper - collapse recursion counters into one function Reviewed by: Justin Erenkrantz

- revert my patch (r1.155) since it produces regressions. - add a note to STATUS that we don't forget the thing.

Prevent the server from crashing when entering infinite loops. The new LimitInternalRecursion directive configures limits of subsequent internal redirects and nested subrequests, after which the request will be aborted. [William Rowe, Jeff Trawick, Andr� Malo] PR: 19753 (and probably others)

Do not bypass output filters when redirecting subrequests internally. PR: 17629

Keep the subrequest filter in place when a subrequest is redirected. PR: 15423

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

fix weird things that happen with canned error messages due to using two different request_recs after an ErrorDocument internal redirect failure. examples: wrong Content-Type, garbled output from ebcdic servers due to double charset translation

Fix infinite loop when reading certain data due to two HTTP_IN filters being present for internally redirected requests. If HTTP_IN is present, r->proto_input_filters would have it, so adding it twice is wrong. PR: 10146 Reviewed by: Brian Pane

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

ap_die: get rid of bad side effects from the recursive error handling code that mess with the status and which request_rec the rest of the function uses. Submitted by: Justin Erenkrantz, Greg Ames

prevent infinite recursion if an ErrorDocument gets an error Reported by: Colm MacC�rthaigh <colmmacc@Redbrick.DCU.IE>

detabify

Call ap_discard_request_body from ap_finalize_request. Remove the call from all other modules that do not use it to determine the response for the request.

Fix the case where we generate both a 401 and 413 and we go bonkers. - If an error would drop the connection, we do not return the top-level error anymore as we will assume this new one takes precedence over the original error. This also ensures that we will not read the input body (which is the point of returning these special error messages in the first place). - The ap_discard_request_body return value in ap_die() must be checked to make sure we don't encounter this recursive case and print two errors. Kudos to Jeff Trawick for his sample input which pointed this out.

Correctly return 413 when an invalid chunk size is given on input. - If get_chunk_size() returns a negative number, that probably implies an overflow. So, create a 413 error and pass it to the output filters. - Modify ap_discard_request_body() to return OK quickly if we're a subreq or our status code implies that we will be dropping the connection. - Modify ap_die() so that if the new status implies that we will drop the connection, that we correctly indicate that we can not keepalive this connection. (Without this, the error is returned, but the connection is not closed.)

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

Replaced a sprintf("%d") with itoa

If a subreq added a filter (say INCLUDES) and the subreq was promoted via fast_redirect, the filter would still point at the subreq - rather than the original r. So, we must update any filters pointing at rr to be r. This would cause lots of problems with mod_include with mod_dir requests such as seen in PR 7966. mod_include would be unsetting the headers_out of rr instead of r. But, we disassociate rr->headers_out and r->headers_out. Therefore, the C-L header in r->headers_out would remain - even though it bears no relation to what we will be outputting - causing problems. This also now permits chunked-encoding of mod_dir/mod_include requests which could never happen before and fixes the content-length problem seen in PR 7966. As hinted at in PR 7966, there is a race condition - if for some reason the server stalls reading an included file (or even better, placing a sleep in the cgi-bin script!), the invalid C-L may get propogated to the client. (Note that internal_internal_redirect has this same code fragment.) PR: 7966

Fix subreqs with non-defined Content-Types being served improperly. If we do not know a C-T for a subreq, we *must* propogate that non-knowledge upwards to the main request. Previously, if you used a DirectoryIndex with a file without a C-T (say .shtml without AddType), the r->content_type will be kept as httpd/unix-directory when we promoted the subreq in mod_dir. Since there would be no handler on this file, ap_invoke_handler (config.c:355) would set the handler to be httpd/unix-directory (which was the old C-T of the dir). This would then trigger the handler to become httpd/unix-directory. mod_autoindex would then try to serve the request. But, the filename was propogated upwards by mod_dir's DirectoryIndex via internal_fast_redirect - it would then return a 403 trying to generate a mod_autoindex page for a file. Now, we will use ap_default_type() which is correct.

Fix a segfault. Only try to set this if the sub_Request has a c-t.

If we are doing a fast_redirect, and we don't have a main request, then make sure that we don't have the sub_req_output_filter. This was causing problems when there were multiple sub_Requests, and some should have had the filter, but the last one shouldn't. This fixes the final known bug in 2.0.35

Clean up breakage introduced recently that sent the wrong headers through the http_headers output filter. Now we will always point every filter at the 'redirected' request, e.g. the actual error message response rather than the request that failed. Reviewed by: JimJag, Rbb, DougM

This fixes the mod_autoindex problem of not getting the list of files. The problem was that the internal_fast_redirect removed the SUB_REQ filter, but we are still in a sub_request. The solution is to have the fast_internal_Redirect function check if we are in a sub_Request and re-add the filter if we are. Submitted by: Ryan Bloom, Greg Ames, Jeff Trawick, and Will Rowe

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.

Add a new parameter to the quick_handler hook to instruct quick handlers to optionally do a lookup rather than actually serve content. This is the first of several changes required fix several problems with how quick handlers work with subrequests.

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

Update our copyright for this year.

Move the quick_handler comment to the new quick handler location. Do not 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.

Remove a comment that no longer applies. Submitted by: Greg Stein

Remove another hack from the server. The add_required_filters function was required to make sure that the sub request had the correct filters when we went send the error page. With the new filter insertion logic, this is no longer necessary.

Just formatting cleanup, nothing interesting here, move along :)

Fix the mod_dir/mod_negotiation bug, where redirects and sub requests were not getting the correct filters. This is done by creating a location in the request rec that holds protocol level filters. Protocol level filters survive for one request, from the time the request is received from the user to the time the response is sent. r->output_filters now stores the request level filters, which are only valid for the lifetime of one request_rec. This patch works, but it is not complete. The second half of the problem is that add_any_filter doesn't check where it puts the filters that it adds, so it is possible for filters to be put on this wrong list, and for filters to be lost completely during request processing. That half of the fix will be coming in the next day or so. Submitted by: Will Rowe, Justin Erenkrantz, Ryan Bloom

Change ap_get_brigade prototype to remove *readbytes in favor of readbytes. If you need the length, you should be using apr_brigade_length. This is much more consistent. Of all the places that call ap_get_brigade, only one (ap_http_filter) needs the length. This makes it now possible to pass constants down without assigning them to a temporary variable first. Also: - Change proxy_ftp to use EXHAUSTIVE mode (didn't catch its -1 before) - Fix buglet in mod_ssl that would cause it to return too much data in some circumstances

Input filtering prototype change: Socket blocking type should be separate from the input filter mode type. We also no longer look at readbytes to determine the method of filter operation. This makes the use of filters more obvious and allows a wider range of options for input filters modes. To start with, the new input filter modes are: AP_MODE_READBYTES (no more than *readbytes returned) AP_MODE_GETLINE (old *readbytes == 0 case) AP_MODE_EATCRLF (old AP_MODE_PEEK) AP_MODE_SPECULATIVE (will be used in a future ap_getline rewrite) AP_MODE_EXHAUSTIVE (old *readbytes == -1 case) AP_MODE_INIT (special case for NNTP over SSL) The block parameter is an apr_read_type_e: APR_BLOCK_READ, APR_NONBLOCK_READ This also allows cleanup of mod_ssl's handling in the getline case. Reviewed by: Ryan Bloom (concept), Greg Stein (concept)

quick handler now runs on subrequests as well PR: Obtained from: Submitted by: Reviewed by:

A style change for ken :)

Ensure we include path_info in ap_internal_fast_redirect() for multiview mapping. This isn't the end of these bugs, only one puzzle piece.

Fix a bug which would cause the response headers to be omitted when sending a negotiated ErrorDocument because the required filters were attached to the wrong request_rec. Submitted by: John Sterling <sterling@covalent.net> Reviewed by: Justin Erenkrantz, Cliff Woolley

This section of tabs in the middle of space-only bugs me. Reformat this section.

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

make sure that the HTTP_IN filter is in place across internal redirects. Without this, we see an extra socket read + timeout on POSTs. If the client sends in another request, we loop consuming memory.

Goodbye r->content_lanaguage (per vote from apache-1.3/STATUS).

Currently, when the map-to-storage handler for TRACE returns DONE, the caller -- ap_process_request_internal() -- catches that and returns OK to its caller -- ap_process_request(). But ap_process_request(), seeing OK, tries to run a handler. It needs to skip that if the request was completed in ap_process_request_internal(). Reviewed by: William A. Rowe, Jr.

This patch eliminates the wasteful run-time conversion of method names from strings to numbers in places where the methods are known at compile time. (Justin fixed the va_end() call to be correct.) Submitted by: Brian Pane <bpane@pacbell.net> Reviewed by: Justin Erenkrantz

Now that stinks, sorry. In moving code - I didn't notice my code now served out (r) info instead of the (rnew) info. Made for nasty cyclic loops in mod_dir :( It looks like this works once again. I'll post completed deltas to the list ASAP.

Much better - sorry - I missed one case of forcing pipeline flush when the handler returned a non-OK result. ergo, 304's weren't sent.

After calling ap_process_request_internal(), the caller must invoke the handler themselves.

Normalize all paths to run the same, common code for pre-request setup from the primary request, redirects and sub-requests. This will significantly reduce opporunities for inconsistancy (such as Ian observed, and as I repaired only a month ago.) This promotes process_request_internal to an ap_ namespace protected entity in server/request.c (from it's old home in http/http_request.c) since this fn has no http specifics. Reviewed (in concept): Cliff Woolley, Ian Holsman

Introduce the map_to_storage hook, which allows modules to bypass the directory_walk and file_walk for non-file requests. TRACE shortcut moved to http_protocol.c as APR_HOOK_MIDDLE, and the directory_walk/file_walk happen as APR_HOOK_VERY_LAST in core.c. A seperate patch to mod_proxy is required to short circuit both the TRACE and directory_walk/file_walk stuff. That patch is next.

Downgrade must occur before we attempt to TRACE, e.g., for clients with broken chunking.

Two cases we are certain of canonical correctness

Remove all warnings from the input filtering stack.

Remove the ->mtime reset back to negotiation, who decided to do this.

_THIS_ is why mod_dir wouldn't serve the results of mod_negotiation with a query string

The real slim shady finally stood up. This patch segregates the fast internal redirect logic back into http_request, the next patch will actually fix it.

Add a check to ap_die() to make sure the filter stack is sane and contains the correct basic filters when an error occurs. This fixes a problem where headers are not being sent on error. PR: Obtained from: Submitted by: John Sterling Reviewed by:

Move the addition of default AP_HTTP_HTTP_HEADER filters to the insert_filter phase so that other filters are not bypassed by default. PR: Obtained from: Submitted by: Reviewed by:

back out filter change that is preventing headers to be sent PR: Obtained from: Submitted by: john sterling Reviewed by: dougm

Move the addition of default AP_HTTP_HTTP_HEADER filters to the insert_filter phase so that other filters are not bypassed by default. PR: Obtained from: Reviewed by:

fix the type of a parameter to ap_get_brigade()

Back out the recent change to ap_get_brigade, to make it use indirection again. The problem is that the amount of data read from the network, is not necessarily the amount of data returned from the filters. It is possible for input filters to add bytes to the data read from the network. To fix the original bug, I just removed the line from ap_get_client_block that decremented r->remaining, we allow the http_filter to do that for us. I have also removed an incorrect comment.

Fix a bug in the input handling. ap_http_filter() was modifying *readbytes which corresponded to r->remaining (in ap_get_client_block). However, ap_get_client_block was *also* adjusting r->remaining. Net result was that PUT (and probably POST) was broken. (at least on large inputs) To fix it, I simply removed the indirection on "readbytes" for input filters. There is no reason for them to return data (the brigade length is the return length). This also simplifies a number of calls where people needed to do &zero just to pass zero. I also added a number of comments about operations and where things could be improved, or are (semi) broken.

At the hack-athon we decided to change the way that input filters determine how much data is returned to the previous filter. Prior to this change, we used a field in the conn_rec to determine how much to return. After this change, we use an argument to ap_get_brigade. This makes it much more obvious how things work at all levels, so that module authors can easily determine how much data is supposed to be returned to them.

Performance: Add quick_handler hook. This hook is called at the very beginning of the request processing before location_walk, translate_name, etc. This hook is useful for URI keyed content caches like Mike Abbott's Quick Shortcut Cache.

Add a hook, create_request. This hook allows modules to modify a request while it is being created. This hook is called for all request_rec's, main request, sub request, and internal redirect. When this hook is called, the the r->main, r->prev, r->next pointers have been set, so modules can determine what kind of request this is. Currently, this is only used by the core module, but protocol modules are going to need to have the ability to affect the request while it is being read.

This is a fix that went into v1.3 quite a while back, but not into v2.0. It sorts out the problem when a password protected reverse proxy URL sends a Proxy-Authenticate to a browser instead of a WWW-Authenticate. This patch covers the changes to the httpd-2.0 tree. Submitted by: Graham Leggett Reviewed by: Chuck Murcko

Another chunk of code from http to core. This should continue to build on all platforms. The next job is to shuffle functions back and forth so that the server builds without mod_http.

Simplify by using apr_bucket_delete(e) where possible. (Oh, plus one tiny little loop simplification.)

*) Introduce "ap_conf_vector_t" type to assist with legibility and provide some type safety. (unfortunately, our old "void*" is type-safe with the new one, but over time we should be better) *) Propagate the new type to all appropriate functions. *) Random cleaning, whitespace, stylistic nits.

Update copyright to 2001

Clean up some of the includes: - explicitly include apr_lib.h since ap_config.h doesn't - use apr_want.h where possible - use APR_HAVE_ where possible - remove some unneeded includes

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

Fix the remaining APR_FINFO_NORM occurances. Again, followup is needed to actually test any field outside the scope of APR_FINFO_MIN.

This fixes a performance problem with directory indexing on Windows.

Eliminate all assumptions that finfo.protection reflects the existance or absense of a file. finfo.filetype is defined as 0 if APR_NOFILE, or a non-zero value if the file could be apr_stat()'ed.

apr_stat() in http_request.c only needs size, type, mtime, ctime & atime values from the file. Modify apr_stat() under windows to accomodate apr_stat( APR_FINFO_MIN)

Back out a bit of yesterday's patch, since the explicit return handles this correctly.

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.

Cleanup the error bucket code a bit. This uses the error bucket directly instead of using ap_bucket_read. It also lets ap_die handle the fact that the filter returned the error. Submitted by: Greg Stein

filters can now report an HTTP error to the server. This is done by sending a brigade where the first bucket is an error_bucket. This bucket is a simple bucket that stores an HTTP error and a string. Currently the string is not used, but it may be needed to output an error log. The http_header_filter will find this bucket, and output the error text, and then return AP_FILTER_ERROR, which informs the server that the error web page has already been sent.

Begin mod_core.h for CORE-private information. Ideally, AP_CORE_DECLARE function decl's and CORE_PRIVATE header info should all move into this header. Start with moving the filter function declarations.

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.

Stop checking to see if this is a pipelined request if we know for a fact that it isn't. Basically, if r->connection->keepalive == 0. This keeps us from making an extra read call when serving a 1.0 request. Submitted by: Ryan Bloom and Greg Stein

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.

Allow modules to specify the first module for a sub-request. This allows modules to not have to muck with the output_filter after it creates the sub-request. Without this change, modules that create a sub-request have to manually edit the output_filters, and therefore skip the sub-request output_filter. If they skip the sub-request output_filter, then we end up sending multiple EOS buckets to the core_output_filter.

Get Multi-Views working again. It wasn't working because we weren't setting the path_info field correctly if we didn't find the specified file.

A good thing, allow W2K to perform the symlink test.

Killing ap_os_is_filename_valid. Left actual win32 code, since it is moving into apr and the check_safe_file call.

byterange handling simply did not work for internal redirects. (e.g. fetch /foo/ which redirects to /foo/index.html)

Allow the core_output_filter to save data in the filter past the end of the first request if this is a keepalive connection. This allows us to save the end of the first request until we have enough data from the second request to make it worthwhile to send the responses. In order to do this, we need to allocate mmap's from the connection pool instead of the request pool. If we don't use the connection pool, then the mmap is freed before the data is sent, because the mmap is freed at the end of the first request.

Always send the EOS on the correct request. Basically, we call ap_finalize_request_protocol on the main request, then we find the last internally re-directed request, and send the EOS on that request.

Fix internal redirects. They should have their own HTTP_HEADER filter instance, and we need to remove the main-request's HTTP_HEADER.

Sub-requests have to have a value for their request_config structure, or we'll seg-fault. This should set the sub-request's request_config structure to the same exact same structure as the main request is using.

Set the request config in the new r, not the old r.

We have to create the core_request_config structure in the core on internal redirects. If this isn't done, we'll seg-fault during the AP_DEBUG_ASSERT that makes sure getline didn't leave any droppings.

Fix a broken thing

Add a flush bucket type. This bucket advises filters to flush any data they are currently storing. There is no way we can force them to flush, but we can advise. This also adds the code to ap_rflush to use flush buckets, although it isn't enabled yet. I will enable it once we remove buff from the code. I also removed all calls to ap_rflush that are either immediately before or immediately after a call to ap_finalize_protocol. ap_finalize_protocol sends an EOS bucket, which also advises filters to flush their data, so having both calls right next to each other is redundant.

Add a sub-request filter. This filter just strips the EOS from the brigade generated by the sub-request. If this is not done, then the main-request's core_output_filter will get very confused, as will any other filter in the main-request filter-stack that looks for EOS.

Get rid of some old code related to the way that character set translation of protocol data and bodies was performed in the past.

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.

Completes the port of the <Directory /> handling for Win32... there is still a patch needed for OS2 ... Brian?

A 'little' reminder about a 'little' problem. PR: Obtained from: Submitted by: Reviewed by:

The lots of little ones... APR_IS_STATUS_condition(rv) conditional macros replacing the majority of fallible rv == APR_condition tests. But there are lots more to fix, these are the obvious ones that already did proper canonical error conversion.

Add a bit of infrastructure which will be needed for input filtering: 1) separate filter lists hanging off the r and the c requests start off with the same filter list as the connection the input filter list is not initialized for subrequests internal redirects start off with the same filter list as the connection 2) AddInputFilter directive (blatant rip-off of Ryan's AddOutputFilter directive); as with AddOutputFilter, the network is implicitly to the right of the specified filter list; this may not be the most intuitive way to specify the filters; not sure yet

Get rid of much of the old implementation of translating the charset of response bodies. ap_checkconv() is removed, except for in os/bs2000 and os/tpf. (Anything there is questionable for 2.0 anyway.)

The new request_rec set up for redirects needs to pick up the output filter chain from the conn_rec. Any required request filters will be inserted later.

Combine the calls to add the core_filter to one place. Basically, it is safe to add the core_filter during the post_read_request, and it means that we only have to add the filter once in the code. This should make it easier to add an SSL module in the future.

Get internal redirects working by initializing the output_filters list. We start over with only core_filter just like a fresh request. Processing of the new URI will determine what filters (if any) are appropriate.

Change r->filters to r->output_filters. This sets things up for us to put input filters into Apache.

Get rid of some unused variables introduced in recent method work.

Fix another seg fault with allow_methods and sub requests

Fix a seg fault with sub requests. We must allocate space for the sub-requests allowed_methods array before we try to copy into it.

Start introducing the extension-method elements so we're not bound to hard-coded names and a bitmask. We still use the bitmask for known methods, but we also have an array for extension method named. Wherever we used the M_* constants we need to use a routine that knows about the new structure instead. This is far from complete, but AFAIK this interim work doesn't break anything -- especially the compile. The rest of the work will be added in segments; this is just a checkpoint.

Fix charset translation breakage on EBCDIC machines... the core turned on buff's translation by default, but mod_charset_lite (when configured to do so) turned on its own filter-based translation, resulting in gibberish. To be determined... whether or not mod_charset_lite should enable translation of text objects by default (a la 1.3)... probably... for now you have to tell mod_charset_lite to translate.

Initial Filtering code. This uses a bucket brigade scheme to allow modules to add and modify data while processing a request. The docs still need to be updated, and a simple html page needs to be created explaining all of this. The only filter currently in the code is the core filter. This filter takes a bucket brigade and writes it to the network through the buff structure. In time, the buff will go away completely. More filters will need to be written. Submitted by: The Apache Community Reviewed by: The Apache Community

Don't skip any remaining methods just because one was already noted. Submitted by: Joe Orton <joe@orton.demon.co.uk> Reviewed by: Ken Coar

Fix another oversight: don't add an extension method to the Allow list if it's already there.

Add support for arbitrary extension methods for the Allow response header field, and an API routine for modifying the allowed list in a unified manner for both known and extension methods.

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_

Add the ability to register filters. This commit introduces a warning into the build. This warning will be removed automatically, as soon as we decide on a prototype for the function causing the warning. That decision is tied to which filtering mechanism we decide on. Submitted by: Ryan Bloom and Greg Stein

Move all APR functions related to strings to their own directory, and create a new header for those functions. This is the first step to removing the apr/lib directory completely, and moving those files/functions to descriptive directories.

blast the old names for the status codes

http_request.[ch]: *) add the "install_filter" hook as a hook/control point for modules to install their filters. [Ryan Bloom] http_protocol.c: *) move check_first_conn_error() up in the file; no actual changes *) add checked_bputstrs(), checked_bflush(), and checked_bputs(). These are copies of ap_rvputs(), ap_rflush(), and ap_rputs() respectively. The users of the checked_* functions will be independent of filtering changes to the ap_r* functions. *) add flush_filters() place holder

More consification, correct command initialisation.

Remove the final vestiges of stat.h from Apache 2.0. All calls are now to ap_stat. This also adds the new function ap_lstat(). This function is analogous to lstat.

another iteration on the saferead/bhalfduplex stuff ... there was a commented out bhalfduplex call which ryan missed; and which was a bit more troublesome to solve with the iol interface.

Argh, bhalfduplex is implemented, but it doesn't work for this case, so put the TODO back in.

Remove a TODO. Actually just putting back a call to ap_bhalfduplex now that the function exists again.

PR: Obtained from: Submitted by: Reviewed by: Reverse out additional linkage argument from DECLARE_HOOK and IMPLEMENT_HOOK macros.

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.

APACHE_XLATE, CHARSET_EBCDIC stuff: Provide new function ap_set_content_xlate() to simplify what needs to be done to set up translation of content. Use it where appropriate. With this change, EBCDIC logic was tweaked so that ap_checkconv() does not overlay a translation handle previously stored (e.g., by a module) unless it is turning translation off. Unless ap_checkconv() determines that translation is inappropriate, it should leave the translation handle alone.

include translation information in the request_rec; finish converting ap_bsetflag(B_ASCII2EBCDIC or B_EBCDIC2ASCII) to ap_bsetopt(BO_WXLATE or BO_RXLATE)

add AP_ prefix to *HOOK* macros

Use ap_canonical_error() where appropriate.

Change ap_context_t to ap_pool_t. This compiles, runs, and serves pages on Linux, but probably breaks somewhere.

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

Include ap_config.h before httpd.h, this ensures that AP_USE_HSREGEX is defined correctly in all C files.

Quiet some warnings. - 1 'suggest parentheses around assignment used as truth value' - a few "subscript has type `char'"

Finish the commits for the change in the header files. Basically, this hides all of the Apache macros that modules don't need access to. This should have been committed with the modules, but I wasn't paying attention to the directory I was in when I ran the commit. Submitted by: Manoj Kasichainula and Ryan Bloom

Fix some remaining problems with SSI's and Windows. Basically, the sendfile stuff doesn't work properly with chuncked data. Submitted by: Allan Edwards Reviewed by: Ryan Bloom

Rework ap_finfo_t to split the file type out of the protection field. I've taken a stab at the unix implementation but tested only on OS/2.

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.

Fix a minor bug that would cause us to return FORBIDDEN for all requests.

Separate the stat structure from the file structure and use ap_stat and ap_getfileinfo in apache.

First step in getting Apache to use APR's time libraries. This gets a good number of them, but I think there are more time values still in the Apache code. This works under Linux, but has not been tested anywhere else.

Update some dependancies. Move the final two files out of apr/inc and into apr/include. Basically just finish some cleanup from some changes I've been making over the last two days.

Cleanup the ZZZ comments. Basically these used to mark places where APR is needed. It is much easier to do this conversion by hand than by searching for old comments, so they are going away now.

Add a status value to ap_log_error and ap_log_rerror. This allows us to use apr_status codes in our error logs. The main advantage of this, is portable error codes. Now, Windows will finally be able to use errno!