cvs commit: apache-1.3/src/support apxs.pl
wsanchez99/12/06 16:03:26
Modified:src/support apxs.pl
Log:
If we can't open httpd.conf, print a warning, but don't die.
Otherwise, you can't install a module into a package root.
Revision ChangesPath
1.30 +11 -8 apache-1.3/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /home/cvs/apache-1.3/src/support/apxs.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- apxs.pl 1999/12/06 23:55:37 1.29
+++ apxs.pl 1999/12/07 00:03:24 1.30
@@ -510,15 +510,18 @@
} else {
$content =~ s|^(.*\n)#?\s*$amd[^\n]*\n|$1$c$amd\n|sg;
}
-}
+ }
if (@lmd or @amd) {
-open(FP, $CFG_SYSCONFDIR/$CFG_TARGET.conf.new) || die;
-print FP $content;
-close(FP);
-system(cp $CFG_SYSCONFDIR/$CFG_TARGET.conf
$CFG_SYSCONFDIR/$CFG_TARGET.conf.bak .
- cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new
$CFG_SYSCONFDIR/$CFG_TARGET.conf .
- rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new);
-}
+if (open(FP, $CFG_SYSCONFDIR/$CFG_TARGET.conf.new)) {
+print FP $content;
+close(FP);
+system(cp $CFG_SYSCONFDIR/$CFG_TARGET.conf
$CFG_SYSCONFDIR/$CFG_TARGET.conf.bak .
+ cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new
$CFG_SYSCONFDIR/$CFG_TARGET.conf .
+ rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new);
+} else {
+print STDERR unable to open configuration file\n;
+}
+ }
}
}
cvs commit: apache-2.0/src/support apxs.pl
wsanchez99/12/06 16:06:43
Modified:src/support apxs.pl
Log:
Perform check for $CFG_SBINDIR/$CFG_TARGET _after_ the command line
overrides for CFG_SBINDIR and CFG_TARGET have been evaluated.
Revision ChangesPath
1.2 +15 -15apache-2.0/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /home/cvs/apache-2.0/src/support/apxs.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apxs.pl 1999/08/24 06:45:53 1.1
+++ apxs.pl 1999/12/07 00:06:41 1.2
@@ -89,21 +89,6 @@
$CFG_CFLAGS =~ s|\s+`.+apaci`||;
##
-## Initial shared object support check
-##
-if (not -x $CFG_SBINDIR/$CFG_TARGET) {
- print STDERR apxs:Error: $CFG_SBINDIR/$CFG_TARGET not found or not
executable\n;
- exit(1);
-}
-if (not grep(/mod_so/, `$CFG_SBINDIR/$CFG_TARGET -l`)) {
-print STDERR apxs:Error: Sorry, no shared object support for Apache\n;
-print STDERR apxs:Error: available under your platform. Make sure\n;
-print STDERR apxs:Error: the Apache module mod_so is compiled into\n;
-print STDERR apxs:Error: your server binary
`$CFG_SBINDIR/$CFG_TARGET'.\n;
-exit(1);
-}
-
-##
## parse argument line
##
@@ -231,6 +216,21 @@
usage;
}
}
+}
+
+##
+## Initial shared object support check
+##
+if (not -x $CFG_SBINDIR/$CFG_TARGET) {
+ print STDERR apxs:Error: $CFG_SBINDIR/$CFG_TARGET not found or not
executable\n;
+ exit(1);
+}
+if (not grep(/mod_so/, `$CFG_SBINDIR/$CFG_TARGET -l`)) {
+print STDERR apxs:Error: Sorry, no shared object support for Apache\n;
+print STDERR apxs:Error: available under your platform. Make sure\n;
+print STDERR apxs:Error: the Apache module mod_so is compiled into\n;
+print STDERR apxs:Error: your server binary
`$CFG_SBINDIR/$CFG_TARGET'.\n;
+exit(1);
}
##
cvs commit: apache-2.0/src/support apxs.pl
wsanchez99/12/06 16:09:04
Modified:src/support apxs.pl
Log:
If we can't open httpd.conf, print a warning, but don't die.
Otherwise, you can't install a module into a package root.
Revision ChangesPath
1.3 +10 -7 apache-2.0/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /home/cvs/apache-2.0/src/support/apxs.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apxs.pl 1999/12/07 00:06:41 1.2
+++ apxs.pl 1999/12/07 00:09:01 1.3
@@ -511,13 +511,16 @@
}
}
if (@lmd or @amd) {
-open(FP, $CFG_SYSCONFDIR/$CFG_TARGET.conf.new) || die;
-print FP $content;
-close(FP);
-system(cp $CFG_SYSCONFDIR/$CFG_TARGET.conf
$CFG_SYSCONFDIR/$CFG_TARGET.conf.bak .
- cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new
$CFG_SYSCONFDIR/$CFG_TARGET.conf .
- rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new);
-}
+if (open(FP, $CFG_SYSCONFDIR/$CFG_TARGET.conf.new)) {
+print FP $content;
+close(FP);
+system(cp $CFG_SYSCONFDIR/$CFG_TARGET.conf
$CFG_SYSCONFDIR/$CFG_TARGET.conf.bak .
+ cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new
$CFG_SYSCONFDIR/$CFG_TARGET.conf .
+ rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new);
+} else {
+print STDERR unable to open configuration file\n;
+}
+ }
}
}
cvs commit: apache-1.3/src/support logresolve.c
rasmus 99/12/06 20:54:49 Modified:src/modules/standard mod_info.c src/support logresolve.c Log: Revision ChangesPath 1.47 +1 -1 apache-1.3/src/modules/standard/mod_info.c Index: mod_info.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_info.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- mod_info.c1999/10/21 20:45:32 1.46 +++ mod_info.c1999/12/07 04:54:29 1.47 @@ -68,7 +68,7 @@ * GET /server-info?module_name - Returns configuration for a single module * GET /server-info?list - Returns quick list of included modules * - * Rasmus Lerdorf [EMAIL PROTECTED], May 1996 + * Rasmus Lerdorf [EMAIL PROTECTED], May 1996 * * 05.01.96 Initial Version * 1.17 +1 -1 apache-1.3/src/support/logresolve.c Index: logresolve.c === RCS file: /home/cvs/apache-1.3/src/support/logresolve.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- logresolve.c 1998/07/13 11:32:58 1.16 +++ logresolve.c 1999/12/07 04:54:45 1.17 @@ -1,7 +1,7 @@ /* * logresolve 1.1 * - * Tom Rathborne - [EMAIL PROTECTED] - http://www.uunet.ca/~tomr/ + * Tom Rathborne - [EMAIL PROTECTED] - http://www.aceldama.com/~tomr/ * UUNET Canada, April 16, 1995 * * Rewritten by David Robinson. ([EMAIL PROTECTED])
cvs commit: apache-1.3/src/include ap_config.h
martin 99/12/07 04:19:50 Modified:src Configure PORTING src/include ap_config.h Log: Autodetect the presence of the sys/param.h header; use it if available. This change results in fewer OS dependencies than the old (hardcoded) #if defined() ... list Submitted by: Ovies Brabson [EMAIL PROTECTED] Reviewed by:Martin Kraemer Revision ChangesPath 1.377 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.376 retrieving revision 1.377 diff -u -r1.376 -r1.377 --- Configure 1999/11/30 15:52:00 1.376 +++ Configure 1999/12/07 12:19:48 1.377 @@ -920,7 +920,7 @@ echo #define AP_CONFIG_AUTO_H $AP_CONFIG_AUTO_H echo + checking for system header files -CHECK_FOR_HEADERS=dlfcn.h dl.h bstring.h crypt.h unistd.h sys/resource.h sys/select.h sys/processor.h +CHECK_FOR_HEADERS=dlfcn.h dl.h bstring.h crypt.h unistd.h sys/resource.h sys/select.h sys/processor.h sys/param.h for header in $CHECK_FOR_HEADERS; do echo $AP_CONFIG_AUTO_H echo /* check: #include $header */ $AP_CONFIG_AUTO_H 1.34 +6 -0 apache-1.3/src/PORTING Index: PORTING === RCS file: /export/home/cvs/apache-1.3/src/PORTING,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- PORTING 1998/09/17 21:13:58 1.33 +++ PORTING 1999/12/07 12:19:48 1.34 @@ -200,6 +200,12 @@ functions are available as well. This is set automatically during the Configure process and stored in the src/include/ap_config_auto.h header file. + +HAVE_SYS_PARAM_H: + Defined if the OS has the sys/param.h header file. This is + set automatically during the Configure process and stored in the + src/include/ap_config_auto.h header file. + -- USE_*: 1.277 +4 -4 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.276 retrieving revision 1.277 diff -u -r1.276 -r1.277 --- ap_config.h 1999/12/06 22:16:59 1.276 +++ ap_config.h 1999/12/07 12:19:50 1.277 @@ -116,10 +116,6 @@ #include os.h #endif -#if !defined(QNX) !defined(MPE) !defined(WIN32) !defined(TPF) !defined(NETWARE) -#include sys/param.h -#endif - /* Define one of these according to your system. */ #if defined(MINT) typedef int rlim_t; @@ -964,6 +960,10 @@ /* NEED_STRDUP is set on stupid systems that don't have strdup. */ #undef NEED_STRDUP #endif + +#ifdef HAVE_SYS_PARAM_H +#include sys/param.h +#endif /* HAVE_SYS_PARAM_H */ /* stuff marked API_EXPORT is part of the API, and intended for use * by modules
cvs commit: apache-1.3 configure
bjh 99/12/07 06:15:03
Modified:.configure
Log:
Give OS/2 back a default layout, disabled by previous patch.
Revision ChangesPath
1.112 +1 -0 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- configure 1999/12/04 00:59:52 1.111
+++ configure 1999/12/07 14:14:59 1.112
@@ -322,6 +322,7 @@
iflags_dso=${iflags_dso} -S \-S\
;;
*OS/2* )
+default_layout=Apache
iflags_program=${iflags_program} -e .exe
iflags_core=${iflags_core} -e .exe
;;
cvs commit: apache-2.0 configure
bjh 99/12/07 06:20:12
Modified:.configure
Log:
Give OS/2 back a default layout, disabled by previous patch.
Revision ChangesPath
1.7 +1 -0 apache-2.0/configure
Index: configure
===
RCS file: /home/cvs/apache-2.0/configure,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configure 1999/12/04 01:01:03 1.6
+++ configure 1999/12/07 14:20:10 1.7
@@ -323,6 +323,7 @@
iflags_dso=${iflags_dso} -S \-S\
;;
*OS/2* )
+ default_layout=Apache
iflags_program=$iflags_program -e .exe
iflags_core=$iflags_core -e .exe
;;
cvs commit: apache-2.0/src/lib/apr/misc/beos misc.h
dreid 99/12/07 07:09:23
Modified:src/lib/apr/misc/beos misc.h
Log:
Add apr_abort to BeOS.
Revision ChangesPath
1.5 +1 -0 apache-2.0/src/lib/apr/misc/beos/misc.h
Index: misc.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/misc.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- misc.h1999/11/20 22:05:07 1.4
+++ misc.h1999/12/07 15:09:20 1.5
@@ -71,6 +71,7 @@
struct context_t {
struct ap_pool_t *pool;
void *prog_data;
+int (*apr_abort)(int retcode);
};
#endif /* ! MISC_H */
