core, modules: like r1657897 but for core and other modules than mod_proxy. More uses of ap_map_http_request_error() and AP_FILTER_ERROR so that we never return an HTTP error status from a handler if some filter generated a response already. That is, from a handler, either ap_get_brigade() (an input filter) returned AP_FILTER_ERROR and we must forward it to ap_die(), or ap_pass_brigade() (an output filter) failed with any status and we must return AP_FILTER_ERROR in any case for ap_die() to determine whether a response is needed or not.

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

Add lots of unique tags to error log messages

Downgrade error log messages which accompany a 404 request status from loglevel error to info. List thread at http://mail-archives.apache.org/mod_mbox/httpd-dev/201110.mbox/%3Calpine.DEB.2.00.1110041948280.664@eru.sfritsch.de%3E PR: 35768

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.

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

Intel's compiler warns about assigning the non-enum value 0 to the enumeration apr_finfo_t.filetype, which is done when forgetting the previously-derived file type use the appropriate enum value APR_NOFILE instead Also change comparisons of the field with 0 to use APR_NOFILE instead, as is the practice of some existing code.

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

update license header text

* 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

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

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.

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.

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

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

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.

Update our copyright for this year.

Finish the switch to huge file support

Support huge files from mod_asis

Short of removing the headers filter, this is the best asis can do. Note that all body replies were entirely broken (thanks for helping me notice this, Greg :) Asis still needs patching for huge files.

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>

Replace ap_send_fd invocation with bucket brigade calls. Send an eos down the chain and let the brigade close the file descriptor when the network i/o is done.

Cliff's most sane advise :-)

Same fix for largefile support as core.c

Changes to respect the new apr bucket and brigade length types (either apr_size_t for bucket lengths, or apr_off_t for aggregate brigade lengths.)

Goodbye ap_send_http_header

Begin to move functions from the http module to the core. The goal is to have only functions that are HTTP specific in the http directory.

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:

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.

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:

Make handlers use hooks.

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_

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.

Reimplement ap_send_fd. Eliminate ap_send_fd_length. If APR_HAS_SENDFILE is defined but ap_sendfile fails with APR_ENOTIMPL, the BUFF implementation of ap_send_fd will get a shot at serving the request. This fix is required to get Apache working on 95/98 again and can also be useful on Unix systems where sendfile is available via a servicepack/fixpack/PTF on a particular level of the OS (e.g., AIX 4.3.2 base does not include sendfile but is is available with a PTF). This fix also reimplements the mod_file_cache sendfile_handler using ap_send_fd and sets the connection aborted flag if the sendfile fails. Future modification... Add code to ap_send_fd to hijack any data in the client BUFF structure and send it along with the sendfile.

blast the old names for the status codes

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.

Make the server work without asking for buffered file I/O. This removes all APR_BUFFERED flags from the server, and it fixes a minor bug in the ungetchar patch (I forgot a file when comitting).

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.

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

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

Initialize all ap_file_t's to NULL. This allows ap_open and ap_stat to work together without causing memory leaks.

Fix mod_asis handler name. This was messed up with Ryans accidental search/replace of "-i" -> " ap_context_t " and the subsequent fix was slightly out.

Eliminate use of FILE * & ap_get_os_file() in mod_asis by APRizing ap_scan_script_header_err().

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!

I missed one function when swapping paramters. This fixes it. I think I have caught them all this time. I really hope this is the final time I have to swap parameters.

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.

Bring file_io up to the new parameter order for APR. I have decided to do these on a directory by directory basis for the rest of APR. I hope to cause fewer problems for other developers by doing it this way.

Use new parameter orders.

First patch to re-order function parameters. This one gets the low hanging fruit, and moves most of the result parameters to the first argument. Future patches in this series will move the rest of the result parameters to the beginning of the list, and will move the context's to the end of the list

Remove all of the calls to functions like "ap_popenf". These functions were moved down to APR, but they are being removed. They are not portable, and were only moved down for backwards compatability. With this change, they can be safely removed, which is the next commit on it's way. Submitted by: Ryan Bloom and Paul Reder

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.

Start to implement module-defined hooks that are a) fast and b) typesafe. Replace pre_connection module call with a register_hook call and implement pre_connection as a hook. The intent is that these hooks will be extended to allow Apache to be multi-protocol, and also to allow the calling order to be specified on a per-hook/per-module basis. [Ben Laurie] Port a bunch of modules to the new module structure. ["Michael H. Voase" <mvoase@midcoast.com.au>] Submitted by: Ben Laurie

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