Save a few bytes in conf pool when parsing some directives. Use temp_pool when applicable.

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.

'ap_getword_conf' does not return NULL but an empty string if nothing could be got. So the message 02173 can never trigger. Actually, this is not a problem because all calls to 'ap_unixd_set_rlimit' are done in configuration parsing functions guarded with AP_INIT_TAKE12, so we are guaranteed to have something.

Fix valgrind warning about uninitialized memory in argument to semctl PR: 53690 Submitted by: Mikhail T. <mi+apache aldan algebra com>

Various code cleanup to avoid compiler, cppcheck, or clang warnings: modules/debugging/mod_firehose.c: Make some internal functions static (to do: logs_cleanup() is unused) modules/filters/mod_charset_lite.c: Remove dead assignments modules/filters/mod_include.c: likewise modules/metadata/mod_usertrack.c: likewise modules/proxy/mod_proxy_ftp.c: likewise modules/ssl/ssl_engine_pphrase.c: likewise modules/proxy/mod_proxy_balancer.c: likewise; Remove NULL check that can never happen modules/proxy/proxy_util.c: Axe NULL-check that can never happen and if it would, it would just mask another bug os/unix/unixd.c: likewise modules/http/http_filters.c: Remove sub-condition that is always true modules/lua/mod_lua.c: Add default cases to switch statements modules/generators/mod_autoindex.c: Unsigned value can never be < 0 server/util_expr_eval.c: Fix compiler warnings with VC and on OS2

Add lots of unique tags to error log messages

We already have ap_str_tolower(), so also add ap_str_toupper() function and use it where possible.

fix some logging calls to include the server_rec (and even the conn_rec in a couple of places)

Per the existing comment and setrlimit() behavior -- only prevent attempts to raise the hard limit, not to lower it, by nonroot users.

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

generalize the existing (r589761) platform- and errno-specific logic to suppress an error message if accept() fails after the socket has been marked inactive a message will still be logged, but at debug level instead of error PR: 49058

revert 759711 and 759713... don't require apr2

0600 is UWRITE+UREAD

Use apr-2 object perms setter

remove TPF support

API Cleanup in preperation for 2.4.x, make sure all exported functions or variables contain an ap_ prefix.

Further unixd hacks to remove duplication between old-unixd and mod_unixd, and get it working with old MPMS[1] + mod_unixd. It's still an uneasy split, as some modules (mod_cgid, suexec)[2] also use unixd. More thinking+hacking due. [1] Should be prefork/worker/event, but only worker is tested. [2] cgid is OK, suexec is untested.

Also adjust unixd.c with changes from r709406

Remove all references to CORE_PRIVATE.

Support chroot on unix-family platforms PR 43596 (Dimitar Pashev)

After a stop or restart signal, the old listening sockets are closed. "Some platforms" drop out of the accept() with an EBADF after the sockets have been closed. Such an error should not clutter the logs.

update license header text

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

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.

Move the few BS2000 specific in unixd.c

readd suexec setuid and user check Related to PR: 28287

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

* os/unix/unixd.c (unixd_accept): Eliminate now-redundant call to apr_os_sock_get(); let APR check for accept returning zero on TPF.

fix name of The Apache Software Foundation

fix copyright dates according to the first check in

apply Apache License, Version 2.0

Unix MPMs: Stop dropping connections when the file descriptor is at least FD_SETSIZE. That isn't a problem for most users (since poll() is widespread). On old boxes where select() must be used by APR, APR needs to fail operations that don't work with such fds.

update license to 2004.

fix a compile failure with recent z/OS and picky settings for compiler/ library ("unsigned short" is more portable than "ushort")

one_process is not a global variable

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

Unix: Handle permissions settings for flock-based mutexes in unixd_set_global|proc_mutex_perms(). Allow the functions to be called for any type of mutex. This resolves a fatal problem with mod_rewrite on systems where APR uses flock-based mutex. It simplifies mod_ssl as well, which had special logic to perform the chown(). It fixed an init error with mod_ssl on systems where flock is used when the user had no SSLMutex directive. The Unix MPMs continue to call unixd_set_global|proc_mutex_perms() only for SysV sems. There is no permission problem with flock-based accept mutexes since the child init logic for the MPMs is done prior to switching identity. PR: 20312

