Revert style changes

Style

Strip useless apr_brigade_cleanup() calls.

Further clarify the naming of the entity that directly connects to us by calling that entity a client instead of a peer.

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.

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

Introduce new function ap_get_conn_socket() to access the socket of a connection

Introduce ap_(get|set)_core_module_config() functions/macros and use them everywhere. We know that the core module has module_index 0. Therefore we can save some pointer operations in ap_get_module_config(cv, &core_module) and ap_set_module_config(cv, &core_module, val). As these are called rather often, this may actually have some (small) measurable effect.

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

* modules/echo/mod_echo.c (process_echo_connection): Use _cleanup rather than _destroy to clear a brigade which is to be re-used.

Remove all references to CORE_PRIVATE.

Two sane reasons to wrap up, timeup, or eof. Quiet down both results from the error log.

Enhance mod_echo with an illustration of using the scoreboard for a connection based protocol, and clean up the event loop and diagnostic messages.

* Fix precedence problem. PR: 40658 Submitted by: Larry Cipriani <lvc lucent.com> Reviewed by: rpluem

update license header text

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

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

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

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

* modules/echo/mod_echo.c (process_echo_connection): Fix brigade handling: don't re-use a passed brigade.

fix name of The Apache Software Foundation

fix copyright date according to the first check in

apply Apache License, Version 2.0

update license to 2004.

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

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.

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)

Fix a handful of AP_MODULE_DECLARE_DATA exports for .so modules.

Remove a warning from mod_echo. Submitted by: Ian Holsman <ianh@cnet.com>

Make mod_echo use filters for all communication with clients. Submitted by: Ryan Morgan <rmorgan@covalent.net>

Update copyright to 2001

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.

Remove a couple more NULL handler specifications.

This sets an example for this type of module, so let's make sure it uses our own guidelines.

Get mod_echo to stop using BUFF. Submitted by: David Reid

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.

Mod_echo was using raw args instead of a flag to enable and disable itself. I believe this is what was causing the module to not be able to be enabled and disabled on a per-server basis. This patch makes it use a flag

prefix libapr functions and types with apr_

Use the new command-handler initializer macros in a few more modules, cleaning up the resulting warnings.

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.

add AP_ prefix to *HOOK* macros

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

Jeff's couple of small corrections. Submitted by: Jeff Trawick <trawick@ibm.net>

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

Remove some nuisance warnings by changing int to ap_ssize_t. Also add a default MPM_METHOD for BeOS.

ap_bwrite now exports an errnoless interface.

Change ap_bread's interface to no longer require errno.

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.

Fix formatting.

Child initializer hook.

Auth checker hook

Access checker hook.

Another hook.

Another hook.

Another hook (I won't be upset if someone else wants to do some!).

- get rid of pre_command_line_hook ... use register_hooks for this purpose - get rid of optreset... screw -D, use environment variables ONE_PROCESS, SHOW_HOOKS, DUMP_VHOSTS, ... at least it builds this way :)

Allow for new hooks.

Support for echo protocol, to show how multiprotocol support works.