cvs commit: apache-1.3/src/main util.c
marc99/06/16 23:03:21
Modified:src/main util.c
Log:
Fix bug in ap_field_noparam() that resulted in SEGVs when used with
content types that don't have a ';' in them.
Revision ChangesPath
1.164 +4 -2 apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- util.c1999/06/04 18:30:31 1.163
+++ util.c1999/06/17 06:03:20 1.164
@@ -128,12 +128,14 @@
const char *semi;
semi = strchr(intype, ';');
-if (semi != NULL) {
+if (!semi) {
+ return ap_pstrdup(p, intype);
+} else {
while ((semi intype) ap_isspace(semi[-1])) {
semi--;
}
+ return ap_pstrndup(p, intype, semi - intype);
}
-return ap_pstrndup(p, intype, semi - intype);
}
API_EXPORT(char *) ap_ht_time(pool *p, time_t t, const char *fmt, int gmt)
cvs commit: apache-1.3/src/main http_core.c http_main.c
jim 99/06/17 04:49:35
Modified:htdocs/manual/mod core.html
src CHANGES
src/include http_conf_globals.h
src/main http_core.c http_main.c
Log:
Always perform the check for DocumentRoot
when doing the config test
Revision ChangesPath
1.150 +4 -1 apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- core.html 1999/06/14 18:41:23 1.149
+++ core.html 1999/06/17 11:49:26 1.150
@@ -778,7 +778,10 @@
the startup time. If you are sure that all the DocumentRoot
entries exist, you can tell Apache to bypass this check using:
BLOCKQUOTECODEDocumentRootCheck Off/CODE/BLOCKQUOTE
-
+P
+This directive is ignored when Apache is called with the
+CODE-t/CODE command line option to perform a configuration
+test.
PHR
1.1380+3 -1 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1379
retrieving revision 1.1380
diff -u -r1.1379 -r1.1380
--- CHANGES 1999/06/16 22:19:16 1.1379
+++ CHANGES 1999/06/17 11:49:28 1.1380
@@ -4,7 +4,9 @@
*) New directive, DocumentRootCheck, added to determine if
we bother doing the stat of each DocumentRoot during
- startup. [Mathijs Maassen [EMAIL PROTECTED]. Jim Jagielski]
+ startup. Ignored when using the '-t' command line option
+ to perform a configuration test. [Mathijs Maassen [EMAIL PROTECTED].
+ Jim Jagielski]
*) Win32: The query switch apache -S didn't exit after showing the
vhost settings. That was inconsistent with the other query functions.
1.37 +1 -0 apache-1.3/src/include/http_conf_globals.h
Index: http_conf_globals.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/http_conf_globals.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- http_conf_globals.h 1999/06/13 19:59:40 1.36
+++ http_conf_globals.h 1999/06/17 11:49:31 1.37
@@ -68,6 +68,7 @@
extern int ap_standalone;
extern int ap_documentroot_check;
+extern int ap_configtestonly;
extern uid_t ap_user_id;
extern char *ap_user_name;
extern gid_t ap_group_id;
1.264 +2 -1 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- http_core.c 1999/06/13 19:59:41 1.263
+++ http_core.c 1999/06/17 11:49:32 1.264
@@ -1031,7 +1031,8 @@
return err;
}
-ap_documentroot_check = arg != 0;
+if (!ap_configtestonly)
+ap_documentroot_check = arg != 0;
return NULL;
}
1.446 +5 -6 apache-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.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- http_main.c 1999/06/13 19:59:41 1.445
+++ http_main.c 1999/06/17 11:49:33 1.446
@@ -231,6 +231,7 @@
int ap_standalone=0;
int ap_documentroot_check=1;
+int ap_configtestonly=0;
uid_t ap_user_id=0;
char *ap_user_name=NULL;
gid_t ap_group_id=0;
@@ -4634,7 +4635,6 @@
int REALMAIN(int argc, char *argv[])
{
int c;
-int configtestonly = 0;
int sock_in;
int sock_out;
char *s;
@@ -4743,7 +4743,7 @@
ap_dump_settings = 1;
break;
case 't':
- configtestonly = 1;
+ ap_configtestonly = 1;
break;
case 'h':
usage(argv[0]);
@@ -4755,7 +4755,7 @@
ap_suexec_enabled = init_suexec();
server_conf = ap_read_config(pconf, ptrans, ap_server_confname);
-if (configtestonly) {
+if (ap_configtestonly) {
fprintf(stderr, Syntax OK\n);
exit(0);
}
@@ -6132,7 +6132,6 @@
char *s;
char *service_name = NULL;
int install = 0;
-int configtestonly = 0;
int conf_specified = 0;
char *signal_to_send = NULL;
char cwd[MAX_STRING_LEN];
@@ -6252,7 +6251,7 @@
++one_process; /* Weird debugging mode. */
break;
case 't':
- configtestonly = 1;
+ ap_configtestonly = 1;
break;
case 'h':
cvs commit: apache-apr/include apr_errno.h
rbb 99/06/17 08:05:25
Modified:apr configure.in
apr/include apr_config.h.in
apr/threadproc/unix Makefile.in proc.c threadproc.h
include apr_errno.h
Added: apr/threadproc/unix procsup.c
Log:
Unix can now create processes that are supposed to be detached. Not tested,
but I'll get to that later.
Revision ChangesPath
1.22 +1 -1 apache-apr/apr/configure.in
Index: configure.in
===
RCS file: /home/cvs/apache-apr/apr/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- configure.in 1999/06/16 11:15:56 1.21
+++ configure.in 1999/06/17 15:05:17 1.22
@@ -162,7 +162,7 @@
AC_FUNC_SETPGRP
dnl Checks for library functions.
-AC_CHECK_FUNCS(strcasecmp stricmp poll)
+AC_CHECK_FUNCS(strcasecmp stricmp poll setsid)
dnl Start building stuff from our information
AC_SUBST(LDLIBS)
1.8 +2 -1 apache-apr/apr/include/apr_config.h.in
Index: apr_config.h.in
===
RCS file: /home/cvs/apache-apr/apr/include/apr_config.h.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apr_config.h.in 1999/06/15 19:43:26 1.7
+++ apr_config.h.in 1999/06/17 15:05:19 1.8
@@ -73,7 +73,8 @@
#undef HAVE_MMAP
#undef HAVE_STRCASECMP
#undef HAVE_STRICMP
-
+#undef HAVE_POLL
+#undef HAVE_SETSID
/*
* Known problems with system header files that we can fix.
*/
1.4 +16 -5 apache-apr/apr/threadproc/unix/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/apache-apr/apr/threadproc/unix/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 1999/06/15 19:43:48 1.3
+++ Makefile.in 1999/06/17 15:05:21 1.4
@@ -17,6 +17,7 @@
LIB=../libthreadproc.a
OBJS=proc.o \
+ procsup.o \
thread.o \
threadcancel.o \
threadpriv.o \
@@ -57,16 +58,26 @@
# DO NOT REMOVE
proc.o: proc.c threadproc.h ../../../include/apr_thread_proc.h \
../../../include/apr_file_io.h ../../../include/apr_general.h \
- ../../../include/apr_errno.h ../../file_io/unix/fileio.h
+ $(INCDIR)/apr_config.h ../../../include/apr_errno.h \
+ ../../file_io/unix/fileio.h $(INCDIR)/apr_lib.h \
+ $(INCDIR)/hsregex.h
+procsup.o: procsup.c threadproc.h ../../../include/apr_thread_proc.h \
+ ../../../include/apr_file_io.h ../../../include/apr_general.h \
+ $(INCDIR)/apr_config.h ../../../include/apr_errno.h \
+ ../../file_io/unix/fileio.h $(INCDIR)/apr_lib.h \
+ $(INCDIR)/hsregex.h
signals.o: signals.c threadproc.h ../../../include/apr_thread_proc.h \
../../../include/apr_file_io.h ../../../include/apr_general.h \
- ../../../include/apr_errno.h ../../file_io/unix/fileio.h
+ $(INCDIR)/apr_config.h ../../../include/apr_errno.h \
+ ../../file_io/unix/fileio.h
thread.o: thread.c threadproc.h ../../../include/apr_thread_proc.h \
../../../include/apr_file_io.h ../../../include/apr_general.h \
- ../../../include/apr_errno.h
+ $(INCDIR)/apr_config.h ../../../include/apr_errno.h
threadcancel.o: threadcancel.c threadproc.h \
../../../include/apr_thread_proc.h ../../../include/apr_file_io.h \
- ../../../include/apr_general.h ../../../include/apr_errno.h
+ ../../../include/apr_general.h $(INCDIR)/apr_config.h \
+ ../../../include/apr_errno.h
threadpriv.o: threadpriv.c threadproc.h \
../../../include/apr_thread_proc.h ../../../include/apr_file_io.h \
- ../../../include/apr_general.h ../../../include/apr_errno.h
+ ../../../include/apr_general.h $(INCDIR)/apr_config.h \
+ ../../../include/apr_errno.h
1.18 +7 -0 apache-apr/apr/threadproc/unix/proc.c
Index: proc.c
===
RCS file: /home/cvs/apache-apr/apr/threadproc/unix/proc.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- proc.c1999/06/16 19:30:19 1.17
+++ proc.c1999/06/17 15:05:22 1.18
@@ -158,6 +158,7 @@
{
int i;
char **newargs;
+struct proc_t *pgrp;
(*new) = (struct proc_t *)ap_palloc(cont, sizeof(struct proc_t));
@@ -209,9 +210,15 @@
i++;
}
newargs[i + 3] = NULL;
+if (attr-detached) {
+ap_detach(attr-cntxt, pgrp);
+}
execve(SHELL_PATH, newargs, env);
}
else {
+if (attr-detached) {
+ap_detach(attr-cntxt, pgrp);
+}
execve(progname, args, env);
}
exit(-1); /* if we get here,
cvs commit: apache-apr/apr/time/win32 - New directory
rbb 99/06/17 08:33:19 apache-apr/apr/time/win32 - New directory
cvs commit: apache-1.3 configure
randy 99/06/17 10:45:00 Modified:.configure Log: Correct some english grammar. Revision ChangesPath 1.93 +4 -4 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- configure 1999/05/17 07:09:06 1.92 +++ configure 1999/06/17 17:44:59 1.93 @@ -991,14 +991,14 @@ exit 1 fi if [ x`$aux/getuid.sh` != x0 ]; then -echo + Warning: You enabled the suEXEC feature. Be aware that you need 12 -echo + root privileges for this, at the latest at the installation step. 12 +echo + Warning: You have enabled the suEXEC feature. Be aware that you need 12 +echo + root privileges to complete the final installation step. 12 fi fi if [ x$PERL = xno-perl-on-this-system ]; then if [ x$quiet = xno ]; then -echo + Warning: no Perl interpreter available for support scripts. -echo + Perhaps you have to select one with --with-perl=FILE. +echo + Warning: no Perl interpreter detected for support scripts. +echo + Perhaps you need to specify one with --with-perl=FILE. fi fi
cvs commit: apache-1.3/src/main util.c
coar99/06/17 15:58:17
Modified:src/main util.c
Log:
Cosmetic; style fix and a nit: I object to the implicit assumption
that NULL == 0, regardless of its validity.
Revision ChangesPath
1.165 +3 -2 apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- util.c1999/06/17 06:03:20 1.164
+++ util.c1999/06/17 22:58:16 1.165
@@ -128,9 +128,10 @@
const char *semi;
semi = strchr(intype, ';');
-if (!semi) {
+if (semi == NULL) {
return ap_pstrdup(p, intype);
-} else {
+}
+else {
while ((semi intype) ap_isspace(semi[-1])) {
semi--;
}