Linux 2.4+: enable coredumps when Apache is started as root if CoreDumpDirectory is explicitly coded

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

fix compile breakage with IBM's xlc compiler caused by the attempt to lose const on progname strrchr was not the real library function that takes a const parameter; instead, strrchr was the Apache macro which makes it clear that const will be lost

Fix a long-standing bug in 2.0, CGI scripts were being called with relative paths instead of absolute paths. Apache 1.3 used absolute paths for everything except for SuExec, this brings back that standard.

Fix for suexec execution of CGI scripts from mod_include (including security patch to ensure that <!--#include file="name.cgi"--> is run as the suexec user rather than the httpd user) PR: 7791, 8291 Submitted by: Colm MacCarthaigh <colmmacc@redbrick.dcu.ie> Reviewed by: Brian Pane

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

APR_PROC_MUTEX_IS_GLOBAL is the condition where apr_global_mutex_t and apr_proc_mutex_t are interchangeable

Add unixd_set_global_mutex_perms so we can set permissions on things like SysV Semaphores in the core and modules.

Fix suexec invocations from userdir - the ~ was not being prepended to the uid per our convention. Therefore, bad things would happen (like we wouldn't cd to the right directory). Add a flag to the ap_unix_identity_t structure to indicate if we are in a userdir - if so, prefix the ~. (Modified by Justin, but Colm's patch pointed me in the right direction.) PR: 7810 Submitted by: Colm <colmmacc@redbrick.dcu.ie> Reviewed by: Justin Erenkrantz

Update our copyright for this year.

Removed unixd_set_lock_perms(apr_lock_t *), which is no longer used by any of the MPMs. (This is another step toward eliminating the httpd's dependencies on the old lock API.)

Spelling and grammar janitor coming through. (Clean up the comment so that mortal beings can parse it.)

On HPUX 11.x, the 'ENOBUFS, No buffer space available' error occures because the accept() cannot complete. You will not see ENOBUFS at 10.20 because the kernel hides any occurrence from being returned from user space. ENOBUFS at 11.0 TCP/IP is quite possible, and could occur intermittently. As a work-around, we are going to ingnore ENOBUFS. Submitted by: madhusudan_mathihalli@hp.com Reviewed by: Bill Stoddard

Clear the output socket descriptor in unixd_accept() to make sure we don't supply a bogus socket to the caller if the accept fails. (This was causing problems in the worker MPM, which tried to process the returned socket if it was non-NULL, even if unixd_accept() returned an error.)

change ap_unix_create_privileged_process() to allocate enough space in the newargs array to allow for a null terminator. This allows suexec and mod_cgid to work together reliably. Apparently, rounding up the size to a multiple of 8 bytes in apr_palloc hid the problem sometimes. At other times, suexec would complain about a null command name.

Allow modules that add sockets to the ap_listeners list to define the function that should be used to accept on that socket. Each MPM can define their own function to use for the accept function with the MPM_ACCEPT_FUNC macro. This also abstracts out all of the Unix accept error handling logic, which has become out of synch across Unix MPMs. The code flow is much easier now for different transports: 1) During pre-config, post-config or while parsing the config file, add a socket to the ap_listeners list, making sure to define an accept function at the same time. 2) MPMs find the correct listener, and call the accept function that was defined in step 1. 3) That accept function returns a void pointer, which is passed to the create_connection hook. 4) create_connection adds the correct low-level filters.

Use the APR's new OS-specific proc mutex accessors -- they are used here to set permissions on SysV Semaphores. MPMs will be modified to call this new function as they are ported to the new APR lock API.

This probably falls under the category: if you can't figure it out yourself, you shouldn't be doing it. But we might as well remove obsolete stuff. PR: 4685

The Unix MPMs other than perchild now allow child server processes to use the accept mutex when starting as root and using SysV sems for the accept mutex. Previously, this combination would lead to fatal errors in the child server processes. perchild can't use SysV sems because of security issues. translation: steal apache 1.3 code to call semop(IPC_SET) on the semaphore to set permissions and uid/gid

Begin to sanitize the MPM configuration directives. Now, all MPMs use the same functions for all common MPM directives. This should make it easier to catch all bugs in these directives once. Everybody should check their favorite MPM to ensure that it still compiles, and that these directives work. This is a big patch, and although it looks good, and things compiled for me, that is no garauntee that it will work on all platforms. :-) Submitted by: Cody Sherr <csherr@covalent.net>

