Since we expect many users to start experimenting with the next release,
and the 'Apache' default server name definately conflicts with a stable
1.3.20 install, changed the AP_DEFAULT_SERVICE_NAME to "Apache2" (unless
the user overrides in the compilation.)
Don't retrieve the default service name if the -k run arg is given.
-k run represents running 'in a console', and is the default if no
-k option is given at all.
Perhaps we want to assume -k start as the default (meaning a console
user in the future would have to explicitly ask for -k run if they
want to test as a console) now that services are far more stable.
That can be debated as a seperate patch.
Ok, I didn't like the choices I made an hour or two ago. Here are (IMHO)
the most appropriate log levels (feel free to debate.) OTOH, this patch
fixes the problem with an apache -k start -n foo command simply exiting,
when foo isn't installed.
The purpose of this patch is to toggle the debugging mode (default) to
Program Database (from Program Database for Modify on the fly debugging).
The net effect of this patch is to clean up all of the irrelevant entries
associated with either the debugging or release command line switches, and
generally straighten the projects as they would be exported from VC6/SP5.
The outcome of this patch is that VC5 users -should- be able to load and
build the workspace without any errors (as they used to have no symbols
database at all, the /ZI option doesn't work, they had to use cvtdsp.pl
to toggle these to /Zi.)
Undo a very bad decision. By naming the version file .ver, I lost track
of it setting aside the generated resources. This assures that file won't
fall through the cracks when we generate zip files.
Jeff Trawick [Thu, 16 Aug 2001 21:11:30 +0000 (21:11 +0000)]
check for timeout on socket read when we check for ECONNRESET and eof
previously, we'd die on an assert() (really nasty for threaded MPM) when
we hit a keepalive timeout for a browser like netscape which keeps the
connection open
Push back CHANGES to document the complete mod_mime segfault solution.
Rounded out the mod_mime Add/Remove pairs by adding RemoveLanguage
and RemoveCharset directives, and rolled in the remove_items handling.
This is (effectively) my complete patch, sans pool optimizations.
[William Rowe]
Build on Greg's fix for the hash copy, and always copy the exinfo elements
as well. This should sufficiently demonstrate in benchmarking why we either
must optimize, or revert to tables.
Fix the 'never disappearing' popup menu - anchor it to our (hidden)
global window, which allows TrackPopupMenu to lose focus when any other
window is selected.
Jeff Trawick [Thu, 16 Aug 2001 18:07:06 +0000 (18:07 +0000)]
the 2nd parm to strstr() doesn't lose const-ness, unlike the 1st parm;
thus, AP_DEBUG flavor of strstr() should declare 2nd parm as const char *,
not char *;
Bug fix to the WM_TIMER that was not properly called after it was moved
to WndProc. (The message is WM_TIMER and wParam is timer event)
Enhancement to left button click which now displays the popup menu with
all Apache's installed, and to each installed service adds the submenu
with the options to start, stop or restart the service.
Jeff Trawick [Thu, 16 Aug 2001 13:59:14 +0000 (13:59 +0000)]
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
Now that it's apr'ized, ab is most definately in a 2.0 revision cycle,
and definately needs to track the Apache revision (especially because of
apr and apr-util!)
Picky versioning. Must have 1) a real language/charset in the versioning,
and 2) fixes the Copyright (which effectively runs on too far) by placing
the 'see other' stuff in the Comments.
Doug MacEachern [Thu, 16 Aug 2001 03:58:16 +0000 (03:58 +0000)]
enable ssl Translate, UserCheck, Access and Auth hooks
add support for renegotiation during the Access hook
this requires hooking into the read and write SSL BIOs in order to
flush data to the client and read from the filter chain
this also requires that the ssl filters become "aware" that
renegotitation is in progress so that the BIOs are left alone for
SSL_renegotiate/SSL_do_handshake in ssl_hook_Access to deal with
Ken Coar [Thu, 16 Aug 2001 01:46:50 +0000 (01:46 +0000)]
Add CookieDomain directive to allow setting of the Domain=
cookie attribute; add CookieStyle to allow specification of
cookie syntax: Netscape (default), Cookie or RFC2109, or
Cookie2 or RFC2965. We have historically supported only the
obsolete Netscape syntax.
PR: several against 1.3
Obtained from: brought forward from 1.3
Jeff Trawick [Wed, 15 Aug 2001 14:06:27 +0000 (14:06 +0000)]
Tweak server/Makefile so that the rules for generating exports.c
are compatible with make utilities which don't expand wildcards
in a dependency list (e.g., OS/390 make, certain levels of GNU
make).
> 1. Cleaned the ApacheMonitor code a little bit.
> 2. Removed two icons apmall.ico and apsrvmon.ico
> 3. Added option to recognize the Apache*.exe (e.g. Apache-1.3.20.exe)
> 4. Removed AboutBox
> 5. Changed refresh time to 2/20 sec.
Submitted by: Mladen Turk <mladen.turk@mail.inet.hr>
Doug MacEachern [Tue, 14 Aug 2001 17:03:03 +0000 (17:03 +0000)]
need to check return value of ssl_hook_process_connection
if != APR_SUCCESS the ssl connection has been shutdown
(for example client cert was revoked)
PR:
Obtained from:
Submitted by:
Reviewed by:
Joshua Slive [Mon, 13 Aug 2001 20:23:21 +0000 (20:23 +0000)]
Lots of small config file changes including:
- Beat everything down to less than 80 character lines.
- Revise the comments for the DSO section to eliminate mention
of ordering problems.
- Add LoadModule lines for all extension modules, commented out.
Note that it is very difficult in the current ./configure
system to make the base modules DSOs, so I didn't include those.
- Remove ServerType comments.
- Add "deny from all" to the root directory container. The comments
indicate that it should be there.
- Delete a little (in my opinion) excess verbosity in the
description of the .htacess download blocker.
- Remove the CacheNegotiatedDocs directive. It was wrong,
and is obscure enough that people should probably just look
it up in the docs.
- Make the example for Redirect a little more explicit
- Change the examples and descriptions for READMENAME/HEADERNAME
since, if multiviews are off, they haven't worked as described
since 1.3.something.
- Remove the phf trap example. This is very old and probably
worthless.
Jeff Trawick [Mon, 13 Aug 2001 18:24:53 +0000 (18:24 +0000)]
change the name of AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES to
be more consistent with similar names added recently; this
also cleans up an #if/#ifdef discrepency
Jeff Trawick [Mon, 13 Aug 2001 16:42:13 +0000 (16:42 +0000)]
(hopefully) get WinNT MPM to build using mpm_common.c code; a few notes:
. the selection of ap_sock_disable() is certainly ugly, but that may
need to be cleaned up in a different manner...
. the directive functions couldn't be AP_DECLARE() if they are to be
compatible with AP_INIT_TAKExxx(); this is an old restriction
Ryan Bloom [Mon, 13 Aug 2001 04:57:35 +0000 (04:57 +0000)]
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. :-)
Ryan Bloom [Mon, 13 Aug 2001 04:25:43 +0000 (04:25 +0000)]
Close a major resource leak. Everytime we had issued a
graceful restart, we leaked a socket descriptor.
The listening sockets should not be set inheritable, at least
not at this point. We only want some of the httpd children to
inherit the socket. Namely, those that will be actually serving
requests. Any other child process (piped logs), should not be
inheriting the sockets.