cvs commit: apache-1.3/src/modules/standard mod_log_config.c
rse 98/09/22 02:20:00 Modified:src CHANGES src/modules/standard mod_log_config.c Log: Correct comment in mod_log_config.c about its internals. Submitted by: Elf Sternberg <[EMAIL PROTECTED]> Revision ChangesPath 1.1072+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1071 retrieving revision 1.1072 diff -u -r1.1071 -r1.1072 --- CHANGES 1998/09/21 20:44:41 1.1071 +++ CHANGES 1998/09/22 09:19:51 1.1072 @@ -1,5 +1,8 @@ Changes with Apache 1.3.3 + *) Correct comment in mod_log_config.c about its internals. + [Elf Sternberg <[EMAIL PROTECTED]>] + *) Avoid possible line overflow in Configure: Use an awkfile to handle the creation of modules.c [Jim Jagielski] 1.67 +3 -4 apache-1.3/src/modules/standard/mod_log_config.c Index: mod_log_config.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_log_config.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- mod_log_config.c 1998/08/03 09:15:12 1.66 +++ mod_log_config.c 1998/09/22 09:19:59 1.67 @@ -202,10 +202,9 @@ * multi_log_state is our per-(virtual)-server configuration. We store * an array of the logs we are going to use, each of type config_log_state. * If a default log format is given by LogFormat, store in default_format - * (backward compat. with mod_log_config). We also store a pointer to - * the logs specified for the main server for virtual servers, so that - * if this vhost has now logs defined, we can use the main server's - * logs instead. + * (backward compat. with mod_log_config). We also store for each virtual + * server a pointer to the logs specified for the main server, so that if this + * vhost has no logs defined, we can use the main server's logs instead. * * So, for the main server, config_logs contains a list of the log files * and server_config_logs in empty. For a vhost, server_config_logs
cvs commit: apache-site/dist .htaccess
coar98/09/22 08:14:21 Modified:dist .htaccess Log: Autosize the filename column; we've got some long ones here. Revision ChangesPath 1.8 +1 -0 apache-site/dist/.htaccess Index: .htaccess === RCS file: /export/home/cvs/apache-site/dist/.htaccess,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .htaccess 1998/07/22 21:03:49 1.7 +++ .htaccess 1998/09/22 15:14:21 1.8 @@ -1,3 +1,4 @@ +IndexOptions FancyIndexing NameWidth=* AddDescription "1.3b3 Win32 binary" apache_1.3b3_win32.exe AddDescription "1.3b3 Win32 docs & icons" apache_1.3b3_win32_ext.exe AddDescription "1.3b3 gzipped source" apache_1.3b3.tar.gz
cvs commit: apache-site/dist .htaccess
coar98/09/22 08:16:48 Modified:dist .htaccess Log: Aw, crap. www.apache.org is running a not-too-recent version of 1.3.2-dev.. too old for the IndexOptions change. Uncomment this when it gets updated. Revision ChangesPath 1.9 +1 -1 apache-site/dist/.htaccess Index: .htaccess === RCS file: /export/home/cvs/apache-site/dist/.htaccess,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .htaccess 1998/09/22 15:14:21 1.8 +++ .htaccess 1998/09/22 15:16:47 1.9 @@ -1,4 +1,4 @@ -IndexOptions FancyIndexing NameWidth=* +#IndexOptions FancyIndexing NameWidth=* AddDescription "1.3b3 Win32 binary" apache_1.3b3_win32.exe AddDescription "1.3b3 Win32 docs & icons" apache_1.3b3_win32_ext.exe AddDescription "1.3b3 gzipped source" apache_1.3b3.tar.gz
cvs commit: apache-1.3/src/main http_log.c
dgaudet 98/09/22 08:43:43
Modified:src/main http_log.c
Log:
ap_table_set() causes an ap_pstrdup() of both arguments, one of the
arguments is a constant and it's a waste to pstrdup it. Furthermore using
a static local buffer means there is a static limit to the message length.
Also, ap_pvsprintf() can get away with zero-copies of the output in most
cases, whereas ap_pstrdup() always copies the output at least once.
Unlike Ken's claim there's no "gyration" required by ap_pv?sprintf()
to figure out the string length. Clean this all up.
Revision ChangesPath
1.69 +2 -4 apache-1.3/src/main/http_log.c
Index: http_log.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_log.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- http_log.c1998/09/21 17:29:45 1.68
+++ http_log.c1998/09/22 15:43:42 1.69
@@ -441,10 +441,8 @@
va_start(args, fmt);
log_error_core(file, line, level, r->server, r, fmt, args);
if (ap_table_get(r->notes, "error-notes") == NULL) {
- char errstr[MAX_STRING_LEN];
-
- ap_vsnprintf(errstr, sizeof(errstr), fmt, args);
- ap_table_set(r->notes, "error-notes", errstr);
+ ap_table_setn(r->notes, "error-notes",
+ ap_pvsprintf(r->pool, fmt, args));
}
va_end(args);
}
cvs commit: apache-2.0/apache-nspr/modules/standard mod_status.c
dgaudet 98/09/22 09:12:07
Modified:apache-nspr Configuration
apache-nspr/include scoreboard.h
apache-nspr/main http_main.c
apache-nspr/modules/standard mod_status.c
Log:
get rid of some NSPR defines... this code can only be built for NSPR
Revision ChangesPath
1.3 +4 -4 apache-2.0/apache-nspr/Attic/Configuration
1.3 +2 -1 apache-2.0/apache-nspr/include/scoreboard.h
Index: scoreboard.h
===
RCS file: /export/home/cvs/apache-2.0/apache-nspr/include/scoreboard.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scoreboard.h 1998/06/30 08:57:06 1.2
+++ scoreboard.h 1998/09/22 16:12:06 1.3
@@ -97,7 +97,8 @@
unsigned short conn_count;
PRTime start_time;
PRTime stop_time;
-#ifndef NSPR
+/* XXX: need process time support under NSPR */
+#if 0
struct tms times;
#endif
char client[32]; /* Keep 'em small... */
1.3 +0 -3 apache-2.0/apache-nspr/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-2.0/apache-nspr/main/http_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- http_main.c 1998/06/30 08:57:07 1.2
+++ http_main.c 1998/09/22 16:12:06 1.3
@@ -707,9 +707,6 @@
if (r->sent_bodyct)
ap_bgetopt(r->connection->client, BO_BYTECT, &bs);
-#ifndef NSPR
-times(&ss->times);
-#endif
ss->access_count++;
ss->my_access_count++;
ss->conn_count++;
1.3 +5 -9 apache-2.0/apache-nspr/modules/standard/mod_status.c
Index: mod_status.c
===
RCS file:
/export/home/cvs/apache-2.0/apache-nspr/modules/standard/mod_status.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_status.c 1998/06/30 08:57:13 1.2
+++ mod_status.c 1998/09/22 16:12:07 1.3
@@ -118,12 +118,9 @@
#include "scoreboard.h"
#include "http_log.h"
-#ifdef NSPR
+/* XXX: should be able to fix this, no? */
#define NO_TIMES
-#endif
-
-
#ifdef NEXT
#if (NX_CURRENT_COMPILER_RELEASE == 410)
#ifdef m68k
@@ -291,9 +288,6 @@
if (r->header_only)
return 0;
-#ifndef NSPR
-ap_sync_scoreboard_image();
-#endif
for (i = 0; i < HARD_SERVER_LIMIT; ++i) {
score_record = ap_scoreboard_image->servers[i];
ps_record = ap_scoreboard_image->parent[i];
@@ -520,7 +514,8 @@
score_record.times.tms_cutime / tick,
score_record.times.tms_cstime / tick,
#endif
-#ifdef NSPR
+ /* XXX: need process time support under nspr */
+#if 1
0,
#else
difftime(nowtime, ps_record.last_rtime),
@@ -576,7 +571,8 @@
ap_rputs("?", r);
break;
}
-#ifdef NSPR
+ /* XXX: need process time support under NSPR */
+#if 1
ap_rprintf(r, "\n%.0f%ld",
(float)(nowtime-score_record.start_time)/
PR_USEC_PER_SEC, (long)req_time);
cvs commit: apache-2.0/nsprpub - Imported sources
dgaudet 98/09/22 09:24:12 Log: import current mozilla/nsprpub sources as of 19980922 Status: Vendor Tag: MOZILLA Release Tags: cvs19980922 U apache-2.0/nsprpub/Makefile N apache-2.0/nsprpub/Makefile.in U apache-2.0/nsprpub/makefile.win U apache-2.0/nsprpub/config/.cvsignore U apache-2.0/nsprpub/config/AIX.mk U apache-2.0/nsprpub/config/BSD_OS.mk N apache-2.0/nsprpub/config/DGUX.mk U apache-2.0/nsprpub/config/FreeBSD.mk U apache-2.0/nsprpub/config/HP-UX.mk U apache-2.0/nsprpub/config/IRIX.mk U apache-2.0/nsprpub/config/Linux.mk U apache-2.0/nsprpub/config/Makefile N apache-2.0/nsprpub/config/Makefile.in U apache-2.0/nsprpub/config/NCR.mk U apache-2.0/nsprpub/config/NEC.mk U apache-2.0/nsprpub/config/NEWS-OS.mk N apache-2.0/nsprpub/config/NetBSD.mk U apache-2.0/nsprpub/config/OS2.mk U apache-2.0/nsprpub/config/OSF1.mk U apache-2.0/nsprpub/config/Rhapsody.mk U apache-2.0/nsprpub/config/SCOOS.mk U apache-2.0/nsprpub/config/SINIX.mk U apache-2.0/nsprpub/config/SunOS.mk U apache-2.0/nsprpub/config/SunOS4.mk U apache-2.0/nsprpub/config/SunOS5.mk U apache-2.0/nsprpub/config/UNIX.mk U apache-2.0/nsprpub/config/UNIXWARE.mk U apache-2.0/nsprpub/config/WIN32.mk U apache-2.0/nsprpub/config/WIN95.mk U apache-2.0/nsprpub/config/WINNT.mk U apache-2.0/nsprpub/config/arch.mk N apache-2.0/nsprpub/config/autoconf.mk.in U apache-2.0/nsprpub/config/config.mk U apache-2.0/nsprpub/config/libc_r.h U apache-2.0/nsprpub/config/module.df U apache-2.0/nsprpub/config/nfspwd.pl U apache-2.0/nsprpub/config/nsinstall.c U apache-2.0/nsprpub/config/pathsub.c U apache-2.0/nsprpub/config/pathsub.h U apache-2.0/nsprpub/config/prmkdir.bat U apache-2.0/nsprpub/config/rules.mk U apache-2.0/nsprpub/config/win16.mk N apache-2.0/nsprpub/include/config.h.in U apache-2.0/nsprpub/lib/Makefile N apache-2.0/nsprpub/lib/Makefile.in N apache-2.0/nsprpub/lib/ds/MANIFEST U apache-2.0/nsprpub/lib/ds/Makefile N apache-2.0/nsprpub/lib/ds/Makefile.in U apache-2.0/nsprpub/lib/ds/export.mac U apache-2.0/nsprpub/lib/ds/plarena.c U apache-2.0/nsprpub/lib/ds/plarena.h U apache-2.0/nsprpub/lib/ds/plarenas.h U apache-2.0/nsprpub/lib/ds/plevent.c U apache-2.0/nsprpub/lib/ds/plevent.h U apache-2.0/nsprpub/lib/ds/plhash.c U apache-2.0/nsprpub/lib/ds/plhash.h N apache-2.0/nsprpub/lib/ds/plvector.c N apache-2.0/nsprpub/lib/ds/plvector.h U apache-2.0/nsprpub/lib/libc/Makefile N apache-2.0/nsprpub/lib/libc/Makefile.in U apache-2.0/nsprpub/lib/libc/README N apache-2.0/nsprpub/lib/libc/include/MANIFEST U apache-2.0/nsprpub/lib/libc/include/Makefile N apache-2.0/nsprpub/lib/libc/include/Makefile.in U apache-2.0/nsprpub/lib/libc/include/README U apache-2.0/nsprpub/lib/libc/include/export.mac U apache-2.0/nsprpub/lib/libc/include/plbase64.h U apache-2.0/nsprpub/lib/libc/include/plerror.h U apache-2.0/nsprpub/lib/libc/include/plgetopt.h U apache-2.0/nsprpub/lib/libc/include/plresolv.h U apache-2.0/nsprpub/lib/libc/include/plstr.h U apache-2.0/nsprpub/lib/libc/src/Makefile N apache-2.0/nsprpub/lib/libc/src/Makefile.in U apache-2.0/nsprpub/lib/libc/src/README U apache-2.0/nsprpub/lib/libc/src/base64.c U apache-2.0/nsprpub/lib/libc/src/plerror.c U apache-2.0/nsprpub/lib/libc/src/plgetopt.c U apache-2.0/nsprpub/lib/libc/src/strcat.c U apache-2.0/nsprpub/lib/libc/src/strccmp.c U apache-2.0/nsprpub/lib/libc/src/strchr.c U apache-2.0/nsprpub/lib/libc/src/strcmp.c U apache-2.0/nsprpub/lib/libc/src/strcpy.c U apache-2.0/nsprpub/lib/libc/src/strcstr.c U apache-2.0/nsprpub/lib/libc/src/strdup.c U apache-2.0/nsprpub/lib/libc/src/strlen.c U apache-2.0/nsprpub/lib/libc/src/strpbrk.c U apache-2.0/nsprpub/lib/libc/src/strstr.c U apache-2.0/nsprpub/lib/msgc/Makefile N apache-2.0/nsprpub/lib/msgc/Makefile.in N apache-2.0/nsprpub/lib/msgc/include/MANIFEST U apache-2.0/nsprpub/lib/msgc/include/Makefile N apache-2.0/nsprpub/lib/msgc/include/Makefile.in U apache-2.0/nsprpub/lib/msgc/include/export.mac U apache-2.0/nsprpub/lib/msgc/include/gcint.h U apache-2.0/nsprpub/lib/msgc/include/prgc.h U apache-2.0/nsprpub/lib/msgc/src/Makefile N apache-2.0/nsprpub/lib/msgc/src/Makefile.in U apache-2.0/nsprpub/lib/msgc/src/macgc.c U apache-2.0/nsprpub/lib/msgc/src/os2gc.c U apache-2.0/nsprpub/lib/msgc/src/prgcapi.c U apache-2.0/nsprpub/lib/msgc/src/prmsgc.c U apache-2.0/nsprpub/lib/msgc/src/unixgc.c U apache-2.0/nsprpub/lib/msgc/src/win16gc.c U apache-2.0/nsprpub/lib/msgc/src/win32gc.c U apache-2.0/nsprpub/lib/msgc/tests/Makefile N apache-2.0/nsprpub/lib/msgc/tests/Makefile.in U apache-2.0/nsprpub/lib/msgc/tests/gc1.c U apache-2.0/nsprpub/lib/msgc/tests/thrashgc.c U apache-2.0/nsprpub/lib/prstreams/Makefile N apache-2.0/nsprpub/lib/prstreams/Makefile.in U apache-2.0/nsprpub/lib/prstreams/prstrms.cpp U apache-2.0/nsprpub/lib/prstreams/prstrms.h U apache-2.0/nsprpub
cvs commit: apache-2.0/nsprpub/pr/include prthread.h
dgaudet 98/09/22 09:27:38 Modified:nsprpub/pr/include prthread.h Log: merge up to MOZILLA cvs19980922 tag Revision ChangesPath 1.3 +5 -5 apache-2.0/nsprpub/pr/include/prthread.h Index: prthread.h === RCS file: /export/home/cvs/apache-2.0/nsprpub/pr/include/prthread.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- prthread.h1998/09/05 16:54:15 1.2 +++ prthread.h1998/09/22 16:27:38 1.3 @@ -185,19 +185,19 @@ /* ** Define some per-thread-private data. -** "index" is an index into the per-thread private data table +** "tpdIndex" is an index into the per-thread private data table ** "priv" is the per-thread-private data ** ** If the per-thread private data table has a previously registered ** destructor function and a non-NULL per-thread-private data value, ** the destructor function is invoked. ** -** This can return PR_FAILURE if index is invalid. +** This can return PR_FAILURE if the index is invalid. */ -PR_EXTERN(PRStatus) PR_SetThreadPrivate(PRUintn indexx, void *priv); +PR_EXTERN(PRStatus) PR_SetThreadPrivate(PRUintn tpdIndex, void *priv); /* -** Recover the per-thread-private data for the current thread. "index" is +** Recover the per-thread-private data for the current thread. "tpdIndex" is ** the index into the per-thread private data table. ** ** The returned value may be NULL which is indistinguishable from an error @@ -205,7 +205,7 @@ ** ** A thread can only get access to its own thread-specific-data. */ -PR_EXTERN(void*) PR_GetThreadPrivate(PRUintn indexx); +PR_EXTERN(void*) PR_GetThreadPrivate(PRUintn tpdIndex); /* ** This routine sets the interrupt request for a target thread. The interrupt
cvs commit: apache-2.0/apache-nspr HOWTOBUILD
dgaudet 98/09/22 09:38:42 Modified:apache-nspr HOWTOBUILD Log: we can build with the included nspr again Revision ChangesPath 1.3 +2 -11 apache-2.0/apache-nspr/HOWTOBUILD Index: HOWTOBUILD === RCS file: /export/home/cvs/apache-2.0/apache-nspr/HOWTOBUILD,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- HOWTOBUILD1998/09/19 19:15:42 1.2 +++ HOWTOBUILD1998/09/22 16:38:42 1.3 @@ -1,18 +1,9 @@ This is a temporary note for developers during the 2.0 development process. -N.B.: The version of NSPR included in Apache 2.0 is no longer sufficient. Use -the latest version from Mozilla. - -First, build nspr: - -cvs -d :pserver:[EMAIL PROTECTED]:/cvsroot co mozilla/nsprpub - -(I've forgotten the password - see http://www.mozilla.org). - -cd mozilla/nsprpub +cd apache-2.0/nsprpub make (or gmake) (use -DBUILD_OPT=1 to build optimised) -This produces a directory .../mozilla/dist/_DBG.OBJ, containing +This produces a directory apache-2.0/dist/_DBG.OBJ, containing include and lib. Tweak .../apache-2.0/apache-nspr/Configuration to reflect this path (use full pathnames). Note that Configuration.tmpl is currently bullshit - use one of Configuration.ben or Configuration.dean as a basis (note that Dean
cvs commit: apache-2.0/apache-nspr - Imported sources
dgaudet 98/09/22 09:47:32 Log: import apache-1.3.3-dev sources as of 19980922 Status: Vendor Tag: APACHE Release Tags: APACHE_1_3_19980922 U apache-2.0/apache-nspr/.cvsignore U apache-2.0/apache-nspr/.gdbinit U apache-2.0/apache-nspr/Apache.dsp U apache-2.0/apache-nspr/Apache.mak U apache-2.0/apache-nspr/ApacheCore.def U apache-2.0/apache-nspr/ApacheCore.dsp U apache-2.0/apache-nspr/ApacheCore.mak N apache-2.0/apache-nspr/BUILD.NOTES U apache-2.0/apache-nspr/CHANGES C apache-2.0/apache-nspr/Configuration.tmpl U apache-2.0/apache-nspr/Configure U apache-2.0/apache-nspr/INDENT U apache-2.0/apache-nspr/INSTALL U apache-2.0/apache-nspr/Makefile.nt C apache-2.0/apache-nspr/Makefile.tmpl U apache-2.0/apache-nspr/PORTING U apache-2.0/apache-nspr/README U apache-2.0/apache-nspr/README.EBCDIC U apache-2.0/apache-nspr/buildmark.c U apache-2.0/apache-nspr/ap/.cvsignore U apache-2.0/apache-nspr/ap/.indent.pro C apache-2.0/apache-nspr/ap/Makefile.tmpl C apache-2.0/apache-nspr/ap/ap.dsp C apache-2.0/apache-nspr/ap/ap.mak U apache-2.0/apache-nspr/ap/ap_cpystrn.c U apache-2.0/apache-nspr/ap/ap_execve.c N apache-2.0/apache-nspr/ap/ap_fnmatch.c U apache-2.0/apache-nspr/ap/ap_signal.c U apache-2.0/apache-nspr/ap/ap_slack.c C apache-2.0/apache-nspr/ap/ap_snprintf.c U apache-2.0/apache-nspr/main/.cvsignore U apache-2.0/apache-nspr/main/.indent.pro C apache-2.0/apache-nspr/main/Makefile.tmpl C apache-2.0/apache-nspr/main/alloc.c C apache-2.0/apache-nspr/main/buff.c U apache-2.0/apache-nspr/main/gen_test_char.c U apache-2.0/apache-nspr/main/gen_test_char.dsp U apache-2.0/apache-nspr/main/gen_test_char.mak U apache-2.0/apache-nspr/main/gen_uri_delims.c U apache-2.0/apache-nspr/main/gen_uri_delims.dsp U apache-2.0/apache-nspr/main/gen_uri_delims.mak C apache-2.0/apache-nspr/main/http_config.c C apache-2.0/apache-nspr/main/http_core.c C apache-2.0/apache-nspr/main/http_log.c C apache-2.0/apache-nspr/main/http_main.c C apache-2.0/apache-nspr/main/http_protocol.c C apache-2.0/apache-nspr/main/http_request.c U apache-2.0/apache-nspr/main/http_vhost.c U apache-2.0/apache-nspr/main/md5c.c C apache-2.0/apache-nspr/main/rfc1413.c C apache-2.0/apache-nspr/main/util.c C apache-2.0/apache-nspr/main/util_date.c C apache-2.0/apache-nspr/main/util_md5.c C apache-2.0/apache-nspr/main/util_script.c U apache-2.0/apache-nspr/main/util_uri.c N apache-2.0/apache-nspr/helpers/MakeEtags U apache-2.0/apache-nspr/helpers/CutRule U apache-2.0/apache-nspr/helpers/GuessOS U apache-2.0/apache-nspr/helpers/MakeLint U apache-2.0/apache-nspr/helpers/PrintPath U apache-2.0/apache-nspr/helpers/TestCompile N apache-2.0/apache-nspr/helpers/buildinfo.sh N apache-2.0/apache-nspr/helpers/checkheader.sh U apache-2.0/apache-nspr/helpers/dummy.c U apache-2.0/apache-nspr/helpers/find-dbm-lib N apache-2.0/apache-nspr/helpers/findcpp.sh U apache-2.0/apache-nspr/helpers/fmn.sh U apache-2.0/apache-nspr/helpers/fp2rp U apache-2.0/apache-nspr/helpers/install.sh U apache-2.0/apache-nspr/helpers/mfhead U apache-2.0/apache-nspr/helpers/mkdir.sh U apache-2.0/apache-nspr/helpers/mkshadow.sh U apache-2.0/apache-nspr/helpers/ppl.sh N apache-2.0/apache-nspr/helpers/slo.sh U apache-2.0/apache-nspr/include/.cvsignore U apache-2.0/apache-nspr/include/.indent.pro C apache-2.0/apache-nspr/include/alloc.h C apache-2.0/apache-nspr/include/ap.h N apache-2.0/apache-nspr/include/ap_compat.h N apache-2.0/apache-nspr/include/ap_config.h N apache-2.0/apache-nspr/include/ap_ctype.h U apache-2.0/apache-nspr/include/ap_md5.h N apache-2.0/apache-nspr/include/ap_mmn.h C apache-2.0/apache-nspr/include/buff.h U apache-2.0/apache-nspr/include/compat.h C apache-2.0/apache-nspr/include/conf.h U apache-2.0/apache-nspr/include/explain.h U apache-2.0/apache-nspr/include/fnmatch.h C apache-2.0/apache-nspr/include/hsregex.h C apache-2.0/apache-nspr/include/http_conf_globals.h U apache-2.0/apache-nspr/include/http_config.h U apache-2.0/apache-nspr/include/http_core.h C apache-2.0/apache-nspr/include/http_log.h U apache-2.0/apache-nspr/include/http_main.h C apache-2.0/apache-nspr/include/http_protocol.h C apache-2.0/apache-nspr/include/http_request.h U apache-2.0/apache-nspr/include/http_vhost.h C apache-2.0/apache-nspr/include/httpd.h U apache-2.0/apache-nspr/include/multithread.h U apache-2.0/apache-nspr/include/rfc1413.h C apache-2.0/apache-nspr/include/scoreboard.h U apache-2.0/apache-nspr/include/util_date.h C apache-2.0/apache-nspr/include/util_md5.h C apache-2.0/apache-nspr/include/util_script.h U apache-2.0/apache-nspr/include/util_uri.h U apache-2.0/apache-nspr/modules/.cvsignore U apache-2.0/apache-nspr/modules/README U apache-2.0/apache-nspr/modules/example/.cvsignore U apache-2.0/apache-nspr/modules/example/.indent.pro U apache-2.0/apache-nspr/modules/example
Re: cvs commit: apache-2.0/apache-nspr/modules/standard mod_status.c
[EMAIL PROTECTED] wrote: > +/* XXX: need process time support under NSPR */ I presume you really mean thread time? Can this be done at all (portably)? Cheers, Ben. -- Ben Laurie|Phone: +44 (181) 735 0686| Apache Group member Freelance Consultant |Fax: +44 (181) 735 0689|http://www.apache.org/ and Technical Director|Email: [EMAIL PROTECTED] | A.L. Digital Ltd, |Apache-SSL author http://www.apache-ssl.org/ London, England. |"Apache: TDG" http://www.ora.com/catalog/apache/ WE'RE RECRUITING! http://www.aldigital.co.uk/
cvs commit: apache-2.0/apache-nspr/os/win32 modules.c util_win32.c
dgaudet 98/09/22 11:05:55 Modified:apache-nspr Configuration.tmpl Makefile.tmpl apache-nspr/ap Makefile.tmpl ap.dsp ap_snprintf.c apache-nspr/include alloc.h ap.h ap_config.h buff.h hsregex.h http_conf_globals.h http_log.h http_protocol.h http_request.h httpd.h scoreboard.h util_md5.h apache-nspr/main Makefile.tmpl alloc.c buff.c http_config.c http_core.c http_log.c http_main.c http_protocol.c http_request.c rfc1413.c util.c util_date.c util_md5.c util_script.c apache-nspr/modules/example mod_example.c apache-nspr/modules/experimental mod_mmap_static.c apache-nspr/modules/proxy Makefile.tmpl proxy_cache.c proxy_connect.c proxy_ftp.c proxy_http.c apache-nspr/modules/standard Makefile.tmpl mod_access.c mod_actions.c mod_asis.c mod_auth.c mod_autoindex.c mod_cern_meta.c mod_cgi.c mod_digest.c mod_dir.c mod_expires.c mod_imap.c mod_include.c mod_info.c mod_log_config.c mod_mime.c mod_mime_magic.c mod_negotiation.c mod_rewrite.c mod_rewrite.h mod_so.c mod_speling.c mod_status.c mod_userdir.c apache-nspr/os/unix os.c apache-nspr/os/win32 modules.c util_win32.c Removed: apache-nspr/include conf.h Log: painful conflict resolution... I have not tried to compile this Revision ChangesPath 1.3 +27 -20apache-2.0/apache-nspr/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache-2.0/apache-nspr/Configuration.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Configuration.tmpl1998/06/30 08:57:04 1.2 +++ Configuration.tmpl1998/09/22 18:05:05 1.3 @@ -58,6 +58,7 @@ EXTRA_DEPS= #CC= +#CPP= #OPTIM= #RANLIB= @@ -72,8 +73,7 @@ # knowledge on how to compile these DSO files because this is # heavily platform-dependent. The current state of supported and # explicitly unsupported platforms can be found in the file -# "htdocs/manual/sharedobjects.html", under -# "Supported Platforms". +# "htdocs/manual/dso.html", under "Supported Platforms". # # For other platforms where you want to use the DSO mechanism you # first have to make sure it supports the pragmatic dlopen() @@ -90,6 +90,19 @@ # Then enable the DSO feature for particular modules individually # by replacing their `AddModule' command with `SharedModule' and # change the filename extension from `.o' to `.so'. +# +# Sometimes the DSO files need to be linked against other shared +# libraries to explicitly resolve symbols from them when the +# httpd program not already contains references to them. For +# instance when buidling mod_auth_db as a DSO you need to link +# the DSO against the libdb explicity because the Apache kernel +# has no references for this library. But the problem is that +# this "chaining" is not supported on all platforms. Although one +# usually can link a DSO against another DSO without linker +# complains the linkage is not really done on these platforms. +# So, when you receive "unresolved symbol" errors under runtime +# when using the LoadModule directive for a particular module try +# to enable the SHARED_CHAIN rule below. #CFLAGS_SHLIB= #LD_SHLIB= @@ -97,6 +110,7 @@ #LDFLAGS_SHLIB_EXPORT= Rule SHARED_CORE=default +Rule SHARED_CHAIN=default # Rules configuration @@ -105,7 +119,7 @@ # functions. The format is: Rule RULE=value # # At present, only the following RULES are known: WANTHSREGEX, SOCKS4, -# SOCKS5, STATUS, IRIXNIS, IRIXN32 and PARANOID. +# SOCKS5, IRIXNIS, IRIXN32 and PARANOID. # # For all Rules, if set to "yes", then Configure knows we want that # capability and does what is required to add it in. If set to "default" @@ -122,12 +136,6 @@ # location to EXTRA_LIBS, otherwise Configure will assume # "-L/usr/local/lib -lsocks5" # -# STATUS: -# If Configure determines that you are using the status_module, -# it will automatically enable full status information if set -# to 'yes'. If the status module is not included, having STATUS -# set to 'yes' has no impact. -# # IRIXNIS: # Only takes effect if Configure determines that you are running # SGI IRIX. If you are using a (ancient) 4.x version of IRIX, you @@ -148,7 +156,6 @@ # actually print-out the code that the modules execute # -Rule STATUS=yes Rule SOCKS4=no Rule SOCKS5=no Rule IRIX
cvs commit: apache-1.3 STATUS
coar98/09/22 11:26:53 Modified:.STATUS Log: The change from __EMX__ to OS2 as the #define name has already happened. Revision ChangesPath 1.488 +0 -2 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.487 retrieving revision 1.488 diff -u -r1.487 -r1.488 --- STATUS1998/09/21 19:59:35 1.487 +++ STATUS1998/09/22 18:26:52 1.488 @@ -466,8 +466,6 @@ 3) byte range error handling 4) update the Accept-Encoding parser to allow q-values -* #ifdef __EMX__ --> #ifdef OS2. - * use of spawnvp in uncompress_child in mod_mime_magic - doesn't use the new child_info structure, is this still safe? Needs to be looked at.
cvs commit: apache-2.0/apache-nspr/modules/standard mod_cern_meta.c mod_include.c
dgaudet 98/09/22 11:33:53
Modified:apache-nspr/include ap_config.h
apache-nspr/main http_core.c http_main.c http_protocol.c
apache-nspr/modules/standard mod_cern_meta.c mod_include.c
Log:
it compiles now... but I haven't tried to run it
Revision ChangesPath
1.3 +7 -1 apache-2.0/apache-nspr/include/ap_config.h
Index: ap_config.h
===
RCS file: /export/home/cvs/apache-2.0/apache-nspr/include/ap_config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ap_config.h 1998/09/22 18:05:09 1.2
+++ ap_config.h 1998/09/22 18:33:49 1.3
@@ -63,10 +63,14 @@
#endif
/*
- * conf.h: system-dependant #defines and includes...
+ * ap_config.h: system-dependant #defines and includes...
* See PORTING for a listing of what they mean
*/
+#include "ap_mmn.h" /* MODULE_MAGIC_NUMBER_ */
+
+#include "ap_config_auto.h"
+
#include
#include
@@ -160,6 +164,8 @@
#define HAVE_SYS_RESOURCE_H 1
#endif
#endif /* HAVE_SYS_RESOURCE_H */
+
+#include "ap_ctype.h"
#if defined(USE_HSREGEX)
#include "hsregex.h"
1.4 +0 -1 apache-2.0/apache-nspr/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-2.0/apache-nspr/main/http_core.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- http_core.c 1998/09/22 18:05:17 1.3
+++ http_core.c 1998/09/22 18:33:50 1.4
@@ -572,7 +572,6 @@
|| hostname_lookups != HOSTNAME_LOOKUP_OFF)) {
old_stat = ap_update_child_status(conn->child_num, SERVER_BUSY_DNS,
(request_rec*)NULL);
-#endif /* STATUS */
if (PR_GetHostByAddr(&conn->remote_addr, hentbuf, sizeof(hentbuf),
&hent)
== PR_SUCCESS) {
conn->remote_host = ap_pstrdup(conn->pool, hent.h_name);
1.5 +1 -1 apache-2.0/apache-nspr/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-2.0/apache-nspr/main/http_main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- http_main.c 1998/09/22 18:05:18 1.4
+++ http_main.c 1998/09/22 18:33:50 1.5
@@ -648,7 +648,7 @@
old_status = ss->status;
ss->status = status;
-if (ap_extended_server_status) {
+if (ap_extended_status) {
if (status == SERVER_READY || status == SERVER_DEAD) {
/*
* Reset individual counters
1.4 +2 -5 apache-2.0/apache-nspr/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache-2.0/apache-nspr/main/http_protocol.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- http_protocol.c 1998/09/22 18:05:18 1.3
+++ http_protocol.c 1998/09/22 18:33:51 1.4
@@ -881,9 +881,7 @@
}
conn->timeout_name = "read request headers";
if (!r->assbackwards) {
-ap_hard_timeout("read request headers", r);
get_mime_headers(r);
-ap_kill_timeout(r);
if (r->status != HTTP_REQUEST_TIME_OUT) {
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
"request failed: error reading the headers");
@@ -1582,9 +1580,8 @@
if (len_to_read == 0) { /* Last chunk indicated, get footers */
if (r->read_body == REQUEST_CHUNKED_DECHUNK) {
-if (!get_mime_headers(r)) {
- return -1;
- }
+ /* XXX: we need to test if there was an error ... */
+get_mime_headers(r);
ap_snprintf(buffer, bufsiz, "%ld", r->read_length);
ap_table_unset(r->headers_in, "Transfer-Encoding");
ap_table_setn(r->headers_in, "Content-Length",
1.4 +1 -1 apache-2.0/apache-nspr/modules/standard/mod_cern_meta.c
Index: mod_cern_meta.c
===
RCS file:
/export/home/cvs/apache-2.0/apache-nspr/modules/standard/mod_cern_meta.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_cern_meta.c 1998/09/22 18:05:33 1.3
+++ mod_cern_meta.c 1998/09/22 18:33:52 1.4
@@ -229,7 +229,7 @@
/* XXX: this is very similar to ap_scan_script_header_err_core...
* are the differences deliberate, or just a result of bit rot?
*/
-static int scan_meta_file(request_rec *r, FILE *f)
+static int scan_meta_file(request_rec *r, BUFF *f)
{
char w[MAX_STRING_LEN];
cha
cvs commit: apache-site/dist .htaccess
coar98/09/22 11:52:31 Modified:dist .htaccess Log: Okey, www.apache.org's up to the latest HEAD, so we can enable the long file names. Also clean up some of the AddDescription lines. (Thanks, Brian! :-) Revision ChangesPath 1.10 +5 -12 apache-site/dist/.htaccess Index: .htaccess === RCS file: /export/home/cvs/apache-site/dist/.htaccess,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .htaccess 1998/09/22 15:16:47 1.9 +++ .htaccess 1998/09/22 18:52:30 1.10 @@ -1,21 +1,14 @@ -#IndexOptions FancyIndexing NameWidth=* -AddDescription "1.3b3 Win32 binary" apache_1.3b3_win32.exe -AddDescription "1.3b3 Win32 docs & icons" apache_1.3b3_win32_ext.exe -AddDescription "1.3b3 gzipped source" apache_1.3b3.tar.gz -AddDescription "1.3b5 gzipped source" apache_1.3b5.tar.gz -AddDescription "1.3b5 compressed source" apache_1.3b5.tar.Z -AddDescription "1.3b6 compressed source" apache_1.3b6.tar.Z -AddDescription "1.3b6 gzipped source" apache_1.3b6.tar.gz -AddDescription "1.3b6 Win32 binary" apache_1_3b6_1.exe -AddDescription "1.2.5 compressed source" apache_1.2.5.tar.Z -AddDescription "1.2.5 gzipped source" apache_1.2.5.tar.gz +IndexOptions FancyIndexing NameWidth=* ScanHTMLTitles +AddDescription "1.2.6 compressed source" apache_1.2.6.tar.Z +AddDescription "1.2.6 gzipped source" apache_1.2.6.tar.gz AddDescription "1.3.1 compressed source" apache_1.3.1.tar.Z AddDescription "1.3.1 gzipped source" apache_1.3.1.tar.gz AddDescription "1.3.1 Win32 binary" apache_1_3_1.exe -AddDescription "List of changes in 1.3" /export/pub/apache/dist/CHANGES +AddDescription "List of changes in 1.3" /export/pub/apache/dist/CHANGES_1.3 AddDescription "List of changes in 1.2" /export/pub/apache/dist/CHANGES_1.2 AddDescription "Developer PGP keys" /export/pub/apache/dist/KEYS AddDescription "PGP signature" *.asc +AddDescription "Apache 1.3.1 Released" Announcement.txt AddDescription "Binary distributions" /export/pub/apache/dist/binaries AddDescription "Contributed software" /export/pub/apache/dist/contrib AddDescription "Old source & binaries" /export/pub/apache/dist/old
