add attribute nonnull to a few functions

The Pidfile directive and ap_log_pid()/ap_remove_pid()/ap_read_pid() now respect DefaultRuntimeDir

Fix compiler warning Submitted by: Daniel Shahaf <danielsh elego de>

Add AP_HAVE_C99 to make correct check for C99 less onerous Using __STDC_VERSION__ without checking if it is defined causes warnings on C89.

Rename ap_func_attr_* macros to AP_FN_ATTR_* Add macro for attribute alloc_size on newer gcc's

Added apreq to NetWare build.

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

Add wrappers for malloc, calloc, realloc that check for out of memory situations. Use them in most places where malloc, and friends are used. This results in clean error messages in an out of memory situation instead of segfaulting or silently malfunctioning. In some places, it just allows to remove some logging code. PR 51568, PR 51569, PR 51571.

Avoid "`sentinel' attribute directive ignored" warning with gcc 3.x

Start of ap_hooks.h setup

some non-MPM code wants to see DEFAULT_PIDLOG, so liberate the setting from the MPM-specific mpm_default.h now visible again via httpd -V

enable DEFAULT_REL_RUNTIMEDIR on NetWare and Windows this commit is missing the Windows and NetWare build logic to copy the appropriate file to include/ap_config_layout.h

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

remove TPF support

When dtrace support is not present, compile it all the way out.

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>

include/ap_config.h: Include the autoconf generated header that defines what is available. configure.in: The times function is not really available on mingw32. Disable em.

update license header text

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

* include/ap_config.h: Fix the macro name.

* include/ap_config.h: Define AP_HAVE_DESIGNATED_INITIALIZER for GCC (but not G++) or any compiler which claims C99 support. * configure.in: Don't define AP_HAVE_DESIGNATED_INITIALIZER here.

Doxygen fixup / cleanup submited by: Neale Ranns neale ranns.org reviewed by: Ian Holsman

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

*) SECURITY: CAN-2004-0174 (cve.mitre.org) Fix starvation issue on listening sockets where a short-lived connection on a rarely-accessed listening socket will cause a child to hold the accept mutex and block out new connections until another connection arrives on that rarely-accessed listening socket. With Apache 2.x there is no performance concern about enabling the logic for platforms which don't need it, so it is enabled everywhere except for Win32. [Jeff Trawick] (already in 2.0.49, propagating to mirrors now)

fix name of The Apache Software Foundation

fix copyright dates according to the first check in

apply Apache License, Version 2.0

update license to 2004.

tidy up some charset recoding issues the "need" for APACHE_XLATE went away some years ago when BUFF went POOF and charset recoding (translation) of non-protocol data could no longer be performed by the core...

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

tweak a comment for readability

Remove hardcoded paths from MPMs and move them to a more central place. Expand paths in httpd-std.conf in a similar fashion as we do in our headers. Submitted by: Pier Fumagalli <pier@betaversion.org>

Update our copyright for this year.

Added NetWare to a Win32 #ifdef

Proper doc style

Documentation updates.

Updating docs to change around the order of extern and AP[RU]_DECLARE_DATA. If this is incorrect, please yell. However, the vast majority of the code follows the convention documented in this patch. If this is in error, I will gladly back it out.

More cleanup.

AP_ function for optional hooks.

Ahhh... the missing file from Ben's and my experiments

Check in not-quite-working hooks groupings.

clean out some old crud from ap_config.h

Remove the rest of the pthreads functions from the threaded MPM

Update copyright to 2001

*) clean out some old crap from ap_config.h; other simplifications; don't include stuff randomly (let users include them explicitly) *) toss ap_config_path.h -- we can put those values into ap_config_auto.h

More docco cleanup.

Improve documentation.

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.

Remove AP_USE_MMAP_FILES, it doesn't really control anything anymore. Now we just use APR_HAS_MMAP directly, just like APR-util does.

Switch to the APR-provided APR_CHARSET_EBCDIC feature test macro.

Force all Apache functions to be linked into the executable, whether they are used or not. This uses the same mechanism that is used for APR and APR-util. This may not be the correct solution, but it works, and that is what I really care about. This also renames CHARSET_EBCDIC to AP_CHARSET_EBCDIC. This is for namespace correctness, but it also makes the exports script a bit easier.

This solves two issues, one is a backref from apr-util into the apache namespace, and the second is the proper linkage declarations and their explanations. Documented the distinction between AP_IMPLEMENT_HOOK_ and AP_IMPLEMENT_EXPORT_HOOK_ This doesn't resolve any export issues within apr-util, however.

Namespace protect the rest of the macros defined by ap_config.h

Make things a little clearer in reaction to the _snames snafus. Submitted by: Greg Stein Reviewed by: William Rowe

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.

I hope this clarifies. Greg is absolutely correct, there is no need for any modules symbol other than AP_MODULE_DECLARE_DATA, since module .h files containing imports and exports imply something more sophisticated, as the early mod_dav.c example illustrated.

Parallels the commit to apr.h.in/apr.hw for the apache core library. Only mod_dav/mod_dav_fs and ap_hooks.h (as best examples) will use these symbols until it is acceptable to all or the new symbols are backed out. This symbol rename will have the unique quality that strlen("API_EXPORT") == strlen("AP_DECLARE"), therefore the mass symbol rename will not throw off function continuation lines.

This much, at least, we don't need to debate.

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:

Remove all of the ap_is* functions from Apache. They were already in APR, and we all hate duplicate code. :-) This also required adding ap_isascii to APR.

