cvs commit: apache-1.3/src Configuration.tmpl
dgaudet 98/03/24 18:18:20 Modified:src Configuration.tmpl Log: default WANTHSREGEX has changed Revision ChangesPath 1.90 +1 -1 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- Configuration.tmpl1998/03/17 11:33:41 1.89 +++ Configuration.tmpl1998/03/25 02:18:19 1.90 @@ -150,7 +150,7 @@ # excellent regex package is included with Apache and can be used # if desired. If your OS has a decent regex, you can elect to # not use this one by setting WANTHSREGEX to 'no' or commenting -# out the Rule. The default action is no unless overruled +# out the Rule. The default action is yes unless overruled # by OS specifics Rule WANTHSREGEX=default
cvs commit: apache-1.3/src/modules/proxy proxy_connect.c
dgaudet 98/03/24 18:57:29
Modified:src CHANGES
src/main buff.c http_main.c http_protocol.c
src/modules/proxy proxy_connect.c
Log:
Protect against various FD_SETSIZE restrictions. Note that I couldn't
really test this well -- because libc5 linux systems just don't let you
muck with FD_SETSIZE easily. Folks on BSD systems should be able to
-DFD_SETSIZE=16 or 20 and produce lots of interesting failures.
Clean up make_sock error messages a bit.
Revision ChangesPath
1.730 +2 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.729
retrieving revision 1.730
diff -u -r1.729 -r1.730
--- CHANGES 1998/03/23 07:42:10 1.729
+++ CHANGES 1998/03/25 02:57:19 1.730
@@ -1,5 +1,7 @@
Changes with Apache 1.3b6
+ *) Protect against FD_SETSIZE mismatches. [Dean Gaudet]
+
*) Make the shared object compilation command more portable by avoiding
the direct combination of `-c' `-o' which is not honored by some
compilers like UnixWare's cc. [Ralf S. Engelschall]
1.66 +1 -0 apache-1.3/src/main/buff.c
Index: buff.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/buff.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- buff.c1998/02/23 00:05:37 1.65
+++ buff.c1998/03/25 02:57:22 1.66
@@ -529,6 +529,7 @@
#endif
+/* note we assume the caller has ensured that fb-fd_in = FD_SETSIZE */
API_EXPORT(void) bhalfduplex(BUFF *fb)
{
int rv;
1.310 +54 -19apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- http_main.c 1998/03/21 02:06:05 1.309
+++ http_main.c 1998/03/25 02:57:23 1.310
@@ -2567,12 +2567,19 @@
{
int s;
int one = 1;
+char addr[512];
+
+if (server-sin_addr.s_addr != htonl(INADDR_ANY))
+ ap_snprintf(addr, sizeof(addr), address %s port %d,
+ inet_ntoa(server-sin_addr), ntohs(server-sin_port));
+else
+ ap_snprintf(addr, sizeof(addr), port %d, ntohs(server-sin_port));
/* note that because we're about to slack we don't use psocket */
block_alarms();
if ((s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) {
aplog_error(APLOG_MARK, APLOG_CRIT, server_conf,
- socket: Failed to get a socket, exiting child);
+ make_sock: failed to get a socket for %s, addr);
unblock_alarms();
exit(1);
}
@@ -2595,7 +2602,6 @@
s = ap_slack(s, AP_SLACK_HIGH);
note_cleanups_for_socket(p, s); /* arrange to close on exec or restart
*/
-unblock_alarms();
#endif
#ifndef MPE
@@ -2603,8 +2609,10 @@
#ifndef _OSD_POSIX
if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *) one, sizeof(int))
0) {
aplog_error(APLOG_MARK, APLOG_CRIT, server_conf,
- setsockopt: (SO_REUSEADDR));
- exit(1);
+ make_sock: for %s, setsockopt: (SO_REUSEADDR), addr);
+ close(s);
+ unblock_alarms();
+ return -1;
}
#endif /*_OSD_POSIX*/
one = 1;
@@ -2612,8 +2620,10 @@
/* BeOS does not support SO_KEEPALIVE */
if (setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, (char *) one, sizeof(int))
0) {
aplog_error(APLOG_MARK, APLOG_CRIT, server_conf,
- setsockopt: (SO_KEEPALIVE));
- exit(1);
+ make_sock: for %s, setsockopt: (SO_KEEPALIVE), addr);
+ close(s);
+ unblock_alarms();
+ return -1;
}
#endif
#endif
@@ -2645,7 +2655,8 @@
if (setsockopt(s, SOL_SOCKET, SO_SNDBUF,
(char *) server_conf-send_buffer_size, sizeof(int)) 0) {
aplog_error(APLOG_MARK, APLOG_WARNING, server_conf,
- setsockopt: (SO_SNDBUF): Failed to set SendBufferSize,
using default);
+ make_sock: failed to set SendBufferSize for %s,
+ using default, addr);
/* not a fatal error */
}
}
@@ -2657,17 +2668,14 @@
GETPRIVMODE();
#endif
if (bind(s, (struct sockaddr *) server, sizeof(struct sockaddr_in)) ==
-1) {
- perror(bind);
+ aplog_error(APLOG_MARK, APLOG_CRIT, server_conf,
+ make_sock: could not bind to %s, addr);
#ifdef MPE
if (ntohs(server-sin_port) 1024)
GETUSERMODE();
#endif
- if (server-sin_addr.s_addr != htonl(INADDR_ANY))
- fprintf(stderr, httpd:
cvs commit: apache-site bug_report.html
marc98/03/24 21:05:14 Modified:.bug_report.html Log: Let's shout even louder at people about submitting bug reports. Revision ChangesPath 1.9 +9 -3 apache-site/bug_report.html Index: bug_report.html === RCS file: /export/home/cvs/apache-site/bug_report.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bug_report.html 1997/11/08 23:29:59 1.8 +++ bug_report.html 1998/03/25 05:05:13 1.9 @@ -16,8 +16,8 @@ PWelcome to the Apache Bug Reporting Page! If you are having trouble with Apache, please fill out a problem report form and submit it. -Before you do that, though, make bsure/b you have done ball/b -of the following:/P +Before you do that, though, FONT COLOR=redmake bsure/b you have +done ball/b of the following:/FONT/P OL LIVerified that the bug exists in A href=mirrors/the most recent version/A @@ -33,7 +33,9 @@ codeMakefile/code. LITried compiling with only the distributed set of modules and with no other patches (so that we can make sure it's an Apache bug and -not a bug in a module or patch provided by someone else). +not a bug in a module or patch provided by someone else). It is +frustrating to take time and effort to track down a problem only +to figure out it caused by a broken third party module. LIChecked the A HREF=docs/misc/FAQ.htmlFAQ/A. LISearched the A HREF=http://www.apache.org/bugdb.cgi;bug report/A database. When you are doing this, you should be sure to search @@ -56,6 +58,10 @@ and you will help keep developer time free for improving Apache. Most bug reports submitted are actually user configuration problems that could be easily fixed by asking in the newsgroup. + + PFONT COLOR=redDo Bnot/B post to Usenet and submit a bug + report at the same time./FONT This wastes everyone's time. + Post to Usenet and wait a few days. /STRONG /BLOCKQUOTE
cvs commit: apache-1.3/htdocs/manual/mod mod_rewrite.html
rse 98/03/25 00:03:49
Modified:htdocs/manual/mod mod_rewrite.html
Log:
- more RegEx hints, especially to the Friedl-book
- update of the directive blocks to be directive-dict.html compliant
Revision ChangesPath
1.29 +202 -33 apache-1.3/htdocs/manual/mod/mod_rewrite.html
Index: mod_rewrite.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_rewrite.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mod_rewrite.html 1998/03/20 11:11:03 1.28
+++ mod_rewrite.html 1998/03/25 08:03:48 1.29
@@ -297,9 +297,25 @@
A
HREF=directive-dict.html#Context
REL=Help
-STRONGContext:/STRONG/A server config, virtual host, per-directory
configBR
-P
+STRONGContext:/STRONG/A server config, virtual host, directory,
.htaccessBR
+A
+ HREF=directive-dict.html#Override
+ REL=Help
+STRONGOverride:/STRONG/A FileInfoBR
+A
+ HREF=directive-dict.html#Status
+ REL=Help
+STRONGStatus:/STRONG/A ExtensionBR
+A
+ HREF=directive-dict.html#Module
+ REL=Help
+STRONGModule:/STRONG/A mod_rewrite.cBR
+A
+ HREF=directive-dict.html#Compatibility
+ REL=Help
+STRONGCompatibility:/STRONG/A Apache 1.2BR
+P
The CODERewriteEngine/CODE directive enables or disables the runtime
rewriting engine. If it is set to CODEoff/CODE this module does no
runtime
processing at all. It does not even update the CODESCRIPT_URx/CODE
@@ -322,17 +338,33 @@
A
HREF=directive-dict.html#Syntax
REL=Help
-STRONGSyntax:/STRONG/A CODERewriteOptions/CODE EMOption/EM
...BR
+STRONGSyntax:/STRONG/A CODERewriteOptions/CODE EMOption/EMBR
A
HREF=directive-dict.html#Default
REL=Help
-STRONGDefault:/STRONG/A -EMNone/EM-BR
+STRONGDefault:/STRONG/A EMNone/EMBR
A
HREF=directive-dict.html#Context
REL=Help
-STRONGContext:/STRONG/A server config, virtual host, per-directory
configBR
-P
+STRONGContext:/STRONG/A server config, virtual host, directory,
.htaccessBR
+A
+ HREF=directive-dict.html#Override
+ REL=Help
+STRONGOverride:/STRONG/A FileInfoBR
+A
+ HREF=directive-dict.html#Status
+ REL=Help
+STRONGStatus:/STRONG/A ExtensionBR
+A
+ HREF=directive-dict.html#Module
+ REL=Help
+STRONGModule:/STRONG/A mod_rewrite.cBR
+A
+ HREF=directive-dict.html#Compatibility
+ REL=Help
+STRONGCompatibility:/STRONG/A Apache 1.2BR
+P
The CODERewriteOptions/CODE directive sets some special options for the
current per-server or per-directory configuration. The EMOption/EM
strings can be one of the following:
@@ -358,13 +390,29 @@
A
HREF=directive-dict.html#Default
REL=Help
-STRONGDefault:/STRONG/A -EMNone/EM-BR
+STRONGDefault:/STRONG/A EMNone/EMBR
A
HREF=directive-dict.html#Context
REL=Help
STRONGContext:/STRONG/A server config, virtual hostBR
-P
+A
+ HREF=directive-dict.html#Override
+ REL=Help
+STRONGOverride:/STRONG/A EMNot applicable/EMBR
+A
+ HREF=directive-dict.html#Status
+ REL=Help
+STRONGStatus:/STRONG/A ExtensionBR
+A
+ HREF=directive-dict.html#Module
+ REL=Help
+STRONGModule:/STRONG/A mod_rewrite.cBR
+A
+ HREF=directive-dict.html#Compatibility
+ REL=Help
+STRONGCompatibility:/STRONG/A Apache 1.2BR
+P
The CODERewriteLog/CODE directive sets the name of the file to which the
server logs any rewriting actions it performs. If the name does not begin
with a slash ('CODE//CODE') then it is assumed to be relative to the
@@ -421,6 +469,22 @@
HREF=directive-dict.html#Context
REL=Help
STRONGContext:/STRONG/A server config, virtual hostBR
+A
+ HREF=directive-dict.html#Override
+ REL=Help
+STRONGOverride:/STRONG/A EMNot applicable/EMBR
+A
+ HREF=directive-dict.html#Status
+ REL=Help
+STRONGStatus:/STRONG/A ExtensionBR
+A
+ HREF=directive-dict.html#Module
+ REL=Help
+STRONGModule:/STRONG/A mod_rewrite.cBR
+A
+ HREF=directive-dict.html#Compatibility
+ REL=Help
+STRONGCompatibility:/STRONG/A Apache 1.2BR
P
The CODERewriteLogLevel/CODE directive set the verbosity level of the
rewriting
@@ -461,11 +525,27 @@
A
HREF=directive-dict.html#Default
REL=Help
-STRONGDefault:/STRONG/A -EMNone/EM-BR
+STRONGDefault:/STRONG/A EMNone/EMBR
A
HREF=directive-dict.html#Context
REL=Help
STRONGContext:/STRONG/A server config, virtual hostBR
+A
+ HREF=directive-dict.html#Override
+ REL=Help
+STRONGOverride:/STRONG/A EMNot applicable/EMBR
+A
+ HREF=directive-dict.html#Status
+ REL=Help
+STRONGStatus:/STRONG/A ExtensionBR
+A
+ HREF=directive-dict.html#Module
+ REL=Help
+STRONGModule:/STRONG/A mod_rewrite.cBR
+A
+ HREF=directive-dict.html#Compatibility
+ REL=Help
+STRONGCompatibility:/STRONG/A Apache 1.3BR
P
This directive sets the filename for a synchronization lockfile which
@@ -491,6 +571,22 @@
cvs commit: apache-1.3/src/modules/standard mod_so.c
rse 98/03/25 01:44:49 Modified:.STATUS src CHANGES src/modules/standard mod_so.c Log: Make shared object loading work again (now that -DHIDE is the default). Distributed modules are loaded with AP_name_module and custom modules are now loaded with the fallback strategy via name_module (because their name_module is not and canno be hidden by hide.h). Revision ChangesPath 1.205 +2 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.204 retrieving revision 1.205 diff -u -r1.204 -r1.205 --- STATUS1998/03/23 07:42:09 1.204 +++ STATUS1998/03/25 09:44:44 1.205 @@ -102,6 +102,8 @@ * Ralf's reanim. of undocum. directive: ProxyReceiveBufferSize, PR#1348 * Ralf's mod_proxy fix to use FTP SIZE response for Content-Length, PR#1183 * Ralf's change to make the shared object compilation command more portable +* Dean's protect against FD_SETSIZE mismatches +* Ralf's fallback stategy because of HIDE for loading shared object modules Available Patches: 1.731 +5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.730 retrieving revision 1.731 diff -u -r1.730 -r1.731 --- CHANGES 1998/03/25 02:57:19 1.730 +++ CHANGES 1998/03/25 09:44:46 1.731 @@ -1,4 +1,9 @@ Changes with Apache 1.3b6 + + *) Finally fix the shared object loading by using a fallback strategy to + overcome the HIDE feature problematic without loosing special cases. Also + a huge comment was added to mod_so.c to make the situation more clear + for the future. [Ralf S. Engelschall] *) Protect against FD_SETSIZE mismatches. [Dean Gaudet] 1.15 +66 -9 apache-1.3/src/modules/standard/mod_so.c Index: mod_so.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_so.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mod_so.c 1998/03/23 15:44:15 1.14 +++ mod_so.c 1998/03/25 09:44:48 1.15 @@ -222,6 +222,7 @@ so_server_conf *sconf; moduleinfo *modi; moduleinfo *modie; +char *modname_hidden; int i; /* @@ -240,7 +241,53 @@ modi-name = modname; /* - * Actually load the file into the address space + * NOW COMES THE PROBLEMATIC PART: + * + * Because of the -DHIDE/hide.h feature of Apache 1.3 we have eight + * situations from which four doesn't work at all and four are a bit + * different because of the AP_ hiding stuff and the fact that this symbol + * hiding applies only to distributed modules. + * + * Apache .. means the Apache code itself + * S-Module means a standard module which is distributed with Apache + * C-Module means a custom module which is not distributed with Apache + * HIDE means -DHIDE was used when compiling + * !HIDE ... means -DHIDE was not used when compiling + * xxx . means the symbol name_module of the module structure + * + * Resolving| dlopen() dlsym() + * | (implicit) (explicit) + * Situation | core-module core-module + * --+--- + * The compatible variants: | + * Apache+!HIDE S-Module+!HIDE | succeeds succeeds only w/ xxx + * Apache+ HIDE S-Module+ HIDE | succeeds succeeds only w/ AP_xxx + * Apache+!HIDE C-Module+!HIDE | succeeds succeeds only w/ xxx + * Apache+ HIDE C-Module+ HIDE | succeeds succeeds only w/ xxx == + * The incompatible variants:| + * Apache+!HIDE S-Module+ HIDE | failswould succeed w/ AP_xxx + * Apache+ HIDE S-Module+!HIDE | failswould succeed w/ xxx + * Apache+!HIDE C-Module+ HIDE | failswould succeed w/ xxx + * Apache+ HIDE C-Module+!HIDE | failswould succeed w/ xxx + * + * In other words: For the incompatible variants where the Apache core was + * built with a different setting than the ones the module was compiled + * with, we have no chance at all because the implicit resolving of + * Apache's core symbols in dlopen() already fails for the module (because + * for instance the module needs palloc while Apache exports AP_palloc). + * + * So, only for the compatible variants we have a chance. And here we + * succeed by always trying to resolve
cvs commit: apache-1.3/src/modules/proxy proxy_connect.c
pcs 98/03/25 02:00:19
Modified:src/modules/proxy proxy_connect.c
Log:
On Win32 it is not valid to check that the socket descriptor is less than
the value of FD_SETSIZE
Revision ChangesPath
1.24 +2 -0 apache-1.3/src/modules/proxy/proxy_connect.c
Index: proxy_connect.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_connect.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- proxy_connect.c 1998/03/25 02:57:28 1.23
+++ proxy_connect.c 1998/03/25 10:00:17 1.24
@@ -161,6 +161,7 @@
return SERVER_ERROR;
}
+#ifndef WIN32
if (sock = FD_SETSIZE) {
aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, NULL,
proxy_connect_handler: filedescriptor (%u)
@@ -170,6 +171,7 @@
pclosesocket(r-pool, sock);
return SERVER_ERROR;
}
+#endif
j = 0;
while (server_hp.h_addr_list[j] != NULL) {
cvs commit: apache-1.3/src Makefile.nt
pcs 98/03/25 02:38:50 Modified:src Makefile.nt Log: Reduce repeated code in the makefile by setting environment variables for the build types (debug vs. release) Revision ChangesPath 1.25 +97 -206 apache-1.3/src/Makefile.nt Index: Makefile.nt === RCS file: /export/home/cvs/apache-1.3/src/Makefile.nt,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- Makefile.nt 1998/03/21 05:02:52 1.24 +++ Makefile.nt 1998/03/25 10:38:49 1.25 @@ -1,239 +1,130 @@ # Makefile for Windows NT and Windows 95 + +# Targets are: +# _apacher - build Apache in Release mode +# _apached - build Apache in Debug mode +# installr - build and install a Release build +# installd - build and install a Debug build +# clean - remove (most) generated files +# _cleanr- remove (most) files generated by a Release build +# _cleand- remove (most) files generated by a Debug build +# +# The default installation directory is \Apache. This can be changed +# with the INSTDIR macro, for example: # -# Note that this doesn't quite work... ApacheCore.dll doesn't depend -# on proxy.lib or regex.lib. Nor can it, without some messing about - -# the debug and release versions need different dependencies, and that -# isn't an option. One way that occurs to me to solve the problem is -# to have the proxy and regex makes delete the appropriate -# apache.exe. Tacky, but it'll work! Ben, 5 July 97 +# nmake /f Makefile.nt INSTDIR=d:\Program Files\Apache installr +# +# Note: this does *NOT* change the compiled in default server root +!IF $(INSTDIR) == +INSTDIR=\Apache +!MESSAGE Using default install directory \Apache +!ENDIF +default: _apacher -_apacher: - cd os\win32 - set CFG=ApacheOS - Win32 Release - nmake /nologo -f ApacheOS.mak - cd ..\.. - cd regex - set CFG=regex - Win32 Release - nmake /nologo -f regex.mak - cd .. - cd ap - set CFG=ap - Win32 Release - nmake /nologo -f ap.mak - cd .. - -del CoreR\buildmark.obj - set CFG=ApacheCore - Win32 Release - nmake /nologo -f ApacheCore.mak - set CFG=Apache - Win32 Release - nmake /nologo -f Apache.mak - cd os\win32 - set CFG=ApacheModuleStatus - Win32 Release - nmake /nologo -f ApacheModuleStatus.mak -#set CFG=ApacheModuleInfo - Win32 Release -#nmake /nologo -f ApacheModuleInfo.mak - set CFG=ApacheModuleAuthAnon - Win32 Release - nmake /nologo -f ApacheModuleAuthAnon.mak - set CFG=ApacheModuleDigest - Win32 Release - nmake /nologo -f ApacheModuleDigest.mak - set CFG=ApacheModuleCERNMeta - Win32 Release - nmake /nologo -f ApacheModuleCERNMeta.mak - set CFG=ApacheModuleExpires - Win32 Release - nmake /nologo -f ApacheModuleExpires.mak - set CFG=ApacheModuleHeaders - Win32 Release - nmake /nologo -f ApacheModuleHeaders.mak - set CFG=ApacheModuleSpeling - Win32 Release - nmake /nologo -f ApacheModuleSpeling.mak - set CFG=ApacheModuleUserTrack - Win32 Release - nmake /nologo -f ApacheModuleUserTrack.mak - set CFG=ApacheModuleRewrite - Win32 Release - nmake /nologo -f ApacheModuleRewrite.mak - cd ..\.. - cd modules\proxy - set CFG=ApacheModuleProxy - Win32 Release - nmake /nologo -f ApacheModuleProxy.mak - cd ..\.. +_release: + set SHORT=R + set LONG=Release -_apached: - cd os\win32 - set CFG=ApacheOS - Win32 Debug - nmake /nologo -f ApacheOS.mak - cd ..\.. - cd regex - set CFG=regex - Win32 Debug - nmake /nologo -f regex.mak - cd .. - cd ap - set CFG=ap - Win32 Debug - nmake /nologo -f ap.mak - cd .. - -del CoreD\buildmark.obj - set CFG=ApacheCore - Win32 Debug - nmake /nologo -f ApacheCore.mak - set CFG=Apache - Win32 Debug - nmake /nologo -f Apache.mak - cd os\win32 - set CFG=ApacheModuleStatus - Win32 Debug - nmake /nologo -f ApacheModuleStatus.mak -#set CFG=ApacheModuleInfo - Win32 Debug -#nmake /nologo -f ApacheModuleInfo.mak - set CFG=ApacheModuleAuthAnon - Win32 Debug - nmake /nologo -f ApacheModuleAuthAnon.mak - set CFG=ApacheModuleDigest - Win32 Debug - nmake /nologo -f ApacheModuleDigest.mak - set CFG=ApacheModuleCERNMeta - Win32 Debug - nmake /nologo -f ApacheModuleCERNMeta.mak - set CFG=ApacheModuleExpires - Win32 Debug - nmake /nologo -f ApacheModuleExpires.mak - set CFG=ApacheModuleHeaders - Win32 Debug - nmake /nologo -f ApacheModuleHeaders.mak - set CFG=ApacheModuleSpeling - Win32
cvs commit: apache-1.3 STATUS
rse 98/03/25 03:09:42 Modified:.STATUS Log: Ok, APACI has come out of its childhood and we now should either consider it to be included for Apache 1.3 or finally ignored. Please add your votes. But don't hurry. Take some time for a good decision, please. Revision ChangesPath 1.206 +152 -11 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- STATUS1998/03/25 09:44:44 1.205 +++ STATUS1998/03/25 11:09:41 1.206 @@ -112,18 +112,159 @@ Status: Ken +1, Paul +1, Ben +1, Jim +1, Randy +1, Roy +1, Chuck +1, MarkC +1, Ralf +1, Sameer +1 -Concepts: +* Ralf's + Apache 1.3 Autoconf-*style* Interface (APACI) + ftp://ftp.apache.org/apache/dist/contrib/apaci/ + + What stuff does APACI contain? +README Documentation with Examples (step 1) +INSTALL Reference of Installation Options (step 2) +configure The Autoconf-style configure script (step 3) +Makefile.tmpl The Makefile controlling anything (step 4) +aux/fmn.sh Auxilliary script: find module name +aux/install.sh Auxilliary script: install program +aux/mkdir.shAuxilliary script: mkdir program +aux/mkshadow.sh Auxilliary script: --shadow support +aux/ppl.sh Auxilliary script: --help support + + Background: +Currently Apache 1.3 has no real and flexible batch-configuration +procedure and no real out-of-the-box installation procedure although +the users expect one. At least the installation procedure is required. +For Apache 2.0 we already want something similar to this, but this is +too far away. Apache 1.3 will be out for a long time until Apache 2.0 +is available and thus we should provide such a installation procedure. + + Idee: +To fill this gap for Apache 1.3 APACI was written from scratch. The +goal it addresses is an Autoconf-style(!) but _NOT_ Autoconf-based +batch interface for out-of-the-box configuring, building and +installing Apache 1.3 by providing a frontend(!) and _NOT_ a +replacement to the (more proprietary) src/Configure+src/Configuration +stuff while replacing the totally out-of-date and bogus +apache-1.3/Makefile+apache-1.3/src/helpers/InstallApache files. + + In short for the impatient: + $ cd apache-1.3 + $ ./configure --prefix=PREFIX + $ make + $ make install + $ PREFIX/sbin/apachectl start== IMPORTANT! + + Hints: + 1. Because APACI uses a frontend which is named configure and +supports the Autoconf-style options (especially --prefix, etc.) we +provide an interface the users expect and already know for years +from the many GNU software packages. The fact that our APACI stuff +is not really Autoconf-based(!) is not important here and totally +hidden from the user. + 2. The make install _really_ out-of-the-box installs Apache 1.3 +without any user intervention. It does not only install Apache +with a GNU-conforming (and thus not filesystem disturbing) +installation layout. It additionally creates initial config files, +including corresponding LoadModule lines for the built shared +objects, etc. And it installs not only the core, it installs the +shared objects files, the support programs, the manpages, the +initial document root, etc. pp. + 3. Because APACI also adjusts the paths in the support scripts and +programs the user is able to _IMMEDIATELY_ fire up Apache after +make install by just running PREFIX/sbin/apachectl start. +THIS IS VERY IMPORTANT, because it gives the first success event +to the user. For a really good package the should love this is +important. + + The features APACI actually provides in detail (summary): + - runs 100% in batch + - can control _any_ options of src/Configuration.tmpl file, including + rules, shared object support, etc. + - provides additional support for suEXEC, on-the-fly adding of + modules, mod_perl, etc. + - builds _and_ installs Apache out-of-the-box + - user can _immediately_ run Apache the first time after make + install. Important for the first success even of the user!! + - is as portable as src/Configure (no shell functions, etc.) + - is
cvs commit: apache-1.3/src Makefile.tmpl
rse 98/03/25 03:40:46 Modified:src Makefile.tmpl Log: Remove just some not needed whitespaces I've seen... Revision ChangesPath 1.86 +3 -3 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- Makefile.tmpl 1998/03/17 15:42:24 1.85 +++ Makefile.tmpl 1998/03/25 11:40:46 1.86 @@ -23,7 +23,7 @@ @echo If not, you will at least have to touch @@Configuration@@. @false -$(TARGET): subdirs modules.o +$(TARGET): subdirs modules.o $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) buildmark.c $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) -o $(TARGET) buildmark.o $(OBJS) $(REGLIB) $(LIBS) @@ -67,7 +67,7 @@ # httpd binary with all modules built in and then updates the # $(INCDIR)/hide.h file according to the exported symbols of this # binary. So run this target once after a new function was added -# to the source. But never trust this operation. You really +# to the source. But never trust this operation. You really # have to review the changes manually afterwards. updatehide: cat Configuration.tmpl |\ @@ -77,7 +77,7 @@ ./Configure -file Configuration.for-hide $(MAKE) clean httpd ./helpers/UpdateHide httpd $(INCDIR)/hide.h `helpers/GuessOS` - $(MAKE) clean + $(MAKE) clean rm -f Configuration.for-hide #Dependencies
cvs commit: apache-1.3/src/modules/standard mod_so.c
rse 98/03/25 04:57:43 Modified:src/modules/standard mod_so.c Log: Another hint where to find information about building shared objects for the various platforms. Revision ChangesPath 1.16 +4 -0 apache-1.3/src/modules/standard/mod_so.c Index: mod_so.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_so.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mod_so.c 1998/03/25 09:44:48 1.15 +++ mod_so.c 1998/03/25 12:57:42 1.16 @@ -114,6 +114,10 @@ * and which compiler and linker flags Perl 5 uses to create the shared object * files. * + * Another location where you can find useful hints is the `ltconfig' script + * of the GNU libtool 1.2 package. Search for your platform name inside the + * various case constructs. + * */
cvs commit: apache-1.3/src/modules/proxy proxy_ftp.c
martin 98/03/25 07:09:00
Modified:src/modules/proxy proxy_ftp.c
Log:
On BS2000, the reuse-addr option is set by default, and cannot be en/disabled
Revision ChangesPath
1.54 +4 -0 apache-1.3/src/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===
RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_ftp.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -u -r1.53 -r1.54
--- proxy_ftp.c 1998/03/20 11:17:14 1.53
+++ proxy_ftp.c 1998/03/25 15:08:59 1.54
@@ -578,10 +578,12 @@
if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *) one,
sizeof(one)) == -1) {
+#ifndef _OSD_POSIX /* BS2000 has this option always on */
proxy_log_uerror(setsockopt, NULL,
proxy: error setting reuseaddr option, r-server);
pclosesocket(p, sock);
return SERVER_ERROR;
+#endif /*_OSD_POSIX*/
}
#ifdef SINIX_D_RESOLVER_BUG
@@ -847,12 +849,14 @@
if (setsockopt(dsock, SOL_SOCKET, SO_REUSEADDR, (void *) one,
sizeof(one)) == -1) {
+#ifndef _OSD_POSIX /* BS2000 has this option always on */
proxy_log_uerror(setsockopt, NULL,
proxy: error setting reuseaddr option, r-server);
pclosesocket(p, dsock);
bclose(f);
kill_timeout(r);
return SERVER_ERROR;
+#endif /*_OSD_POSIX*/
}
if (bind(dsock, (struct sockaddr *) server,
cvs commit: apache-1.3/src/modules/proxy proxy_util.c
martin 98/03/25 07:12:07
Modified:src/modules/proxy proxy_util.c
Log:
Hex conversion for EBCDIC hosts added
Revision ChangesPath
1.53 +12 -0 apache-1.3/src/modules/proxy/proxy_util.c
Index: proxy_util.c
===
RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_util.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -u -r1.52 -r1.53
--- proxy_util.c 1998/03/22 22:21:02 1.52
+++ proxy_util.c 1998/03/25 15:12:05 1.53
@@ -70,6 +70,7 @@
{
int i, ch;
+#ifndef CHARSET_EBCDIC
ch = x[0];
if (isdigit(ch))
i = ch - '0';
@@ -87,10 +88,14 @@
else
i += ch - ('a' - 10);
return i;
+#else /*CHARSET_EBCDIC*/
+return (1 == sscanf(x, %2x, i)) ? i : 0;
+#endif /*CHARSET_EBCDIC*/
}
void proxy_c2hex(int ch, char *x)
{
+#ifndef CHARSET_EBCDIC
int i;
x[0] = '%';
@@ -105,6 +110,13 @@
x[2] = ('A' - 10) + i;
else
x[2] = '0' + i;
+#else /*CHARSET_EBCDIC*/
+static const char ntoa[] = { 0123456789ABCDEF };
+x[0] = '%';
+x[1] = ntoa[(ch4)0x0F];
+x[2] = ntoa[ch0x0F];
+x[3] = '\0';
+#endif /*CHARSET_EBCDIC*/
}
/*
cvs commit: apache-1.3/src/modules/proxy proxy_ftp.c
martin 98/03/25 07:23:01 Modified:src/modules/proxy proxy_ftp.c Log: EBCDIC charset conversion for ftp_check_string() added Revision ChangesPath 1.55 +4 -0 apache-1.3/src/modules/proxy/proxy_ftp.c Index: proxy_ftp.c === RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_ftp.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -u -r1.54 -r1.55 --- proxy_ftp.c 1998/03/25 15:08:59 1.54 +++ proxy_ftp.c 1998/03/25 15:23:00 1.55 @@ -94,7 +94,11 @@ ch = proxy_hex2c(x[i + 1]); i += 2; } +#ifndef CHARSET_EBCDIC if (ch == '\015' || ch == '\012' || (ch 0x80)) +#else /*CHARSET_EBCDIC*/ + if (ch == '\r' || ch == '\n' || (os_toascii[ch] 0x80)) +#endif /*CHARSET_EBCDIC*/ return 0; } return 1;
cvs commit: apache-1.3/src Configure
martin 98/03/25 07:26:52 Modified:src Configure Log: Use additional switches for Bs2000 C Compiler: They force CC to use mixed case and underscores in the generated *.o files (And I wonder why that is not the default in the POSIX subsystem) Without these flags, no two global variables/functions may ever appear which only differ in case. Revision ChangesPath 1.218 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.217 retrieving revision 1.218 diff -u -u -r1.217 -r1.218 --- Configure 1998/03/23 07:26:03 1.217 +++ Configure 1998/03/25 15:26:51 1.218 @@ -524,7 +524,7 @@ OS='BS2000' OSDIR='os/bs2000' CC='c89' - CFLAGS=$CFLAGS -DCHARSET_EBCDIC -DSVR4 -D_XPG_IV + CFLAGS=$CFLAGS -DCHARSET_EBCDIC -DSVR4 -D_XPG_IV -XLLML -XLLMK DEF_WANTHSREGEX=yes LIBS=$LIBS -lsocket -lnsl -lc ;;
cvs commit: apache-1.3 STATUS
rse 98/03/25 07:27:04 Modified:.STATUS Log: Ops, totally wrong paths... Revision ChangesPath 1.207 +9 -9 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.206 retrieving revision 1.207 diff -u -r1.206 -r1.207 --- STATUS1998/03/25 11:09:41 1.206 +++ STATUS1998/03/25 15:27:04 1.207 @@ -204,15 +204,15 @@ CV1: The recommended-way commit: - READMEapache-1.3/apaci/README - INSTALL apache-1.3/apaci/INSTALL - configure apache-1.3/apaci/configure - Makefile.tmpl apache-1.3/apaci/Makefile.tmpl - aux/fmn.sh == apache-1.3/apaci/src/helpers/fmn.sh - aux/install.shapache-1.3/apaci/src/helpers/install.sh - aux/mkdir.sh apache-1.3/apaci/src/helpers/mkdir.sh - aux/mkshadow.sh apache-1.3/apaci/src/helpers/mkshadow.sh - aux/ppl.shapache-1.3/apaci/src/helpers/ppl.sh + READMEapache-1.3/README.configure + INSTALL apache-1.3/INSTALL + configure apache-1.3/configure + Makefile.tmpl apache-1.3/Makefile.tmpl + aux/fmn.sh == apache-1.3/src/helpers/fmn.sh + aux/install.shapache-1.3/src/helpers/install.sh + aux/mkdir.sh apache-1.3/src/helpers/mkdir.sh + aux/mkshadow.sh apache-1.3/src/helpers/mkshadow.sh + aux/ppl.shapache-1.3/src/helpers/ppl.sh Advantages:- the user finds APACI easily because it stays where it is expected to stay: in the top-level
cvs commit: apache-1.3/src/main util_uri.c
martin 98/03/25 07:36:11
Modified:src/main util_uri.c
Log:
Correct the detection of an invalid port string in parse_uri_components().
Revision ChangesPath
1.13 +1 -1 apache-1.3/src/main/util_uri.c
Index: util_uri.c
===
RCS file: /home/cvs/apache-1.3/src/main/util_uri.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -u -r1.12 -r1.13
--- util_uri.c1998/03/14 04:55:04 1.12
+++ util_uri.c1998/03/25 15:36:10 1.13
@@ -520,7 +520,7 @@
if (uri != s) {
port = strtol(uptr-port_str, endstr, 10);
uptr-port = port;
- if (*endstr == '\0' uptr-port == port) {
+ if (endstr == uri) {
goto deal_with_path;
}
/* Invalid characters after ':' found */
cvs commit: apache-1.3/src/main util_uri.c
dgaudet 98/03/25 10:14:57
Modified:src/main util_uri.c
Log:
Fix Martin's previous checkin... it failed the mod_test_util_uri.c
testsuite... Is there some other bug I'm not seeing Martin? There was
some bogus code previously (namely the test uptr-port == port... 'cause
it was always true... thanks for spotting that).
The test_util_uri thing doesn't test bogus ports, or any other bogosities.
That would be a welcome addition.
Revision ChangesPath
1.14 +1 -1 apache-1.3/src/main/util_uri.c
Index: util_uri.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/util_uri.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- util_uri.c1998/03/25 15:36:10 1.13
+++ util_uri.c1998/03/25 18:14:55 1.14
@@ -520,7 +520,7 @@
if (uri != s) {
port = strtol(uptr-port_str, endstr, 10);
uptr-port = port;
- if (endstr == uri) {
+ if (*endstr == '\0') {
goto deal_with_path;
}
/* Invalid characters after ':' found */
cvs commit: apache-1.3 KEYS
dgaudet 98/03/25 10:39:55 Modified:.KEYS Log: my pgp5 key Revision ChangesPath 1.16 +41 -0 apache-1.3/KEYS Index: KEYS === RCS file: /export/home/cvs/apache-1.3/KEYS,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- KEYS 1997/11/19 09:46:00 1.15 +++ KEYS 1998/03/25 18:39:54 1.16 @@ -282,3 +282,44 @@ =xUw/ -END PGP PUBLIC KEY BLOCK- +Type Bits KeyID CreatedExpiresAlgorithm Use +sec+ 1024 0xF08E012A 1998-02-19 -- DSS Sign Encrypt +sub 2048 0xD8F8125A 1998-02-19 -- Diffie-Hellman +uid Dean Gaudet [EMAIL PROTECTED] +uid Dean Gaudet [EMAIL PROTECTED] +uid Dean Gaudet [EMAIL PROTECTED] + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: PGPfreeware 5.0i for non-commercial use + +mQGiBDTsCJkRBADJmDUiJL0xUaxg0yw7+VqqFUL6sjWxZeZ7kQZs4dyN3R1ilBUG +KmOXE6qSfb6Pi0qEmgCz1K7g1KaglMRrpANY4h1CjziEVmTH5s3ocxe77w2uaou1 +gHJERIqQuC4/z0DwFqq61ZVf5dUQTD8OmfOwG4pFs51Si9WS03ueVEFQFwCg/9Z2 +j6UzCLyUABpWeV1v4m0w82kEAK96GyKDcT20TymKJnMKuwya+ZwqrULH3Sdi2Mwi +1GOH7aomG2fK4D2yxWx5xTiYhmYNnRoopgu/Kv5a4x43tOKS3zeADMnHIw9dMSn9 +4Kba8vfKbZnlOgt9veV+iWZv7N2aS2z7w/i53Y6LAlV1hAIMvGJ3zLfmShZs0LDI +Ya18A/wNcdJazUk9mLGIoycCYOk5YhWL9sCaCBdmdfDPu++rLnqROSWkmfYkOTt+ +pG9SPnvv3XrX/SEwM8gYfpbZwrFDJFI9W63lc9hdSosFD+8xiRl6h2gKRwWvc1Ry +xIt3+gUrZxovNxBOv98BoSf/j3lkldU+ZjDGlCplRHSndxlN/bQgRGVhbiBHYXVk +ZXQgPGRnYXVkZXRAYXJjdGljLm9yZz6JAEsEEBECAAsFAjTsCJkECwMBAgAKCRB9 +bb/R8I4BKqqzAKDc/4H9iOXJxVE0yCEHeTQ2gAHfhgCg7VSq7eNhiJhBgblQav/R +XOhaHj20JkRlYW4gR2F1ZGV0IDxkZ2F1ZGV0LWRqZzIwQGFyY3RpYy5vcmc+iQBL +BBARAgALBQI07AjSBAsDAQIACgkQfW2/0fCOASoWOACfb+8OVvy6FCqN2MxdCqp6 +gffNbYgAoOxlTa4NjCUUO9dfLFFYpDfGrRy7tCBEZWFuIEdhdWRldCA8ZGdhdWRl +dEBhcGFjaGUub3JnPokASwQQEQIACwUCNOwI/gQLAwECAAoJEH1tv9HwjgEqiC8A +oJDu1HTuGOfChFSJJ31XvV8tnlo5AKCFceck4veIMP8pDC0f5UBGGC3mZLkCDQQ0 +7AiZEAgA9kJXtwh/CBdyorrWqULzBej5UxE5T7bxbrlLOCDaAadWoxTpj0BV89AH +xstDqZSt90xkhkn4DIO9ZekX1KHTUPj1WV/cdlJPPT2N286Z4VeSWc39uK50T8X8 +dryDxUcwYc58yWb/Ffm7/ZFexwGq01uejaClcjrUGvC/RgBYK+X0iP1YTknbzSC0 +neSRBzZrM2w4DUUdD3yIsxx8Wy2O9vPJI8BD8KVbGI2Ou1WMuF040zT9fBdXQ6Md +GGzeMyEstSr/POGxKUAYEY18hKcKctaGxAMZyAcpesqVDNmWn6vQClCbAkbTCD1m +pF1Bn5x8vYlLIhkmuquiXsNV6TILOwACAggAhb3cBmR67H4+9Rj4FeTwJ8kflX6I +pp2AeXXZiffiPVBv5cGzGn2RkGPAZqbp2AkrCb4TrJH//1GPdR8VmPeEGsm6u0uT +0M404l/4IW1FFQ4JBpTENPn4NYBHkKBNkPcls/ip0lSjlmLGVQVOtDOaFD7n44xV +hT4WpptCripg/5kymDmK9c8hv6rPUvNoVrDdWR4//MCvNAZvGq2bZGdFTyd5Tn6D +AmwbvL/UwgiDnm95qBBfCZtmGkkFaoOePtBevWFaviFZM2pErPRcjY8A/1cZsycj +JPMFYqBKGDIk76ulDSjU0Q8dqhCEDf0o2oQEg6msjDtetVFEDw9yJe0AGIkAPwMF +GDTsCJl9bb/R8I4BKhECBKgAoNRtRaRMdYNwajSO7056eKazCGSDAKDShamaRjAe +ThQ1KefmJKyzfcosZQ== +=25Cv +-END PGP PUBLIC KEY BLOCK-
cvs commit: apache-site bug_report.html
marc98/03/25 15:47:33 Modified:.bug_report.html Log: The world isn't Unix any more (not that it ever completely was), plus Deja News is cool. Revision ChangesPath 1.10 +15 -9 apache-site/bug_report.html Index: bug_report.html === RCS file: /export/home/cvs/apache-site/bug_report.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- bug_report.html 1998/03/25 05:05:13 1.9 +++ bug_report.html 1998/03/25 23:47:31 1.10 @@ -49,15 +49,21 @@ If you're not sure that your problem is specifically related to a bug in Apache (ie. not something like a client problem or configuration problem), we strongly recommend that you check in the - A - HREF=news:comp.infosystems.www.servers.unix; - SAMPcomp.infosystems.www.servers.unix/SAMP/A - USENET newsgroup first. If you don't receive a response within a few - days, then please submit it to the Apache bug database. If it's a - known issue, you'll probably get a faster response from the newsgroup - and you will help keep developer time free for improving Apache. Most - bug reports submitted are actually user configuration problems that - could be easily fixed by asking in the newsgroup. + A HREF=news:comp.infosystems.www.servers.unix;SAMP + comp.infosystems.www.servers.unix/SAMP/A or A HREF= + news:comp.infosystems.www.servers.ms-windows;SAMP + comp.infosystems.www.servers.ms-windows/SAMP/A (depending on + the platform being used) Usenet newsgroup first. If you don't + receive a response within a few days, then please submit it to + the Apache bug database. If it's a known issue, you'll probably + get a faster response from the newsgroup and you will help keep + developer time free for improving Apache. Most bug reports submitted + are actually user configuration problems that could be easily + fixed by asking in the newsgroup. + + PIf you do not have access to a Usenet server, there are + several web sites on the Internet that allow you to read and post + to Usenet, such as A HREF=http://www.dejanews.com/;Deja News/A. PFONT COLOR=redDo Bnot/B post to Usenet and submit a bug report at the same time./FONT This wastes everyone's time.