httpd.exp and lots of other export files are generated based on the AP[RU]_DECLARE macros. This commit gets mod_cgid working again as a DSO on AIX. However, this brings up the need to look for any functions that are available as part of the API, and AP[RU]_DECLAREing them, so things don't blow up in DSOs.

Update copyright to 2001

toss the signal description stuff from unixd.[ch], beosd.h, and spmt_os2. use the new functionality in APR.

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

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.

Move initgroupgs, ap_uname2id and ap_gname2id from util.c to mpm_common.c. These functions are only valid on some platforms, so they should not be in the main-line code. These functions are also not portable to non-unix platforms, so they don't really belong in APR. Since they are only used in MPMs, for right now, I am moving them to mpm_common.c

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.

Last change to get SuEXEC working again, and respecting configuration changes made using autoconf setup.

*) Compensate for recent changes in the APR headers. Specifically, some files need to specifically include stdio.h, or a particular apr_*.h header. *) Adjust callers of apr_create_process() to deal with the extra "const" *) Add "const" to args of ap_os_create_privileged_process()

Make mod_cgi and mod_include work when compiled as DSO's again. This is accomplished by moving suexec out of it's own file and into unixd.[ch]. The problem was that suexec.c wasn't being linked into the server unless a module was actually using ap_os_create_process. This is still not clean, but it works now.

Add back suexec support.

Add a temporary pool argument to unixd_pre_config, so that it can call APR functions (grumble). This is needed for apr_stat, which will be in the suexec path coming up.

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.

We need to test specifically for setrlimit/getrlimit instead of just the structure or the RLIMIT_* defines. Also, we should make the API function unixd_set_rlimit() ``available'' even if it doesn't do anything. PR: Obtained from: Submitted by: Reviewed by:

prefix libapr functions and types with apr_

Fix some bad ap_log_error() invocations. Comment on a bad ap_log_rerror() invocation. Almost all of this is in code never compiled.

Include strings.h for strcasecmp(), strncasecmp(), and bzero(). Include time.h for time(). This removes a bunch of compiler warnings with gcc -Wall on AIX. Submitted by: Jeff Trawick, Victor Orlikowski

Remove unixd_detach function, because it is provided by APR as ap_detach. This also modifies the ap_detach function to look like unixd_detach. Finally all calls to unixd_detach are changed to ap_detach.

Make unixd_config.user_name const char * instead of char * to avoid a warning when the set-user-name command handler saves the address of the arg from the config file.

More consification, correct command initialisation.

Protect system header files with the appropriate macros.

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 all occurances of strerror from Apache. ap_strerror works just fine with standard errno values, and it is more portable. This also allows me to remove the check for strerror from Apache's configure script.

Fix some bad (1.3 style) parmlists to ap_log_error() which were introduced with the reintroduction of resource limiting logic.

Add the resource limiting code back to Apache 2.0. This only works on Unix because I can't find any other platforms with rlimit. If there are other platforms that need this code, then some of the code needs to move. This has just barely been tested, so it could probably use some good testing.

Increase the default NumSIG value from 32 to 33 on behalf of OS/390. unix_siglist_init() will now blow up via ap_assert() if NumSIG is too low. (This is no fun to debug!)

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.

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

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

Finish the conversion from fprintf(stderr -> ap_log_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!

merge the differences in apache-1.3 from tag mpm-merge-1 up to APACHE_1_3_9 (a.k.a. mpm-merge-2) onto the mpm tree prior to the merge, the mpm tree was tagged with apache-1_3-merge-2-pre, and after the merge, the mpm tree will be tagged with apache-1_3-merge-2-post

Move the ap_sys_siglist code from the Unix MPMs to unixd.[ch]

merge the differences in apache-1.3 from tag apache-apr-merge-3 up to mpm-merge-1 onto the mpm tree prior to the merge, the mpm tree was tagged with apache-1_3-merge-1-pre and after the merge, the mpm tree will be tagged with apache-1_3-merge-1-post note: none of htdocs/manual is present in mpm at this point.

detach, set_group_privs, and such... these will be common amongst the unix MPMs, so split them off into os/unix/unixd.[ch].