cvs commit: apache-2.0/src/include httpd.h
manoj 99/12/07 16:14:06 Modified:src/include httpd.h Log: Fix even more -i - ap_context_t changes. Revision ChangesPath 1.14 +2 -2 apache-2.0/src/include/httpd.h Index: httpd.h === RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -u -r1.13 -r1.14 --- httpd.h 1999/11/17 21:39:23 1.13 +++ httpd.h 1999/12/08 00:14:03 1.14 @@ -381,7 +381,7 @@ #define SERVER_BASEVERSION Apache/2.0-dev /* SEE COMMENTS ABOVE */ #define SERVER_VERSION SERVER_BASEVERSION -/* TODO: re ap_context_t mplement the server token/version stuff -- it's part of http_core +/* TODO: re-implement the server token/version stuff -- it's part of http_core * it should be possible to do without touching http_main at all. (or else * we haven't got enough module hooks) */ @@ -542,7 +542,7 @@ #define ASCIITEXT_MAGIC_TYPE_PREFIX text/x-ascii- /* Text files whose content-type starts with this are passed thru unconverted */ #endif /*CHARSET_EBCDIC*/ #define MAP_FILE_MAGIC_TYPE application/x-type-map -#define ASIS_MAGIC_TYPE httpd/send-as ap_context_t s +#define ASIS_MAGIC_TYPE httpd/send-as-is #define DIR_MAGIC_TYPE httpd/unix-directory #define STATUS_MAGIC_TYPE application/x-httpd-status
cvs commit: apache-2.0/src/lib/apr/misc/os2 misc.h Makefile.in getopt.c start.c
bjh 99/12/07 17:00:51
Modified:src/lib/apr/misc/os2 misc.h
Removed: src/lib/apr/misc/os2 Makefile.in getopt.c start.c
Log:
Clean out OS/2 version of APR misc library.
Revision ChangesPath
1.4 +1 -15 apache-2.0/src/lib/apr/misc/os2/misc.h
Index: misc.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/os2/misc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- misc.h1999/11/20 22:05:14 1.3
+++ misc.h1999/12/08 01:00:38 1.4
@@ -53,18 +53,4 @@
*
*/
-#ifndef MISC_H
-#define MISC_H
-
-#include apr_general.h
-#include apr_file_io.h
-#include apr_errno.h
-#include apr_getopt.h
-
-struct context_t {
-struct ap_pool_t *pool;
-void *prog_data;
-};
-
-#endif /* ! MISC_H */
-
+#include ../unix/misc.h
cvs commit: apache-devsite/apidoc api.list dict-ap_push_array.html dict-array_header.html mkapidict
coar99/12/08 06:54:36
Modified:apidoc api.list dict-ap_push_array.html
dict-array_header.html mkapidict
Log:
Add a wee bit of documentation for arrays.
Revision ChangesPath
1.11 +22 -1 apache-devsite/apidoc/api.list
Index: api.list
===
RCS file: /home/cvs/apache-devsite/apidoc/api.list,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- api.list 1999/03/31 23:48:34 1.10
+++ api.list 1999/12/08 14:54:31 1.11
@@ -964,7 +964,28 @@
int nalloc; \n \
char *elts; \n \
} array_header;\
-|\
+|typedef struct item_t { \n \
+int length;\n \
+char *string; \n \
+} item_t;\n \
+:\n \
+array_header *item_array1; \n \
+item_t *item; \n \
+:\n \
+item_array1 = ap_make_array(p, 4, sizeof(item_t));\n \
+:\n \
+item = ap_push_array(item_array1);\n \
+item-gt;length = 1;\n \
+item-gt;string = a;\n \
+:\n \
+item_t *list;\n \
+\n \
+list = (item_t *) item_array1-gt;elts;\n \
+for (i = 0; i lt; item_array1-gt;nelts; ++i) {\n \
+item = list[i];\n \
+fprintf(stderr, Item %d: length=%d, string='%s'\\n,\n \
+i, item-gt;length, item-gt;string);\n \
+}\n \
|SA-array\
|
R|ap_array_cat\
1.3 +7 -6 apache-devsite/apidoc/dict-ap_push_array.html
Index: dict-ap_push_array.html
===
RCS file: /home/cvs/apache-devsite/apidoc/dict-ap_push_array.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dict-ap_push_array.html 1999/03/30 22:11:42 1.2
+++ dict-ap_push_array.html 1999/12/08 14:54:31 1.3
@@ -1,6 +1,7 @@
-P
-Allocates more memory for the additional array element(s).
-/P
-P
-Returns a pointer to the next element of EMarr/EM.
-/P
+p
+Allocates more memory for the additional array element and adds
+it to the end of the array.
+/p
+p
+Returns a pointer to the newly-created element of iarr/i.
+/p
1.2 +4 -4 apache-devsite/apidoc/dict-array_header.html
Index: dict-array_header.html
===
RCS file: /home/cvs/apache-devsite/apidoc/dict-array_header.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dict-array_header.html1999/03/06 18:17:23 1.1
+++ dict-array_header.html1999/12/08 14:54:32 1.2
@@ -1,4 +1,4 @@
-P
-/P
-P
-/P
+p
+/p
+p
+/p
1.7 +88 -112 apache-devsite/apidoc/mkapidict
Index: mkapidict
===
RCS file: /home/cvs/apache-devsite/apidoc/mkapidict,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mkapidict 1999/03/31 23:48:45 1.6
+++ mkapidict 1999/12/08 14:54:32 1.7
@@ -31,6 +31,8 @@
#
# Edit history:
#
+# 1999-12-08 Ken Coar
+# Downcase the HTML tags and do some line merging.
# 1999-03-31 Ken Coar
# Get rid of the ARGV processing and use command-line options
# instead. Add a third level of layout; 0 now means 'full,'
@@ -198,27 +200,19 @@
verbose(Dumping prologue.);
print $ofh @Prologue;
print $ofh EOHT;
- H2Table of Contents/H2
- UL
- LIA HREF=#RoutinesRoutine Descriptions/A
- /LI
- LIA HREF=#StructuresData Structure Definitions/A
- /LI
- LIA HREF=#CellsGlobal Data Cells/A
- /LI
- LIA HREF=#ConstantsConstant Definitions/A
- /LI
- /UL
- HR
+ h2Table of Contents/h2
+ ul
+ lia href=#RoutinesRoutine Descriptions/a/li
+ lia href=#StructuresData Structure Definitions/a/li
+ lia href=#CellsGlobal Data Cells/a/li
+ lia href=#ConstantsConstant Definitions/a/li
+ /ul
+ hr
EOHT
print $ofh EOHT;
- H2
- A NAME=Routines
-Routine Descriptions
- /A
- /H2
- HR
+ h2a name=RoutinesRoutine Descriptions/a/h2
+ hr
EOHT
verbose(Dumping routines.);
@@ -226,12 +220,8 @@
dump_list('R', %Routine);
print $ofh EOHT;
- H2
- A NAME=Structures
-Data Structure Definitions
- /A
- /H2
- HR
+ h2a name=StructuresData Structure Definitions/a/h2
+ hr
EOHT
verbose(Dumping structures.);
@@ -239,12 +229,8 @@
dump_list('S', %Structure);
print $ofh EOHT;
- H2
- A NAME=Cells
-Global Data Cells
- /A
- /H2
- HR
+ h2a name=CellsGlobal Data Cells/a/h2
+ hr
EOHT
verbose(Dumping data cells.);
@@ -252,30 +238,26 @@
dump_list('D', %Cell);
print $ofh EOHT;
- H2
- A NAME=Constants
-Constant Definitions
- /A
- /H2
- P
+ h2a name=ConstantsConstant Definitions/a/h2
+ p
Many of the compile-time
cvs commit: apache-1.3 STATUS
coar99/12/08 09:18:37 Modified:.STATUS Log: Add Youichirou Koga's AddCharset patch to what's available. Revision ChangesPath 1.761 +5 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.760 retrieving revision 1.761 diff -u -r1.760 -r1.761 --- STATUS1999/12/06 21:48:40 1.760 +++ STATUS1999/12/08 17:18:34 1.761 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/06 21:48:40 $] + Last modified at [$Date: 1999/12/08 17:18:34 $] Release: @@ -42,6 +42,10 @@ Available Patches: +* Youichirou Koga's patch to add AddCharset to mod_mime. + Message-ID: 384E91DF.D92FABC2.Golux.Com + Status: Ken +1 + * Andrew Ford's patch (1999/12/05) to add absolute times to mod_expires Message-ID: [EMAIL PROTECTED] Status:
cvs commit: apache-1.3/src/main http_main.c
stoddard99/12/08 10:51:06
Modified:src/main http_main.c
Log:
I like David Whitmarsh's fix for this a bit better.
Revision ChangesPath
1.483 +1 -1 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -r1.482 -r1.483
--- http_main.c 1999/12/01 22:41:30 1.482
+++ http_main.c 1999/12/08 18:51:03 1.483
@@ -6135,7 +6135,7 @@
pCommand = ap_psprintf(p, \%s\ -Z %s -f \%s\, buf,
exit_event_name, ap_server_confname);
for (i = 1; i argc; i++) {
-pCommand = ap_psprintf(p, %s \%s\,pCommand, argv[i]);
+pCommand = ap_pstrcat(p, pCommand, \, argv[i], \, NULL);
}
/* Create a pipe to send socket info to the child */
cvs commit: apache-1.3/htdocs/manual/mod mod_actions.html
coar99/12/08 11:02:24
Modified:src CHANGES
src/modules/standard mod_actions.c
htdocs/manual/mod mod_actions.html
Log:
Add ability to handle arbitrary methods to Script directive.
Revision ChangesPath
1.1473+6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1472
retrieving revision 1.1473
diff -u -r1.1472 -r1.1473
--- CHANGES 1999/12/06 22:33:57 1.1472
+++ CHANGES 1999/12/08 19:01:13 1.1473
@@ -1,5 +1,11 @@
Changes with Apache 1.3.10
+ *) Enhance mod_actions' Script handling to be able to deal with
+ arbitrary methods and not just the well-known ones. This allows
+ experimental or organisation-private methods to be used without
+ waiting for Apache to catch up.
+ [Ken Coar]
+
*) Fix various compile time warnings in hashbang_emul code which
prevent successful compilation on OS/390 [Ovies Brabson
[EMAIL PROTECTED], Paul Gilmartin [EMAIL PROTECTED]]
1.32 +83 -21apache-1.3/src/modules/standard/mod_actions.c
Index: mod_actions.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_actions.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mod_actions.c 1999/01/01 19:05:06 1.31
+++ mod_actions.c 1999/12/08 19:01:48 1.32
@@ -87,8 +87,18 @@
#include util_script.h
typedef struct {
+char *method;
+char *script;
+} xmethod_t;
+
+/*
+ * HTTP methods are case-sensitive, so we can't use a table structure to
+ * track extension method mappings -- table keys are case-INsensitive.
+ */
+typedef struct {
table *action_types; /* Added with Action... */
char *scripted[METHODS]; /* Added with Script... */
+array_header *xmethods;/* Added with Script -- extension methods */
} action_dir_config;
module action_module;
@@ -96,11 +106,11 @@
static void *create_action_dir_config(pool *p, char *dummy)
{
action_dir_config *new =
-(action_dir_config *) ap_palloc(p, sizeof(action_dir_config));
+ (action_dir_config *) ap_palloc(p, sizeof(action_dir_config));
new-action_types = ap_make_table(p, 4);
memset(new-scripted, 0, sizeof(new-scripted));
-
+new-xmethods = ap_make_array(p, 4, sizeof(xmethod_t));
return new;
}
@@ -119,29 +129,56 @@
new-scripted[i] = add-scripted[i] ? add-scripted[i]
: base-scripted[i];
}
+new-xmethods = ap_append_arrays(p, add-xmethods, base-xmethods);
return new;
}
-static const char *add_action(cmd_parms *cmd, action_dir_config * m, char
*type,
+static const char *add_action(cmd_parms *cmd, action_dir_config *m, char
*type,
char *script)
{
ap_table_setn(m-action_types, type, script);
return NULL;
}
-static const char *set_script(cmd_parms *cmd, action_dir_config * m,
+static const char *set_script(cmd_parms *cmd, action_dir_config *m,
char *method, char *script)
{
int methnum;
methnum = ap_method_number_of(method);
-if (methnum == M_TRACE)
-return TRACE not allowed for Script;
-else if (methnum == M_INVALID)
-return Unknown method type for Script;
-else
+if (methnum == M_TRACE) {
+ return TRACE not allowed for Script;
+}
+else if (methnum != M_INVALID) {
m-scripted[methnum] = script;
-
+}
+else {
+ /*
+ * We used to return Unknown method type for Script
+ * but now we actually handle unknown methods.
+ */
+ xmethod_t *xm;
+ xmethod_t *list;
+ int i;
+
+ /*
+ * Scan through the list; if the method already has a script
+ * defined, overwrite it. Otherwise, add it.
+ */
+ list = (xmethod_t *) m-xmethods-elts;
+ for (i = 0; i m-xmethods-nelts; ++i) {
+ xm = list[i];
+ if (strcmp(method, xm-method) == 0) {
+ xm-script = script;
+ break;
+ }
+ }
+ if (i = m-xmethods-nelts) {
+ xm = ap_push_array(m-xmethods);
+ xm-method = method;
+ xm-script = script;
+ }
+}
return NULL;
}
@@ -164,41 +201,66 @@
/* Set allowed stuff */
for (i = 0; i METHODS; ++i) {
-if (conf-scripted[i])
-r-allowed |= (1 i);
+ if (conf-scripted[i]) {
+ r-allowed |= (1 i);
+ }
}
/* First, check for the method-handling scripts */
if (r-method_number == M_GET) {
-if
cvs commit: apache-2.0/src/os/win32 registry.c registry.h service.c main_win32.c
stoddard99/12/08 14:34:24
Modified:src Apache.dsp Apache.mak ApacheCore.dsp ApacheCore.mak
ApacheCore.def
src/os/win32 registry.c registry.h service.c main_win32.c
Log:
Win32: First cut at getting apache -k restart|shutdown and running apache as
a service working
Revision ChangesPath
1.2 +20 -4 apache-2.0/src/Apache.dsp
Index: Apache.dsp
===
RCS file: /home/cvs/apache-2.0/src/Apache.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Apache.dsp1999/08/24 05:34:12 1.1
+++ Apache.dsp1999/12/08 22:32:46 1.2
@@ -41,7 +41,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir
# ADD BASE CPP /nologo /W3 /GX /O2 /D WIN32 /D NDEBUG /D _CONSOLE /YX
/c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D WIN32 /D NDEBUG /D _CONSOLE /YX
/FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ./include /I ./lib/apr/include /D
NDEBUG /D WIN32 /D _CONSOLE /D WIN32_LEAN_AND_MEAN /YX /FD /c
# ADD BASE RSC /l 0x809 /d NDEBUG
# ADD RSC /l 0x809 /d NDEBUG
BSC32=bscmake.exe
@@ -49,7 +49,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console
/machine:I386
+# ADD LINK32 lib\apr\Release\aprlib.lib CoreR\ApacheCore.lib kernel32.lib
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:console /machine:I386
!ELSEIF $(CFG) == Apache - Win32 Debug
@@ -65,7 +65,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D WIN32 /D _DEBUG /D
_CONSOLE /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D WIN32 /D _DEBUG /D
_CONSOLE /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ./include /I
./lib/apr/include /D _DEBUG /D WIN32 /D _CONSOLE /D
WIN32_LEAN_AND_MEAN /YX /FD /c
# ADD BASE RSC /l 0x809 /d _DEBUG
# ADD RSC /l 0x809 /d _DEBUG
BSC32=bscmake.exe
@@ -73,7 +73,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console
/debug /machine:I386
+# ADD LINK32 lib\apr\debug\aprlib.lib CoreD\ApacheCore.lib kernel32.lib
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:console /debug /machine:I386
!ENDIF
@@ -88,10 +88,26 @@
SOURCE=.\os\win32\main_win32.c
# End Source File
+# Begin Source File
+
+SOURCE=.\os\win32\registry.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\os\win32\service.c
+# End Source File
# End Group
# Begin Group Header Files
# PROP Default_Filter h;hpp;hxx;hm;inl;fi;fd
+# Begin Source File
+
+SOURCE=.\os\win32\registry.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\os\win32\service.h
+# End Source File
# End Group
# Begin Group Resource Files
1.2 +136 -61 apache-2.0/src/Apache.mak
Index: Apache.mak
===
RCS file: /home/cvs/apache-2.0/src/Apache.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Apache.mak1999/08/24 05:34:12 1.1
+++ Apache.mak1999/12/08 22:32:50 1.2
@@ -25,6 +25,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF $(CFG) == Apache - Win32 Release
OUTDIR=.\ApacheR
@@ -46,62 +49,34 @@
CLEAN :
[EMAIL PROTECTED] $(INTDIR)\apache.res
[EMAIL PROTECTED] $(INTDIR)\main_win32.obj
+ [EMAIL PROTECTED] $(INTDIR)\registry.obj
+ [EMAIL PROTECTED] $(INTDIR)\service.obj
[EMAIL PROTECTED] $(INTDIR)\vc50.idb
[EMAIL PROTECTED] $(OUTDIR)\Apache.exe
$(OUTDIR) :
if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR)
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /D WIN32 /D NDEBUG /D _CONSOLE\
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ./include /I ./lib/apr/include /D\
+ NDEBUG /D WIN32 /D _CONSOLE /D WIN32_LEAN_AND_MEAN\
/Fp$(INTDIR)\Apache.pch /YX /Fo$(INTDIR)\\ /Fd$(INTDIR)\\ /FD /c
CPP_OBJS=.\ApacheR/
CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
- $(CPP) @
- $(CPP_PROJ) $
-
-
-.cpp{$(CPP_OBJS)}.obj::
- $(CPP) @
- $(CPP_PROJ) $
-
-
-.cxx{$(CPP_OBJS)}.obj::
- $(CPP) @
- $(CPP_PROJ) $
cvs commit: apache-1.3/src/os/tpf TPFExport
manoj 99/12/08 15:03:21
Modified:src CHANGES
src/include ap_config.h
src/main buff.c
src/modules/proxy proxy_cache.c proxy_ftp.c proxy_http.c
proxy_util.c
src/os/tpf TPFExport
Log:
Make mod_proxy work on TPF.
Submitted by: Joe Moenich [EMAIL PROTECTED]
Revision ChangesPath
1.1474+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1473
retrieving revision 1.1474
diff -u -d -u -r1.1473 -r1.1474
--- CHANGES 1999/12/08 19:01:13 1.1473
+++ CHANGES 1999/12/08 23:01:46 1.1474
@@ -1,5 +1,8 @@
Changes with Apache 1.3.10
+ *) mod_proxy now works on TPF.
+ [Joe Moenich [EMAIL PROTECTED]]
+
*) Enhance mod_actions' Script handling to be able to deal with
arbitrary methods and not just the well-known ones. This allows
experimental or organisation-private methods to be used without
1.278 +3 -0 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===
RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -d -u -r1.277 -r1.278
--- ap_config.h 1999/12/07 12:19:50 1.277
+++ ap_config.h 1999/12/08 23:02:23 1.278
@@ -937,6 +937,9 @@
/*#define USE_TPF_DAEMON*/
#define USE_TPF_SCOREBOARD
#define USE_TPF_SELECT
+#define S_IREAD S_IRUSR
+#define S_IWRITE S_IWUSR
+#define S_IEXEC S_IXUSR
#define crypt(buf,salt) ((char *)buf)
#undef offsetof
#define offsetof(s_type,field) ((size_t)(((s_type*)0)-field))
1.92 +1 -2 apache-1.3/src/main/buff.c
Index: buff.c
===
RCS file: /home/cvs/apache-1.3/src/main/buff.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -u -r1.91 -r1.92
--- buff.c1999/12/01 20:24:56 1.91
+++ buff.c1999/12/08 23:02:34 1.92
@@ -285,10 +285,9 @@
ap_check_signals();
if (fb-flags B_SOCKET) {
-alarm(rv = alarm(0));
FD_ZERO(fds);
FD_SET(fb-fd_in, fds);
-tv.tv_sec = rv+1;
+tv.tv_sec = 1;
tv.tv_usec = 0;
rv = ap_select(fb-fd_in + 1, fds, NULL, NULL, tv);
if (rv 0)
1.65 +29 -6 apache-1.3/src/modules/proxy/proxy_cache.c
Index: proxy_cache.c
===
RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_cache.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -u -r1.64 -r1.65
--- proxy_cache.c 1999/10/21 20:45:03 1.64
+++ proxy_cache.c 1999/12/08 23:02:43 1.65
@@ -73,6 +73,9 @@
#include sys/types.h
#include sys/stat.h
#endif
+#ifdef TPF
+#include os.h
+#endif
DEF_Explain
@@ -123,7 +126,7 @@
const char *cachedir, const char *cachesubdir);
static void help_proxy_garbage_coll(request_rec *r);
static int should_proxy_garbage_coll(request_rec *r);
-#if !defined(WIN32) !defined(MPE) !defined(OS2) !defined(NETWARE)
+#if !defined(WIN32) !defined(MPE) !defined(OS2) !defined(NETWARE)
!defined(TPF)
static void detached_proxy_garbage_coll(request_rec *r);
#endif
@@ -143,7 +146,7 @@
ap_block_alarms(); /* avoid SIGALRM on big cache cleanup */
if (should_proxy_garbage_coll(r))
-#if !defined(WIN32) !defined(MPE) !defined(OS2) !defined(NETWARE)
+#if !defined(WIN32) !defined(MPE) !defined(OS2) !defined(NETWARE)
!defined(TPF)
detached_proxy_garbage_coll(r);
#else
help_proxy_garbage_coll(r);
@@ -203,7 +206,7 @@
return 0;
}
-#if !defined(WIN32) !defined(MPE) !defined(OS2) !defined(NETWARE)
+#if !defined(WIN32) !defined(MPE) !defined(OS2) !defined(NETWARE)
!defined(TPF)
static void detached_proxy_garbage_coll(request_rec *r)
{
pid_t pid;
@@ -465,9 +468,19 @@
/* if (strlen(ent-d_name) != HASH_LEN) continue; */
/* under OS/2 use dirent's d_attr to identify a diretory */
-#ifdef OS2
+/* under TPF use stat to identify a directory */
+#if defined(OS2) || defined(TPF)
/* is it a directory? */
+#ifdef OS2
if (ent-d_attr A_DIR) {
+#elif defined(TPF)
+if (stat(filename, buf) == -1) {
+if (errno != ENOENT)
+ap_log_error(APLOG_MARK, APLOG_ERR, r-server,
+ proxy gc: stat(%s), filename);
+}
+if (S_ISDIR(buf.st_mode)) {
+#endif
char newcachedir[HUGE_STRING_LEN];
ap_snprintf(newcachedir, sizeof(newcachedir),
%s%s/,
cvs commit: apache-2.0/src/os/win32 util_win32.c
stoddard99/12/08 15:56:34 Modified:src/os/win32 util_win32.c Log: Add license statement to util_win32.c Revision ChangesPath 1.4 +57 -0 apache-2.0/src/os/win32/util_win32.c Index: util_win32.c === RCS file: /home/cvs/apache-2.0/src/os/win32/util_win32.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- util_win32.c 1999/10/11 14:20:48 1.3 +++ util_win32.c 1999/12/08 23:56:33 1.4 @@ -1,3 +1,60 @@ +/* + * Copyright (c) 1995-1999 The Apache Group. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in + *the documentation and/or other materials provided with the + *distribution. + * + * 3. All advertising materials mentioning features or use of this + *software must display the following acknowledgment: + *This product includes software developed by the Apache Group + *for use in the Apache HTTP server project (http://www.apache.org/). + * + * 4. The names Apache Server and Apache Group must not be used to + *endorse or promote products derived from this software without + *prior written permission. For written permission, please contact + *[EMAIL PROTECTED] + * + * 5. Products derived from this software may not be called Apache + *nor may Apache appear in their names without prior written + *permission of the Apache Group. + * + * 6. Redistributions of any form whatsoever must retain the following + *acknowledgment: + *This product includes software developed by the Apache Group + *for use in the Apache HTTP server project (http://www.apache.org/). + * + * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Group and was originally based + * on public domain software written at the National Center for + * Supercomputing Applications, University of Illinois, Urbana-Champaign. + * For more information on the Apache Group and the Apache HTTP server + * project, please see http://www.apache.org/. + * + */ + #include windows.h #include sys/stat.h #include stdarg.h