Move the checks for bcopy and memmove down to APR. APR now defines memmove and bzero on platforms that do not natively support them.

Remove select checks from Apache config. These checks were used to define ap_select in ap_config.h. The only file that used ap_select() was prefork.c. I have modified prefork.c to use select instead of ap_select. In the future, this should be modified to use ap_poll like the rest of the Unix MPMs. There are other MPMs that are continuing to use select, but this too should change in time.

Repair C++ compatibility in ap_config.h, apr_file_io.h, apr_network_io.h, and apr_thread_proc.h. Submitted by: Tyler J. Brooks <tylerjbrooks@home.com>

Remove the check for EAGAIN. With APR handling the error codes, this is no longer an issue that Apache needs to deal with.

Clean up a big chunk of ap_config.h. This basically stops ap_config.h from including any files. Because of this change, other files must include their own headers. I also cleaned up a couple of other bugs in some modules because I had to compile them all. I expect this to break multiple platforms, but this will be fixed over time. The massive configure cleanup is almost done. I will go through the files one more time after this commit.

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.

Cleanup more of the Apache configuration. This removes all of the shared memory checks, because Apache relies completely on APR for shared memory support. In doing this, we also need to know how APR/MM are providing our shared memory (ie file or memory) that requires the change made to APR's configure script that was just committed.

Get FreeBSD building again with the resource limiting changes (FreeBSD 3.4, at least). rlim_t is defined in <sys/types.h>, so we usually need that. Some stuff in <sys/resource.h> needs <sys/time.h> for timeval just to be able to compile :(

Fix the check for rlim_t correctly. I wish I had known that we had created an rlim_t check in acinclude.m4. :-) Submitted by: Jeff Trawick

ARGH! resource.h lives in sys. Submitted by: Doug M.

Include a definition of rlim_t if the platform doesn't have it natively.

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

Keep the MSVC++-isms out of the Unix flavor of API_EXPORT().

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.

Fix problem where the Unix mpms had an unitialized variable for child exit status by adding an exit status parameter to ap_wait_all_procs(); with this change, the mpms use ap_wait_all_procs() more like they previously used waitpid(). With the introduction of the exit status parameter, the definition of ap_wait_t was moved from Apache to APR. There was some handling of union wait for the type of the exit status parameter to waitpid() which I retained (but cannot test). For WIN32, ap_wait_t was defined as int (in apr.hw). No current Windows code uses ap_wait_t, but a type is required so that references to ap_wait_t in apr_thread_proc.h can compile on Windows. Note: There is still a storage leak in the way that the Unix mpms call ap_wait_all_procs()... this will be resolved at some later time.

Cleanup ap_config.h fallout for Win32. Only a few very minor changes to ap_config.h and util.c, but they might hurt someone... please watch those two carefully.

fix up the repository with the correct add/remove sequence. this is the initial checkin of ap_config.h: it is a copy of ap_ac_config.h which has now been deleted. go there for proper history.

All this file does is include another file. I am fixing this by removing this file and replacing it with the file it includes.

First crack at getting Apache to build with pcre in Win32. Cleans up all the gen_ projects to strip off garbage files, as well, and follows the same pattern for dftables.

stop relying on a macro to map signal() to ap_signal(); call ap_signal() directly

Update to Apache Software License version 1.1

Bring forward my recent 1.3 patches.

Test for AP_USE_HSREGEX, not USE_HSREGEX, as that's what actually gets defined (in ap_config_auto.h) when using the bundled hsregex.

Eliminate implicit usage of access.conf and srm.conf.

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

Submitted by: Sascha Schumann <sascha@schumann.cx> Reviewed by: Rasmus Lerdorf - INADDR_NONE is not defined. Supply a replacement - APACHE_MODULE() used a non-portable shell construct - inet_addr() needs -lnsl -lsocket. Neccessary checks added - For POSIX conformance, _POSIX_PTHREAD_SEMANTICS is required. This fixes i.e. sigwait() problems.

Disable the DYLD_CANT_UNLOAD workaround for Mac OS X Server, since the current version (and the patched older version) doesn't need this any more. We don't want to delete the code from unix/os.c, however, because OpenStep's dyld needs it.

Eliminate ap_config.h's checks when using autoconf. Now, ap_ac_config.h is used instead, and autoconf's configure script will check for everything else.

Deal with times() properly in autoconf. This also changes NO_TIMES to !HAVE_TIMES.

The first part of the big autoconf patch. This replaces a bunch of NEED_* macros with HAVE_* macros to be more consistent with autoconf.

A bit of WIN32 header file cleanup

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

The closesocket define causes problems on BeOS. Get rid of it where appropriate. Submitted by: In part by David Reid <abb37@dial.pipex.com>

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.

A bunch of changes to get the server compiling on WIN32. mod_cgi, mod_include, mod_isapi and mod_so don't work so I am not making them. Moved a lot of code out of multithread.* and into os.* (didn't want to add multithread to the new repository). Much of this can be cleaned up when APR is stable. And Dean's gonna but me for sure for the http_main hit. It's may be possible to name a DLL entry point 'main()'. Just havent tried it yet. Enjoy!

Add prototype for ap_select on OS/2 Submitted by: Brian Havard

More MPM changes. Remove NO_OTHER_CHILD defines. Submitted by: Dean Gaudet

Special Support for User-Space Threading Environments Submitted by: Ralf S. Engelschall

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