ben 97/07/19 13:16:24
Modified: src ApacheCore.mak Makefile.nt alloc.h http_main.c
md5.h md5c.c mod_mime.c multithread.h util_date.c
util_date.h
src/modules/proxy mod_proxy.c mod_proxy.h proxy_cache.c
proxy_ftp.c
src/nt multithread.c
Added: src mod_mime.h
src/modules/proxy ApacheModuleProxy.mak
Log:
Make proxy into a module.
Revision Changes Path
1.6 +18 -3 apache/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /export/home/cvs/apache/src/ApacheCore.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -C3 -r1.5 -r1.6
*** ApacheCore.mak 1997/07/18 23:54:22 1.5
--- ApacheCore.mak 1997/07/19 20:16:11 1.6
***************
*** 997,1014 ****
# Begin Source File
SOURCE=.\md5c.c
- DEP_CPP_MD5C_=\
- ".\md5.h"\
-
!IF "$(CFG)" == "ApacheCore - Win32 Release"
"$(INTDIR)\md5c.obj" : $(SOURCE) $(DEP_CPP_MD5C_) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
"$(INTDIR)\md5c.obj" : $(SOURCE) $(DEP_CPP_MD5C_) "$(INTDIR)"
--- 997,1025 ----
# Begin Source File
SOURCE=.\md5c.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
+ DEP_CPP_MD5C_=\
+ ".\conf.h"\
+ ".\md5.h"\
+ ".\regex\regex.h"\
+ {$(INCLUDE)}"\sys\STAT.H"\
+ {$(INCLUDE)}"\sys\TYPES.H"\
+
"$(INTDIR)\md5c.obj" : $(SOURCE) $(DEP_CPP_MD5C_) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+ DEP_CPP_MD5C_=\
+ ".\conf.h"\
+ ".\md5.h"\
+ ".\regex\regex.h"\
+ {$(INCLUDE)}"\sys\STAT.H"\
+ {$(INCLUDE)}"\sys\TYPES.H"\
+
"$(INTDIR)\md5c.obj" : $(SOURCE) $(DEP_CPP_MD5C_) "$(INTDIR)"
***************
*** 1060,1066 ****
--- 1071,1080 ----
SOURCE=.\util_date.c
DEP_CPP_UTIL_D=\
+ ".\conf.h"\
+ ".\regex\regex.h"\
".\util_date.h"\
+ {$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
***************
*** 1403,1408 ****
--- 1417,1423 ----
".\conf.h"\
".\http_config.h"\
".\httpd.h"\
+ ".\mod_mime.h"\
".\nt\readdir.h"\
".\regex\regex.h"\
{$(INCLUDE)}"\sys\STAT.H"\
1.5 +14 -13 apache/src/Makefile.nt
Index: Makefile.nt
===================================================================
RCS file: /export/home/cvs/apache/src/Makefile.nt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C3 -r1.4 -r1.5
*** Makefile.nt 1997/07/18 23:54:23 1.4
--- Makefile.nt 1997/07/19 20:16:12 1.5
***************
*** 7,24 ****
# Ben, 5 July 97
_debug:
! cd modules\proxy & set CFG=proxy - Win32 Debug& nmake -f proxy.mak
! cd regex & set CFG=regex - Win32 Debug& nmake -f regex.mak
! cd . & set CFG=ApacheCore - Win32 Debug& nmake -f ApacheCore.mak
! cd . & set CFG=Apache - Win32 Debug& nmake -f Apache.mak
! cd nt & set CFG=ApacheModuleStatus - Win32 Debug& nmake -f
ApacheModuleStatus.mak
! # cd nt & set CFG=ApacheModuleInfo - Win32 Debug& nmake -f
ApacheModuleInfo.mak
! cd nt & set CFG=ApacheModuleAuthAnon - Win32 Debug& nmake -f
ApacheModuleAuthAnon.mak
! cd nt & set CFG=ApacheModuleDigest - Win32 Debug& nmake -f
ApacheModuleDigest.mak
! cd nt & set CFG=ApacheModuleCERNMeta - Win32 Debug& nmake -f
ApacheModuleCERNMeta.mak
! cd nt & set CFG=ApacheModuleExpires - Win32 Debug& nmake -f
ApacheModuleExpires.mak
! cd nt & set CFG=ApacheModuleHeaders - Win32 Debug& nmake -f
ApacheModuleHeaders.mak
! cd nt & set CFG=ApacheModuleUserTrack - Win32 Debug& nmake -f
ApacheModuleUserTrack.mak
installd: _debug
--- 7,24 ----
# Ben, 5 July 97
_debug:
! cd regex & set CFG=regex - Win32 Debug& nmake /nologo -f regex.mak
! cd . & set CFG=ApacheCore - Win32 Debug& nmake /nologo -f ApacheCore.mak
! cd . & set CFG=Apache - Win32 Debug& nmake /nologo -f Apache.mak
! cd nt & set CFG=ApacheModuleStatus - Win32 Debug& nmake /nologo -f
ApacheModuleStatus.mak
! # cd nt & set CFG=ApacheModuleInfo - Win32 Debug& nmake /nologo -f
ApacheModuleInfo.mak
! cd nt & set CFG=ApacheModuleAuthAnon - Win32 Debug& nmake /nologo -f
ApacheModuleAuthAnon.mak
! cd nt & set CFG=ApacheModuleDigest - Win32 Debug& nmake /nologo -f
ApacheModuleDigest.mak
! cd nt & set CFG=ApacheModuleCERNMeta - Win32 Debug& nmake /nologo -f
ApacheModuleCERNMeta.mak
! cd nt & set CFG=ApacheModuleExpires - Win32 Debug& nmake /nologo -f
ApacheModuleExpires.mak
! cd nt & set CFG=ApacheModuleHeaders - Win32 Debug& nmake /nologo -f
ApacheModuleHeaders.mak
! cd nt & set CFG=ApacheModuleUserTrack - Win32 Debug& nmake /nologo -f
ApacheModuleUserTrack.mak
! cd modules\proxy & set CFG=ApacheModuleProxy - Win32 Debug& nmake
/nologo -f ApacheModuleProxy.mak
installd: _debug
***************
*** 33,36 ****
copy nt\ApacheModuleCERNMetaD\ApacheModuleCERNMeta.dll \Apache\modules
copy nt\ApacheModuleExpiresD\ApacheModuleExpires.dll \Apache\modules
copy nt\ApacheModuleHeadersD\ApacheModuleHeaders.dll \Apache\modules
! copy nt\ApacheModuleUserTrackD\ApacheModuleUserTrack.dll \Apache\moduleS
--- 33,37 ----
copy nt\ApacheModuleCERNMetaD\ApacheModuleCERNMeta.dll \Apache\modules
copy nt\ApacheModuleExpiresD\ApacheModuleExpires.dll \Apache\modules
copy nt\ApacheModuleHeadersD\ApacheModuleHeaders.dll \Apache\modules
! copy nt\ApacheModuleUserTrackD\ApacheModuleUserTrack.dll \Apache\modules
! copy modules\proxy\Debug\ApacheModuleProxy.dll \Apache\modules
1.30 +2 -2 apache/src/alloc.h
Index: alloc.h
===================================================================
RCS file: /export/home/cvs/apache/src/alloc.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C3 -r1.29 -r1.30
*** alloc.h 1997/07/15 21:39:50 1.29
--- alloc.h 1997/07/19 20:16:12 1.30
***************
*** 203,210 ****
* up with timeout handling in general...
*/
! extern void block_alarms();
! extern void unblock_alarms();
/* Common cases which want utility support..
* the note_cleanups_for_foo routines are for
--- 203,210 ----
* up with timeout handling in general...
*/
! API_EXPORT(void) block_alarms();
! API_EXPORT(void) unblock_alarms();
/* Common cases which want utility support..
* the note_cleanups_for_foo routines are for
1.181 +2 -2 apache/src/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.180
retrieving revision 1.181
diff -C3 -r1.180 -r1.181
*** http_main.c 1997/07/17 22:27:30 1.180
--- http_main.c 1997/07/19 20:16:12 1.181
***************
*** 463,473 ****
* which is itself being cleared); we have to support that here.
*/
! void block_alarms() {
++alarms_blocked;
}
! void unblock_alarms() {
--alarms_blocked;
if (alarms_blocked == 0 && alarm_pending) {
alarm_pending = 0;
--- 463,473 ----
* which is itself being cleared); we have to support that here.
*/
! API_EXPORT(void) block_alarms() {
++alarms_blocked;
}
! API_EXPORT(void) unblock_alarms() {
--alarms_blocked;
if (alarms_blocked == 0 && alarm_pending) {
alarm_pending = 0;
1.5 +3 -3 apache/src/md5.h
Index: md5.h
===================================================================
RCS file: /export/home/cvs/apache/src/md5.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C3 -r1.4 -r1.5
*** md5.h 1997/01/01 18:10:23 1.4
--- md5.h 1997/07/19 20:16:13 1.5
***************
*** 93,99 ****
unsigned char buffer[64]; /* input buffer */
} MD5_CTX;
! extern void MD5Init(MD5_CTX *context);
! extern void MD5Update(MD5_CTX *context, const unsigned char *input,
unsigned int inputLen);
! extern void MD5Final(unsigned char digest[16], MD5_CTX *context);
--- 93,99 ----
unsigned char buffer[64]; /* input buffer */
} MD5_CTX;
! API_EXPORT(void) MD5Init(MD5_CTX *context);
! API_EXPORT(void) MD5Update(MD5_CTX *context, const unsigned char *input,
unsigned int inputLen);
! API_EXPORT(void) MD5Final(unsigned char digest[16], MD5_CTX *context);
1.5 +4 -6 apache/src/md5c.c
Index: md5c.c
===================================================================
RCS file: /export/home/cvs/apache/src/md5c.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C3 -r1.4 -r1.5
*** md5c.c 1997/01/01 18:10:24 1.4
--- md5c.c 1997/07/19 20:16:13 1.5
***************
*** 85,90 ****
--- 85,91 ----
#include <string.h>
+ #include "conf.h"
#include "md5.h"
/* Constants for MD5Transform routine.
***************
*** 157,164 ****
/* MD5 initialization. Begins an MD5 operation, writing a new context.
*/
! void
! MD5Init(MD5_CTX *context)
{
context->count[0] = context->count[1] = 0;
/* Load magic initialization constants. */
--- 158,164 ----
/* MD5 initialization. Begins an MD5 operation, writing a new context.
*/
! API_EXPORT(void) MD5Init(MD5_CTX *context)
{
context->count[0] = context->count[1] = 0;
/* Load magic initialization constants. */
***************
*** 172,179 ****
operation, processing another message block, and updating the
context.
*/
! void
! MD5Update(MD5_CTX *context, const unsigned char *input, unsigned int
inputLen)
{
unsigned int i, index, partLen;
--- 172,178 ----
operation, processing another message block, and updating the
context.
*/
! API_EXPORT(void) MD5Update(MD5_CTX *context, const unsigned char *input,
unsigned int inputLen)
{
unsigned int i, index, partLen;
***************
*** 208,215 ****
/* MD5 finalization. Ends an MD5 message-digest operation, writing the
the message digest and zeroizing the context.
*/
! void
! MD5Final(unsigned char digest[16], MD5_CTX *context)
{
unsigned char bits[8];
unsigned int index, padLen;
--- 207,213 ----
/* MD5 finalization. Ends an MD5 message-digest operation, writing the
the message digest and zeroizing the context.
*/
! API_EXPORT(void) MD5Final(unsigned char digest[16], MD5_CTX *context)
{
unsigned char bits[8];
unsigned int index, padLen;
1.20 +4 -0 apache/src/mod_mime.c
Index: mod_mime.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_mime.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C3 -r1.19 -r1.20
*** mod_mime.c 1997/07/17 22:27:39 1.19
--- mod_mime.c 1997/07/19 20:16:14 1.20
***************
*** 61,66 ****
--- 61,67 ----
#include "httpd.h"
#include "http_config.h"
+ #include "mod_mime.h"
typedef struct {
table *forced_types; /* Additional AddTyped stuff */
***************
*** 217,222 ****
--- 218,224 ----
fclose(f);
}
+ /* note that the proxy module uses this */
int find_ct(request_rec *r)
{
const char *fn = strrchr(r->filename, '/');
***************
*** 303,308 ****
--- 305,312 ----
return OK;
}
+ API_EXPORT(int) mime_find_ct(request_rec *r)
+ { return find_ct(r); }
module MODULE_VAR_EXPORT mime_module = {
STANDARD_MODULE_STUFF,
1.5 +5 -5 apache/src/multithread.h
Index: multithread.h
===================================================================
RCS file: /export/home/cvs/apache/src/multithread.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C3 -r1.4 -r1.5
*** multithread.h 1997/06/16 17:53:13 1.4
--- multithread.h 1997/07/19 20:16:15 1.5
***************
*** 24,34 ****
void free_thread(thread *thread_id);
! mutex *create_mutex(char *name);
! mutex *open_mutex(char *name);
! int acquire_mutex(mutex *mutex_id);
! int release_mutex(mutex *mutex_id);
! void destroy_mutex(mutex *mutex_id);
semaphore *create_semaphore(int initial);
--- 24,34 ----
void free_thread(thread *thread_id);
! API_EXPORT(mutex *) create_mutex(char *name);
! API_EXPORT(mutex *) open_mutex(char *name);
! API_EXPORT(int) acquire_mutex(mutex *mutex_id);
! API_EXPORT(int) release_mutex(mutex *mutex_id);
! API_EXPORT(void) destroy_mutex(mutex *mutex_id);
semaphore *create_semaphore(int initial);
1.4 +3 -2 apache/src/util_date.c
Index: util_date.c
===================================================================
RCS file: /export/home/cvs/apache/src/util_date.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C3 -r1.3 -r1.4
*** util_date.c 1997/01/01 18:10:45 1.3
--- util_date.c 1997/07/19 20:16:15 1.4
***************
*** 61,66 ****
--- 61,67 ----
*
*/
+ #include "conf.h"
#include "util_date.h"
#include <ctype.h>
#include <string.h>
***************
*** 76,82 ****
* * - swallow remaining characters
* <x> - exact match for any other character
*/
! int checkmask(const char *data, const char *mask)
{
int i;
char d;
--- 77,83 ----
* * - swallow remaining characters
* <x> - exact match for any other character
*/
! API_EXPORT(int) checkmask(const char *data, const char *mask)
{
int i;
char d;
***************
*** 193,199 ****
* but many changes since then.
*
*/
! time_t parseHTTPdate(const char *date)
{
struct tm ds;
int mint, mon;
--- 194,200 ----
* but many changes since then.
*
*/
! API_EXPORT(time_t) parseHTTPdate(const char *date)
{
struct tm ds;
int mint, mon;
1.4 +2 -2 apache/src/util_date.h
Index: util_date.h
===================================================================
RCS file: /export/home/cvs/apache/src/util_date.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C3 -r1.3 -r1.4
*** util_date.h 1997/07/10 18:32:47 1.3
--- util_date.h 1997/07/19 20:16:15 1.4
***************
*** 62,67 ****
#define BAD_DATE (time_t)0
! int checkmask (const char *data, const char *mask);
time_t tm2sec (const struct tm *t);
! time_t parseHTTPdate (const char *date);
--- 62,67 ----
#define BAD_DATE (time_t)0
! API_EXPORT(int) checkmask (const char *data, const char *mask);
time_t tm2sec (const struct tm *t);
! API_EXPORT(time_t) parseHTTPdate (const char *date);
1.1 apache/src/mod_mime.h
Index: mod_mime.h
===================================================================
API_EXPORT(int) mime_find_ct(request_rec *r);
1.17 +1 -1 apache/src/modules/proxy/mod_proxy.c
Index: mod_proxy.c
===================================================================
RCS file: /export/home/cvs/apache/src/modules/proxy/mod_proxy.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C3 -r1.16 -r1.17
*** mod_proxy.c 1997/07/19 08:58:34 1.16
--- mod_proxy.c 1997/07/19 20:16:20 1.17
***************
*** 721,727 ****
{ NULL }
};
! module proxy_module = {
STANDARD_MODULE_STUFF,
proxy_init, /* initializer */
NULL, /* create per-directory config structure */
--- 721,727 ----
{ NULL }
};
! module MODULE_VAR_EXPORT proxy_module = {
STANDARD_MODULE_STUFF,
proxy_init, /* initializer */
NULL, /* create per-directory config structure */
1.14 +1 -1 apache/src/modules/proxy/mod_proxy.h
Index: mod_proxy.h
===================================================================
RCS file: /export/home/cvs/apache/src/modules/proxy/mod_proxy.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C3 -r1.13 -r1.14
*** mod_proxy.h 1997/07/19 08:58:35 1.13
--- mod_proxy.h 1997/07/19 20:16:20 1.14
***************
*** 106,112 ****
DEF_Explain
! extern module proxy_module;
/* for proxy_canonenc() */
--- 106,112 ----
DEF_Explain
! extern module MODULE_VAR_EXPORT proxy_module;
/* for proxy_canonenc() */
1.19 +1 -0 apache/src/modules/proxy/proxy_cache.c
Index: proxy_cache.c
===================================================================
RCS file: /export/home/cvs/apache/src/modules/proxy/proxy_cache.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C3 -r1.18 -r1.19
*** proxy_cache.c 1997/07/12 12:33:17 1.18
--- proxy_cache.c 1997/07/19 20:16:21 1.19
***************
*** 52,57 ****
--- 52,58 ----
/* Cache and garbage collection routines for Apache proxy */
+ #include "conf.h"
#include "md5.h"
#include "mod_proxy.h"
1.25 +2 -3 apache/src/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===================================================================
RCS file: /export/home/cvs/apache/src/modules/proxy/proxy_ftp.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C3 -r1.24 -r1.25
*** proxy_ftp.c 1997/07/19 08:58:35 1.24
--- proxy_ftp.c 1997/07/19 20:16:21 1.25
***************
*** 54,61 ****
#include "mod_proxy.h"
#include "http_main.h"
!
! extern int find_ct(request_rec *r);
/*
* Decodes a '%' escaped string, and returns the number of characters
--- 54,60 ----
#include "mod_proxy.h"
#include "http_main.h"
! #include "mod_mime.h"
/*
* Decodes a '%' escaped string, and returns the number of characters
***************
*** 900,906 ****
proxy_add_header(resp_hdrs, "Content-Type", "text/html", HDR_REP);
else
{
! find_ct(r);
if(r->content_type != NULL)
{
proxy_add_header(resp_hdrs, "Content-Type", r->content_type,
--- 899,905 ----
proxy_add_header(resp_hdrs, "Content-Type", "text/html", HDR_REP);
else
{
! mime_find_ct(r);
if(r->content_type != NULL)
{
proxy_add_header(resp_hdrs, "Content-Type", r->content_type,
1.1 apache/src/modules/proxy/ApacheModuleProxy.mak
Index: ApacheModuleProxy.mak
===================================================================
# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
!IF "$(CFG)" == ""
CFG=ApacheModuleProxy - Win32 Debug
!MESSAGE No configuration specified. Defaulting to ApacheModuleProxy - Win32\
Debug.
!ENDIF
!IF "$(CFG)" != "ApacheModuleProxy - Win32 Release" && "$(CFG)" !=\
"ApacheModuleProxy - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE on this makefile
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "ApacheModuleProxy.mak" CFG="ApacheModuleProxy - Win32
Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "ApacheModuleProxy - Win32 Release" (based on\
"Win32 (x86) Dynamic-Link Library")
!MESSAGE "ApacheModuleProxy - Win32 Debug" (based on\
"Win32 (x86) Dynamic-Link Library")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
################################################################################
# Begin Project
# PROP Target_Last_Scanned "ApacheModuleProxy - Win32 Debug"
MTL=mktyplib.exe
RSC=rc.exe
CPP=cl.exe
!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "ApacheMo"
# PROP BASE Intermediate_Dir "ApacheMo"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
OUTDIR=.\Release
INTDIR=.\Release
ALL : "$(OUTDIR)\ApacheModuleProxy.dll"
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_proxy.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_cache.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_connect.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_ftp.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_http.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_util.obj"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleProxy.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleProxy.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleProxy.lib"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\regex" /D "WIN32" /D
"NDEBUG" /D "_WINDOWS" /YX /c
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\regex" /D "WIN32" /D\
"NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)/ApacheModuleProxy.pch" /YX
/Fo"$(INTDIR)/"\
/c
CPP_OBJS=.\Release/
CPP_SBRS=.\.
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /win32
MTL_PROJ=/nologo /D "NDEBUG" /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/ApacheModuleProxy.bsc"
BSC32_SBRS= \
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:windows /dll /machine:I386
# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll
/machine:I386
LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll\
/incremental:no /pdb:"$(OUTDIR)/ApacheModuleProxy.pdb" /machine:I386\
/out:"$(OUTDIR)/ApacheModuleProxy.dll"\
/implib:"$(OUTDIR)/ApacheModuleProxy.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_proxy.obj" \
"$(INTDIR)\proxy_cache.obj" \
"$(INTDIR)\proxy_connect.obj" \
"$(INTDIR)\proxy_ftp.obj" \
"$(INTDIR)\proxy_http.obj" \
"$(INTDIR)\proxy_util.obj"
"$(OUTDIR)\ApacheModuleProxy.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "ApacheM0"
# PROP BASE Intermediate_Dir "ApacheM0"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
OUTDIR=.\Debug
INTDIR=.\Debug
ALL : "$(OUTDIR)\ApacheModuleProxy.dll"
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_proxy.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_cache.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_connect.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_ftp.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_http.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_util.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc40.idb"
[EMAIL PROTECTED] "$(INTDIR)\vc40.pdb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleProxy.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleProxy.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleProxy.ilk"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleProxy.lib"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleProxy.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\regex" /D
"WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\regex" /D\
"WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)/ApacheModuleProxy.pch" /YX\
/Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /win32
MTL_PROJ=/nologo /D "_DEBUG" /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/ApacheModuleProxy.bsc"
BSC32_SBRS= \
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:windows /dll /debug /machine:I386
# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll
/debug /machine:I386
LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll\
/incremental:yes /pdb:"$(OUTDIR)/ApacheModuleProxy.pdb" /debug /machine:I386\
/out:"$(OUTDIR)/ApacheModuleProxy.dll"\
/implib:"$(OUTDIR)/ApacheModuleProxy.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_proxy.obj" \
"$(INTDIR)\proxy_cache.obj" \
"$(INTDIR)\proxy_connect.obj" \
"$(INTDIR)\proxy_ftp.obj" \
"$(INTDIR)\proxy_http.obj" \
"$(INTDIR)\proxy_util.obj"
"$(OUTDIR)\ApacheModuleProxy.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ENDIF
.c{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.cpp{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.cxx{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.c{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
.cpp{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
.cxx{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
################################################################################
# Begin Target
# Name "ApacheModuleProxy - Win32 Release"
# Name "ApacheModuleProxy - Win32 Debug"
!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release"
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
!ENDIF
################################################################################
# Begin Source File
SOURCE=.\proxy_util.c
DEP_CPP_PROXY=\
"..\..\alloc.h"\
"..\..\buff.h"\
"..\..\conf.h"\
"..\..\explain.h"\
"..\..\http_config.h"\
"..\..\http_log.h"\
"..\..\http_main.h"\
"..\..\http_protocol.h"\
"..\..\httpd.h"\
"..\..\md5.h"\
"..\..\multithread.h"\
"..\..\nt\readdir.h"\
"..\..\regex\regex.h"\
".\mod_proxy.h"\
{$(INCLUDE)}"\sys\stat.h"\
{$(INCLUDE)}"\sys\types.h"\
NODEP_CPP_PROXY=\
"..\..\sfio.h"\
"$(INTDIR)\proxy_util.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)"
# End Source File
################################################################################
# Begin Source File
SOURCE=.\proxy_cache.c
!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release"
DEP_CPP_PROXY_=\
"..\..\conf.h"\
"..\..\http_log.h"\
"..\..\http_main.h"\
"..\..\httpd.h"\
"..\..\md5.h"\
"..\..\multithread.h"\
"..\..\util_date.h"\
".\mod_proxy.h"\
{$(INCLUDE)}"\sys\types.h"\
{$(INCLUDE)}"\sys\utime.h"\
"$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
DEP_CPP_PROXY_=\
"..\..\alloc.h"\
"..\..\buff.h"\
"..\..\conf.h"\
"..\..\explain.h"\
"..\..\http_config.h"\
"..\..\http_log.h"\
"..\..\http_main.h"\
"..\..\http_protocol.h"\
"..\..\httpd.h"\
"..\..\md5.h"\
"..\..\multithread.h"\
"..\..\nt\readdir.h"\
"..\..\regex\regex.h"\
"..\..\util_date.h"\
".\mod_proxy.h"\
{$(INCLUDE)}"\sys\stat.h"\
{$(INCLUDE)}"\sys\types.h"\
{$(INCLUDE)}"\sys\utime.h"\
NODEP_CPP_PROXY_=\
"..\..\sfio.h"\
"$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)"
!ENDIF
# End Source File
################################################################################
# Begin Source File
SOURCE=.\proxy_connect.c
DEP_CPP_PROXY_C=\
"..\..\alloc.h"\
"..\..\buff.h"\
"..\..\conf.h"\
"..\..\explain.h"\
"..\..\http_config.h"\
"..\..\http_log.h"\
"..\..\http_main.h"\
"..\..\http_protocol.h"\
"..\..\httpd.h"\
"..\..\nt\readdir.h"\
"..\..\regex\regex.h"\
".\mod_proxy.h"\
{$(INCLUDE)}"\sys\stat.h"\
{$(INCLUDE)}"\sys\types.h"\
NODEP_CPP_PROXY_C=\
"..\..\sfio.h"\
"$(INTDIR)\proxy_connect.obj" : $(SOURCE) $(DEP_CPP_PROXY_C) "$(INTDIR)"
# End Source File
################################################################################
# Begin Source File
SOURCE=.\proxy_ftp.c
!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release"
DEP_CPP_PROXY_F=\
"..\..\conf.h"\
"..\..\http_main.h"\
"..\..\httpd.h"\
"..\..\mod_mime.h"\
".\mod_proxy.h"\
"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) $(DEP_CPP_PROXY_F) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
DEP_CPP_PROXY_F=\
"..\..\alloc.h"\
"..\..\buff.h"\
"..\..\conf.h"\
"..\..\explain.h"\
"..\..\http_config.h"\
"..\..\http_main.h"\
"..\..\http_protocol.h"\
"..\..\httpd.h"\
"..\..\mod_mime.h"\
"..\..\nt\readdir.h"\
"..\..\regex\regex.h"\
".\mod_proxy.h"\
{$(INCLUDE)}"\sys\stat.h"\
{$(INCLUDE)}"\sys\types.h"\
NODEP_CPP_PROXY_F=\
"..\..\sfio.h"\
"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) $(DEP_CPP_PROXY_F) "$(INTDIR)"
!ENDIF
# End Source File
################################################################################
# Begin Source File
SOURCE=.\proxy_http.c
!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release"
DEP_CPP_PROXY_H=\
"..\..\conf.h"\
"..\..\http_log.h"\
"..\..\http_main.h"\
"..\..\httpd.h"\
"..\..\util_date.h"\
".\mod_proxy.h"\
{$(INCLUDE)}"\sys\types.h"\
"$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
DEP_CPP_PROXY_H=\
"..\..\alloc.h"\
"..\..\buff.h"\
"..\..\conf.h"\
"..\..\explain.h"\
"..\..\http_config.h"\
"..\..\http_log.h"\
"..\..\http_main.h"\
"..\..\http_protocol.h"\
"..\..\httpd.h"\
"..\..\nt\readdir.h"\
"..\..\regex\regex.h"\
"..\..\util_date.h"\
".\mod_proxy.h"\
{$(INCLUDE)}"\sys\stat.h"\
{$(INCLUDE)}"\sys\types.h"\
NODEP_CPP_PROXY_H=\
"..\..\sfio.h"\
"$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)"
!ENDIF
# End Source File
################################################################################
# Begin Source File
SOURCE=.\mod_proxy.c
!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release"
DEP_CPP_MOD_P=\
"..\..\conf.h"\
"..\..\explain.h"\
"..\..\http_config.h"\
"..\..\http_log.h"\
"..\..\http_protocol.h"\
"..\..\httpd.h"\
".\mod_proxy.h"\
"$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
DEP_CPP_MOD_P=\
"..\..\alloc.h"\
"..\..\buff.h"\
"..\..\conf.h"\
"..\..\explain.h"\
"..\..\http_config.h"\
"..\..\http_log.h"\
"..\..\http_protocol.h"\
"..\..\httpd.h"\
"..\..\nt\readdir.h"\
"..\..\regex\regex.h"\
".\mod_proxy.h"\
{$(INCLUDE)}"\sys\stat.h"\
{$(INCLUDE)}"\sys\types.h"\
NODEP_CPP_MOD_P=\
"..\..\sfio.h"\
"$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)"
!ENDIF
# End Source File
# End Target
# End Project
################################################################################
1.2 +5 -7 apache/src/nt/multithread.c
Index: multithread.c
===================================================================
RCS file: /export/home/cvs/apache/src/nt/multithread.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** multithread.c 1997/06/15 19:22:52 1.1
--- multithread.c 1997/07/19 20:16:23 1.2
***************
*** 72,91 ****
! mutex *
! create_mutex(char *name)
{
return(CreateMutex(NULL, FALSE, name));
}
! mutex *
! open_mutex(char *name)
{
return(OpenMutex(MUTEX_ALL_ACCESS, FALSE, name));
}
! int acquire_mutex(mutex *mutex_id)
{
int rv;
--- 72,89 ----
! API_EXPORT(mutex *) create_mutex(char *name)
{
return(CreateMutex(NULL, FALSE, name));
}
! API_EXPORT(mutex *) open_mutex(char *name)
{
return(OpenMutex(MUTEX_ALL_ACCESS, FALSE, name));
}
! API_EXPORT(int) acquire_mutex(mutex *mutex_id)
{
int rv;
***************
*** 94,105 ****
return(map_rv(rv));
}
! int release_mutex(mutex *mutex_id)
{
return(ReleaseMutex(mutex_id));
}
! void destroy_mutex(mutex *mutex_id)
{
CloseHandle(mutex_id);
}
--- 92,103 ----
return(map_rv(rv));
}
! API_EXPORT(int) release_mutex(mutex *mutex_id)
{
return(ReleaseMutex(mutex_id));
}
! API_EXPORT(void) destroy_mutex(mutex *mutex_id)
{
CloseHandle(mutex_id);
}
