cvs commit: apache/src mod_dir.c mod_negotiation.c
ben 97/07/05 14:30:25
Modified:src mod_dir.c mod_negotiation.c
Log:
Fix more VC++ warnings.
Revision ChangesPath
1.31 +2 -2 apache/src/mod_dir.c
Index: mod_dir.c
===
RCS file: /export/home/cvs/apache/src/mod_dir.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C3 -r1.30 -r1.31
*** mod_dir.c 1997/06/24 03:03:48 1.30
--- mod_dir.c 1997/07/05 21:30:22 1.31
***
*** 561,567
p=(struct ent *)pcalloc(r-pool, sizeof(struct ent));
p-name = pstrdup (r-pool, name);
! p-size = -1;
p-icon = NULL;
p-alt = NULL;
p-desc = NULL;
--- 561,567
p=(struct ent *)pcalloc(r-pool, sizeof(struct ent));
p-name = pstrdup (r-pool, name);
! p-size = 0;
p-icon = NULL;
p-alt = NULL;
p-desc = NULL;
***
*** 577,583
p-icon = find_default_icon(d,^^DIRECTORY^^);
if(!(p-alt = find_alt(d,rr,1)))
p-alt = DIR;
! p-size = -1;
p-name = pstrcat (r-pool, name, /, NULL);
}
else {
--- 577,583
p-icon = find_default_icon(d,^^DIRECTORY^^);
if(!(p-alt = find_alt(d,rr,1)))
p-alt = DIR;
! p-size = 0;
p-name = pstrcat (r-pool, name, /, NULL);
}
else {
1.45 +34 -33apache/src/mod_negotiation.c
Index: mod_negotiation.c
===
RCS file: /export/home/cvs/apache/src/mod_negotiation.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -C3 -r1.44 -r1.45
*** mod_negotiation.c 1997/06/30 22:50:40 1.44
--- mod_negotiation.c 1997/07/05 21:30:23 1.45
***
*** 250,267
mime_info-description = ;
mime_info-is_pseudo_html = 0;
! mime_info-level = 0.0;
! mime_info-level_matched = 0.0;
! mime_info-bytes = 0;
mime_info-lang_index = -1;
mime_info-mime_stars = 0;
mime_info-definite = 1;
! mime_info-charset_quality = 1.0;
! mime_info-type_quality = 0.0;
mime_info-encoding_quality = 1;
! mime_info-lang_quality = 1.0;
! mime_info-accept_type_quality = 1.0;
}
/* Initializing the relevant fields of a variant record from the
--- 250,267
mime_info-description = ;
mime_info-is_pseudo_html = 0;
! mime_info-level = 0.0f;
! mime_info-level_matched = 0.0f;
! mime_info-bytes = 0.0f;
mime_info-lang_index = -1;
mime_info-mime_stars = 0;
mime_info-definite = 1;
! mime_info-charset_quality = 1.0f;
! mime_info-type_quality = 0.0f;
mime_info-encoding_quality = 1;
! mime_info-lang_quality = 1.0f;
! mime_info-accept_type_quality = 1.0f;
}
/* Initializing the relevant fields of a variant record from the
***
*** 294,302
char *get_entry (pool *p, accept_rec *result, char *accept_line)
{
! result-quality = 1.0;
! result-max_bytes = 0.0;
! result-level = 0.0;
result-charset = ;
/* Note that this handles what I gather is the old format,
--- 294,302
char *get_entry (pool *p, accept_rec *result, char *accept_line)
{
! result-quality = 1.0f;
! result-max_bytes = 0.0f;
! result-level = 0.0f;
result-charset = ;
/* Note that this handles what I gather is the old format,
***
*** 321,331
if (!strcmp (result-type_name, text/html)
result-level == 0.0)
! result-level = 2.0;
else if (!strcmp (result-type_name, INCLUDES_MAGIC_TYPE))
! result-level = 2.0;
else if (!strcmp (result-type_name, INCLUDES_MAGIC_TYPE3))
! result-level = 3.0;
while (*accept_line == ';') {
/* Parameters ... */
--- 321,331
if (!strcmp (result-type_name, text/html)
result-level == 0.0)
! result-level = 2.0f;
else if (!strcmp (result-type_name, INCLUDES_MAGIC_TYPE))
! result-level = 2.0f;
else if (!strcmp (result-type_name, INCLUDES_MAGIC_TYPE3))
! result-level = 3.0f;
while (*accept_line == ';') {
/* Parameters ... */
***
*** 509,526
accept_rec *new_accept = (accept_rec *)push_array (neg-accepts);
new_accept-type_name = CGI_MAGIC_TYPE;
! new_accept-quality = prefer_scripts ? 1e-20 : 1e20;
! new_accept-level = 0.0;
! new_accept-max_bytes = 0.0;
if (neg-accepts-nelts 1) return;
new_accept = (accept_rec
cvs commit: apache/src Makefile.nt CHANGES
ben 97/07/05 15:12:26 Modified:src CHANGES Added: src Makefile.nt Log: Add Makefile for Win32. Revision ChangesPath 1.322 +4 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.321 retrieving revision 1.322 diff -C3 -r1.321 -r1.322 *** CHANGES 1997/07/05 14:53:58 1.321 --- CHANGES 1997/07/05 22:12:24 1.322 *** *** 1,5 --- 1,9 Changes with Apache 1.3 + *) Makefile.nt added - to build all the bits from the command line: + nmake -f Makefile.nt + Doesn't yet work properly. [Ben Laurie] + *) Default text of 404 error is now Not Found rather than the potentially misleading File Not Found. [Ken Coar] 1.1 apache/src/Makefile.nt Index: Makefile.nt === # Makefile for NT # Note that this doesn't quite work... apache.exe doesn't depend on proxy.lib # or regex.lib. Nor can it, without some messing about - the debug and release # versions need different dependencies, and that isn't an option. # One way that occurs to me to solve the problem is to have the proxy and # regex makes delete the appropriate apache.exe. Tacky, but it'll work! # 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 set CFG=apache - Win32 Debug nmake -f apache.mak
cvs commit: apache/src/nt readdir.c readdir.h
ben 97/07/12 07:20:14
Modified:src/ntreaddir.c readdir.h
Log:
Fix a warning.
Revision ChangesPath
1.2 +1 -1 apache/src/nt/readdir.c
Index: readdir.c
===
RCS file: /export/home/cvs/apache/src/nt/readdir.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** readdir.c 1997/06/15 19:22:52 1.1
--- readdir.c 1997/07/12 14:20:13 1.2
***
*** 17,23
* The DIR typedef is not compatible with Unix.
**/
! DIR *opendir(char *dir)
{
DIR *dp;
char *filespec;
--- 17,23
* The DIR typedef is not compatible with Unix.
**/
! DIR *opendir(const char *dir)
{
DIR *dp;
char *filespec;
1.2 +1 -1 apache/src/nt/readdir.h
Index: readdir.h
===
RCS file: /export/home/cvs/apache/src/nt/readdir.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** readdir.h 1997/06/15 19:22:52 1.1
--- readdir.h 1997/07/12 14:20:14 1.2
***
*** 27,32
} DIR;
/* Function prototypes */
! DIR *opendir(char *);
struct dirent *readdir(DIR *);
int closedir(DIR *);
--- 27,32
} DIR;
/* Function prototypes */
! DIR *opendir(const char *);
struct dirent *readdir(DIR *);
int closedir(DIR *);
cvs commit: apache/src/regex regex.h regex.mak regexec.c
ben 97/07/13 12:01:38
Modified:src CHANGES Makefile.nt alloc.c alloc.h apache.mak
buff.c buff.h conf.h http_conf_globals.h
http_config.c http_config.h http_core.c
http_core.h http_log.c http_log.h http_main.c
http_main.h http_protocol.c http_protocol.h
http_request.c http_request.h httpd.h mod_access.c
mod_alias.c mod_cgi.c mod_mime.c util.c
util_script.c util_script.h
src/regex regex.h regex.mak regexec.c
Added: src ApacheCore.def ApacheCore.mak ApacheLaunch.mak
dummy.c
src/ntApacheModuleAccess.mak ApacheModuleActions.mak
ApacheModuleAlias.mak ApacheModuleCGI.mak
ApacheModuleMIME.mak mod_dll.c modules_dll.c
Log:
DLLify modules under Win32.
Submitted by: Alexei Kosut and Ben Laurie
Revision ChangesPath
1.333 +5 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.332
retrieving revision 1.333
diff -C3 -r1.332 -r1.333
*** CHANGES 1997/07/10 18:32:45 1.332
--- CHANGES 1997/07/13 19:01:06 1.333
***
*** 1,5
--- 1,10
Changes with Apache 1.3
+ *) Make modules DLLs, dynamically loaded, using LoadModule/LoadFile
+ on Win32.
+ Note that module DLLs must be compiled with the multithreaded DLL
+ version of the runtime library. [Alexei Kosut and Ben Laurie]
+
*) Sequent port re-added and SONY NEWS-OS port included.
*) Automatic indexing removed from mod_dir and placed into mod_autoindex.
1.2 +10 -1 apache/src/Makefile.nt
Index: Makefile.nt
===
RCS file: /export/home/cvs/apache/src/Makefile.nt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** Makefile.nt 1997/07/05 22:12:24 1.1
--- Makefile.nt 1997/07/13 19:01:06 1.2
***
*** 9,12
_debug:
cd modules\proxy set CFG=proxy - Win32 Debug nmake -f proxy.mak
cd regex set CFG=regex - Win32 Debug nmake -f regex.mak
! set CFG=apache - Win32 Debug nmake -f apache.mak
\ No newline at end of file
--- 9,21
_debug:
cd modules\proxy set CFG=proxy - Win32 Debug nmake -f proxy.mak
cd regex set CFG=regex - Win32 Debug nmake -f regex.mak
! set CFG=apache - Win32 Debug nmake -f apache.mak
!
! installd:
! -mkdir \Apache
! copy LaunchD\ApacheLaunch.exe \Apache
! copy CoreD\ApacheCore.dll \Apache
! copy nt\ModAccessD\ApacheModuleAccess.dll \Apache
! copy nt\ModAliasD\ApacheModuleAlias.dll \Apache
! copy nt\ModCGID\ApacheModuleCGI.dll \Apache
! copy nt\ModMIMED\ApacheModuleMIME.dll \Apache
1.38 +43 -43apache/src/alloc.c
Index: alloc.c
===
RCS file: /export/home/cvs/apache/src/alloc.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C3 -r1.37 -r1.38
*** alloc.c 1997/07/08 06:32:33 1.37
--- alloc.c 1997/07/13 19:01:07 1.38
***
*** 262,268
#define POOL_HDR_CLICKS (1 + ((sizeof(struct pool) - 1) / CLICK_SZ))
#define POOL_HDR_BYTES (POOL_HDR_CLICKS * CLICK_SZ)
! struct pool *make_sub_pool (struct pool *p)
{
union block_hdr *blok;
pool *new_pool;
--- 262,268
#define POOL_HDR_CLICKS (1 + ((sizeof(struct pool) - 1) / CLICK_SZ))
#define POOL_HDR_BYTES (POOL_HDR_CLICKS * CLICK_SZ)
! API_EXPORT(struct pool *) make_sub_pool (struct pool *p)
{
union block_hdr *blok;
pool *new_pool;
***
*** 318,324
unblock_alarms();
}
! void destroy_pool (pool *a)
{
block_alarms();
clear_pool (a);
--- 318,324
unblock_alarms();
}
! API_EXPORT(void) destroy_pool (pool *a)
{
block_alarms();
clear_pool (a);
***
*** 342,348
*/
! void *palloc (struct pool *a, int reqsize)
{
/* Round up requested size to an even number of alignment units (core
clicks)
*/
--- 342,348
*/
! API_EXPORT(void *) palloc (struct pool *a, int reqsize)
{
/* Round up requested size to an even number of alignment units (core
clicks)
*/
***
*** 388,401
return (void *)first_avail;
}
! void *pcalloc(struct pool *a, int size)
{
void *res = palloc (a, size);
memset (res, '\0', size);
return res;
}
! char *pstrdup
cvs commit: apache/src mod_cgi.c
ben 97/07/13 12:20:18
Modified:src mod_cgi.c
Log:
Clear up Win32 debris.
Revision ChangesPath
1.46 +2 -2 apache/src/mod_cgi.c
Index: mod_cgi.c
===
RCS file: /export/home/cvs/apache/src/mod_cgi.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -C3 -r1.45 -r1.46
*** mod_cgi.c 1997/07/13 19:01:15 1.45
--- mod_cgi.c 1997/07/13 19:20:17 1.46
***
*** 73,79
#include util_script.h
#include http_conf_globals.h
! module __declspec(dllexport) cgi_module;
/* KLUDGE --- for back-combatibility, we don't have to check ExecCGI
* in ScriptAliased directories, which means we need to know if this
--- 73,79
#include util_script.h
#include http_conf_globals.h
! module MODULE_VAR_EXPORT cgi_module;
/* KLUDGE --- for back-combatibility, we don't have to check ExecCGI
* in ScriptAliased directories, which means we need to know if this
***
*** 550,556
{ NULL }
};
! module __declspec(dllexport) cgi_module = {
STANDARD_MODULE_STUFF,
NULL,/* initializer */
NULL,/* dir config creater */
--- 550,556
{ NULL }
};
! module MODULE_VAR_EXPORT cgi_module = {
STANDARD_MODULE_STUFF,
NULL,/* initializer */
NULL,/* dir config creater */
cvs commit: apache/src/regex regex.h
ben 97/07/14 03:01:38 Modified:src/regex regex.h Log: Clean up Win32 debris. Revision ChangesPath 1.3 +2 -0 apache/src/regex/regex.h Index: regex.h === RCS file: /export/home/cvs/apache/src/regex/regex.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C3 -r1.2 -r1.3 *** regex.h 1997/07/13 19:01:36 1.2 --- regex.h 1997/07/14 10:01:37 1.3 *** *** 7,12 --- 7,14 #ifdef WIN32 #define API_EXPORT(type)__declspec(dllexport) type __stdcall + #else + #define API_EXPORT(type)type #endif /* === regex2.h === */
cvs commit: apache/src/nt .cvsignore ApacheModuleAsis.mak ApacheModuleAuth.mak ApacheModuleAutoIndex.mak readdir.c readdir.h
ben 97/07/15 15:37:00
Modified:src .cvsignore ApacheCore.mak conf.h http_core.c
http_core.h http_protocol.c mod_asis.c mod_auth.c
mod_autoindex.c util.c
src/ntreaddir.c readdir.h
Added: src/nt.cvsignore ApacheModuleAsis.mak
ApacheModuleAuth.mak ApacheModuleAutoIndex.mak
Log:
More Win32 DLLification.
Revision ChangesPath
1.5 +4 -2 apache/src/.cvsignore
Index: .cvsignore
===
RCS file: /export/home/cvs/apache/src/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -C3 -r1.4 -r1.5
*** .cvsignore1997/07/05 22:09:28 1.4
--- .cvsignore1997/07/15 22:36:49 1.5
***
*** 3,9
modules.c
httpd
Makefile.config
! apache.mdp
! apache.ncb
Release
Debug
--- 3,11
modules.c
httpd
Makefile.config
! *.mdp
! *.ncb
Release
Debug
+ CoreD
+ LaunchD
1.2 +50 -134 apache/src/ApacheCore.mak
Index: ApacheCore.mak
===
RCS file: /export/home/cvs/apache/src/ApacheCore.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** ApacheCore.mak1997/07/13 19:01:05 1.1
--- ApacheCore.mak1997/07/15 22:36:49 1.2
***
*** 346,353
!IF $(CFG) == ApacheCore - Win32 Release
DEP_CPP_HTTP_=\
- .\alloc.h\
- .\buff.h\
.\conf.h\
.\explain.h\
.\http_conf_globals.h\
--- 346,351
***
*** 360,374
.\httpd.h\
.\multithread.h\
.\nt\getopt.h\
- .\nt\readdir.h\
.\nt\service.h\
.\scoreboard.h\
{$(INCLUDE)}\sys\STAT.H\
{$(INCLUDE)}\sys\TYPES.H\
- NODEP_CPP_HTTP_=\
- .\sfio.h\
-
$(INTDIR)\http_main.obj : $(SOURCE) $(DEP_CPP_HTTP_) $(INTDIR)
--- 358,368
***
*** 397,405
{$(INCLUDE)}\sys\STAT.H\
{$(INCLUDE)}\sys\TYPES.H\
- NODEP_CPP_HTTP_=\
- .\sfio.h\
-
$(INTDIR)\http_main.obj : $(SOURCE) $(DEP_CPP_HTTP_) $(INTDIR)
--- 391,396
***
*** 445,453
{$(INCLUDE)}\sys\STAT.H\
{$(INCLUDE)}\sys\TYPES.H\
- NODEP_CPP_BUFF_=\
- .\sfio.h\
-
$(INTDIR)\buff.obj : $(SOURCE) $(DEP_CPP_BUFF_) $(INTDIR)
--- 436,441
***
*** 461,501
# Begin Source File
SOURCE=.\alloc.c
-
- !IF $(CFG) == ApacheCore - Win32 Release
-
DEP_CPP_ALLOC=\
- .\alloc.h\
- .\buff.h\
.\conf.h\
.\httpd.h\
.\multithread.h\
! .\nt\readdir.h\
{$(INCLUDE)}\sys\TYPES.H\
! NODEP_CPP_ALLOC=\
! .\sfio.h\
!
$(INTDIR)\alloc.obj : $(SOURCE) $(DEP_CPP_ALLOC) $(INTDIR)
!ELSEIF $(CFG) == ApacheCore - Win32 Debug
- DEP_CPP_ALLOC=\
- .\alloc.h\
- .\buff.h\
- .\conf.h\
- .\httpd.h\
- .\multithread.h\
- .\nt\readdir.h\
- .\regex\regex.h\
- {$(INCLUDE)}\sys\STAT.H\
- {$(INCLUDE)}\sys\TYPES.H\
-
- NODEP_CPP_ALLOC=\
- .\sfio.h\
-
$(INTDIR)\alloc.obj : $(SOURCE) $(DEP_CPP_ALLOC) $(INTDIR)
--- 449,471
# Begin Source File
SOURCE=.\alloc.c
DEP_CPP_ALLOC=\
.\conf.h\
.\httpd.h\
.\multithread.h\
! .\regex\regex.h\
! {$(INCLUDE)}\sys\STAT.H\
{$(INCLUDE)}\sys\TYPES.H\
!
! !IF $(CFG) == ApacheCore - Win32 Release
!
$(INTDIR)\alloc.obj : $(SOURCE) $(DEP_CPP_ALLOC) $(INTDIR)
!ELSEIF $(CFG) == ApacheCore - Win32 Debug
$(INTDIR)\alloc.obj : $(SOURCE) $(DEP_CPP_ALLOC) $(INTDIR)
***
*** 545,553
{$(INCLUDE)}\sys\STAT.H\
{$(INCLUDE)}\sys\TYPES.H\
- NODEP_CPP_HTTP_L=\
- .\sfio.h\
-
$(INTDIR)\http_log.obj : $(SOURCE) $(DEP_CPP_HTTP_L) $(INTDIR)
--- 515,520
***
*** 561,566
--- 528,536
# Begin Source File
SOURCE=.\http_config.c
+
+ !IF $(CFG) == ApacheCore - Win32 Release
+
DEP_CPP_HTTP_C=\
.\alloc.h\
.\buff.h\
***
*** 581,594
.\sfio.h\
- !IF $(CFG) == ApacheCore - Win32 Release
-
-
$(INTDIR)\http_config.obj : $(SOURCE) $(DEP_CPP_HTTP_C) $(INTDIR)
!ELSEIF $(CFG) == ApacheCore - Win32 Debug
$(INTDIR)\http_config.obj : $(SOURCE) $(DEP_CPP_HTTP_C) $(INTDIR)
--- 551,577
.\sfio.h\
$(INTDIR)\http_config.obj : $(SOURCE) $(DEP_CPP_HTTP_C) $(INTDIR)
!ELSEIF $(CFG) == ApacheCore -
cvs commit: apache/src/nt ApacheModuleAuthAnon.mak ApacheModuleCERNMeta.mak ApacheModuleDigest.mak ApacheModuleExpires.mak ApacheModuleHeaders.mak ApacheModuleStatus.mak ApacheModuleUserTrack.mak
ben 97/07/18 12:49:33 Modified:src ApacheCore.mak Makefile.nt src/ntApacheModuleAuthAnon.mak ApacheModuleCERNMeta.mak ApacheModuleDigest.mak ApacheModuleExpires.mak ApacheModuleHeaders.mak ApacheModuleStatus.mak ApacheModuleUserTrack.mak Log: Merge default modules back into the core on Win32. Update Makefile.nt to build and install optional modules. Update header dependencies. Revision ChangesPath 1.4 +769 -299 apache/src/ApacheCore.mak Index: ApacheCore.mak === RCS file: /export/home/cvs/apache/src/ApacheCore.mak,v retrieving revision 1.3 retrieving revision 1.4 diff -C3 -r1.3 -r1.4 *** ApacheCore.mak1997/07/17 20:01:21 1.3 --- ApacheCore.mak1997/07/18 19:49:27 1.4 *** *** 68,74 --- 68,90 [EMAIL PROTECTED] $(INTDIR)\http_protocol.obj [EMAIL PROTECTED] $(INTDIR)\http_request.obj [EMAIL PROTECTED] $(INTDIR)\md5c.obj + [EMAIL PROTECTED] $(INTDIR)\mod_access.obj + [EMAIL PROTECTED] $(INTDIR)\mod_actions.obj + [EMAIL PROTECTED] $(INTDIR)\mod_alias.obj + [EMAIL PROTECTED] $(INTDIR)\mod_asis.obj + [EMAIL PROTECTED] $(INTDIR)\mod_auth.obj + [EMAIL PROTECTED] $(INTDIR)\mod_autoindex.obj + [EMAIL PROTECTED] $(INTDIR)\mod_browser.obj + [EMAIL PROTECTED] $(INTDIR)\mod_cgi.obj + [EMAIL PROTECTED] $(INTDIR)\mod_dir.obj [EMAIL PROTECTED] $(INTDIR)\mod_dll.obj + [EMAIL PROTECTED] $(INTDIR)\mod_env.obj + [EMAIL PROTECTED] $(INTDIR)\mod_imap.obj + [EMAIL PROTECTED] $(INTDIR)\mod_include.obj + [EMAIL PROTECTED] $(INTDIR)\mod_log_config.obj + [EMAIL PROTECTED] $(INTDIR)\mod_mime.obj + [EMAIL PROTECTED] $(INTDIR)\mod_negotiation.obj + [EMAIL PROTECTED] $(INTDIR)\mod_userdir.obj [EMAIL PROTECTED] $(INTDIR)\modules_dll.obj [EMAIL PROTECTED] $(INTDIR)\multithread.obj [EMAIL PROTECTED] $(INTDIR)\readdir.obj *** *** 126,132 --- 142,164 $(INTDIR)\http_protocol.obj \ $(INTDIR)\http_request.obj \ $(INTDIR)\md5c.obj \ + $(INTDIR)\mod_access.obj \ + $(INTDIR)\mod_actions.obj \ + $(INTDIR)\mod_alias.obj \ + $(INTDIR)\mod_asis.obj \ + $(INTDIR)\mod_auth.obj \ + $(INTDIR)\mod_autoindex.obj \ + $(INTDIR)\mod_browser.obj \ + $(INTDIR)\mod_cgi.obj \ + $(INTDIR)\mod_dir.obj \ $(INTDIR)\mod_dll.obj \ + $(INTDIR)\mod_env.obj \ + $(INTDIR)\mod_imap.obj \ + $(INTDIR)\mod_include.obj \ + $(INTDIR)\mod_log_config.obj \ + $(INTDIR)\mod_mime.obj \ + $(INTDIR)\mod_negotiation.obj \ + $(INTDIR)\mod_userdir.obj \ $(INTDIR)\modules_dll.obj \ $(INTDIR)\multithread.obj \ $(INTDIR)\readdir.obj \ *** *** 185,192 --- 217,256 [EMAIL PROTECTED] $(INTDIR)\http_request.sbr [EMAIL PROTECTED] $(INTDIR)\md5c.obj [EMAIL PROTECTED] $(INTDIR)\md5c.sbr + [EMAIL PROTECTED] $(INTDIR)\mod_access.obj + [EMAIL PROTECTED] $(INTDIR)\mod_access.sbr + [EMAIL PROTECTED] $(INTDIR)\mod_actions.obj + [EMAIL PROTECTED] $(INTDIR)\mod_actions.sbr + [EMAIL PROTECTED] $(INTDIR)\mod_alias.obj + [EMAIL PROTECTED] $(INTDIR)\mod_alias.sbr + [EMAIL PROTECTED] $(INTDIR)\mod_asis.obj + [EMAIL PROTECTED] $(INTDIR)\mod_asis.sbr + [EMAIL PROTECTED] $(INTDIR)\mod_auth.obj + [EMAIL PROTECTED] $(INTDIR)\mod_auth.sbr + [EMAIL PROTECTED] $(INTDIR)\mod_autoindex.obj + [EMAIL PROTECTED] $(INTDIR)\mod_autoindex.sbr + [EMAIL PROTECTED] $(INTDIR)\mod_browser.obj + [EMAIL PROTECTED] $(INTDIR)\mod_browser.sbr + [EMAIL PROTECTED] $(INTDIR)\mod_cgi.obj + [EMAIL PROTECTED] $(INTDIR)\mod_cgi.sbr + [EMAIL PROTECTED] $(INTDIR)\mod_dir.obj + [EMAIL PROTECTED] $(INTDIR)\mod_dir.sbr [EMAIL PROTECTED] $(INTDIR)\mod_dll.obj [EMAIL PROTECTED] $(INTDIR)\mod_dll.sbr + [EMAIL PROTECTED] $(INTDIR)\mod_env.obj + [EMAIL PROTECTED] $(INTDIR)\mod_env.sbr + [EMAIL PROTECTED] $(INTDIR)\mod_imap.obj + [EMAIL PROTECTED] $(INTDIR)\mod_imap.sbr + [EMAIL PROTECTED] $(INTDIR)\mod_include.obj + [EMAIL PROTECTED] $(INTDIR)\mod_include.sbr + [EMAIL PROTECTED] $(INTDIR)\mod_log_config.obj + [EMAIL PROTECTED] $(INTDIR)\mod_log_config.sbr + [EMAIL PROTECTED] $(INTDIR)\mod_mime.obj + [EMAIL PROTECTED] $(INTDIR)\mod_mime.sbr + [EMAIL PROTECTED] $(INTDIR)\mod_negotiation.obj + [EMAIL PROTECTED] $(INTDIR)\mod_negotiation.sbr + [EMAIL PROTECTED] $(INTDIR)\mod_userdir.obj + [EMAIL PROTECTED] $(INTDIR)\mod_userdir.sbr [EMAIL PROTECTED] $(INTDIR)\modules_dll.obj [EMAIL PROTECTED]
cvs commit: apache/src/modules/proxy ApacheModuleProxy.dsp .cvsignore
ben 97/07/20 07:59:58 Modified:src/modules/proxy .cvsignore Added: src/modules/proxy ApacheModuleProxy.dsp Log: Upgrade to VC++ 5.0 Revision ChangesPath 1.2 +5 -2 apache/src/modules/proxy/.cvsignore Index: .cvsignore === RCS file: /export/home/cvs/apache/src/modules/proxy/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C3 -r1.1 -r1.2 *** .cvsignore1997/07/05 22:09:29 1.1 --- .cvsignore1997/07/20 14:59:57 1.2 *** *** 1,4 Debug Release ! proxy.mdp ! proxy.ncb --- 1,7 Debug Release ! ApacheModuleProxy.dsw ! ApacheModuleProxy.mdp ! ApacheModuleProxy.ncb ! ApacheModuleProxy.opt ! ApacheModuleProxy.plg 1.1 apache/src/modules/proxy/ApacheModuleProxy.dsp Index: ApacheModuleProxy.dsp === # Microsoft Developer Studio Project File - Name=ApacheModuleProxy - Package Owner=4 # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE Win32 (x86) Dynamic-Link Library 0x0102 CFG=ApacheModuleProxy - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f ApacheModuleProxy.mak. !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f ApacheModuleProxy.mak\ CFG=ApacheModuleProxy - Win32 Release !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 # Begin Project # PROP Scc_ProjName # PROP Scc_LocalPath CPP=cl.exe MTL=midl.exe RSC=rc.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 # 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 /FD /c # ADD BASE MTL /nologo /D NDEBUG /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d NDEBUG # ADD RSC /l 0x809 /d NDEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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: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 !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 # 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 /FD /c # ADD BASE MTL /nologo /D _DEBUG /win32 # ADD MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d _DEBUG # ADD RSC /l 0x809 /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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: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 !ENDIF # Begin Target # Name ApacheModuleProxy - Win32 Release # Name ApacheModuleProxy - Win32 Debug # Begin Group Source Files # PROP Default_Filter cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90 # Begin Source File SOURCE=.\mod_proxy.c # End Source File # Begin Source File SOURCE=.\proxy_cache.c # End Source File # Begin Source File
cvs commit: apache/src/nt .cvsignore
ben 97/07/20 08:05:12 Modified:src Apache.mak src/nt.cvsignore Log: Cleanup. Revision ChangesPath 1.2 +73 -99apache/src/Apache.mak Index: Apache.mak === RCS file: /export/home/cvs/apache/src/Apache.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C3 -r1.1 -r1.2 *** Apache.mak1997/07/18 23:54:22 1.1 --- Apache.mak1997/07/20 15:05:10 1.2 *** *** 1,27 ! # Microsoft Developer Studio Generated NMAKE File, Format Version 4.20 ! # ** DO NOT EDIT ** ! ! # TARGTYPE Win32 (x86) Console Application 0x0103 ! !IF $(CFG) == ! CFG=Apache - Win32 Debug ! !MESSAGE No configuration specified. Defaulting to Apache - Win32 Debug. !ENDIF ! !IF $(CFG) != Apache - Win32 Release $(CFG) !=\ ! Apache - 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 Apache.mak CFG=Apache - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE Apache - Win32 Release (based on\ ! Win32 (x86) Console Application) ! !MESSAGE Apache - Win32 Debug (based on\ ! Win32 (x86) Console Application) !MESSAGE !ERROR An invalid configuration is specified. !ENDIF --- 1,20 ! # Microsoft Developer Studio Generated NMAKE File, Based on Apache.dsp !IF $(CFG) == ! CFG=Apache - Win32 Release ! !MESSAGE No configuration specified. Defaulting to Apache - Win32 Release. !ENDIF ! !IF $(CFG) != Apache - Win32 Release $(CFG) != Apache - Win32 Debug !MESSAGE Invalid configuration $(CFG) specified. ! !MESSAGE You can specify a configuration when running NMAKE ! !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f Apache.mak CFG=Apache - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE Apache - Win32 Release (based on Win32 (x86) Console Application) ! !MESSAGE Apache - Win32 Debug (based on Win32 (x86) Console Application) !MESSAGE !ERROR An invalid configuration is specified. !ENDIF *** *** 31,88 !ELSE NULL=nul !ENDIF ! ! # Begin Project ! # PROP Target_Last_Scanned Apache - Win32 Debug CPP=cl.exe RSC=rc.exe !IF $(CFG) == Apache - Win32 Release - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir ApacheLa - # PROP BASE Intermediate_Dir ApacheLa - # PROP BASE Target_Dir - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir LaunchR - # PROP Intermediate_Dir LaunchR - # PROP Target_Dir OUTDIR=.\LaunchR INTDIR=.\LaunchR ALL : $(OUTDIR)\Apache.exe ! CLEAN : [EMAIL PROTECTED] $(INTDIR)\dummy.obj [EMAIL PROTECTED] $(OUTDIR)\Apache.exe $(OUTDIR) : if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR) - # 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 /c CPP_PROJ=/nologo /MD /W3 /GX /O2 /D WIN32 /D NDEBUG /D _CONSOLE\ ! /Fp$(INTDIR)/Apache.pch /YX /Fo$(INTDIR)/ /c CPP_OBJS=.\LaunchR/ ! CPP_SBRS=.\. ! # 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)/Apache.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:console /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 /nologo /subsystem:console /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 /nologo /subsystem:console /incremental:no\ ! /pdb:$(OUTDIR)/Apache.pdb /machine:I386\ ! /out:$(OUTDIR)/Apache.exe LINK32_OBJS= \ $(INTDIR)\dummy.obj --- 24,72 !ELSE NULL=nul !ENDIF ! CPP=cl.exe RSC=rc.exe !IF $(CFG) == Apache - Win32 Release OUTDIR=.\LaunchR INTDIR=.\LaunchR + # Begin Custom Macros + OutDir=.\.\LaunchR + # End Custom Macros + + !IF $(RECURSE) == 0 ALL :
cvs commit: apache/src/nt modules.c
ben 97/08/09 04:52:09
Modified:src ApacheCore.dsp ApacheCore.mak http_request.c
mod_cgi.c
src/nt modules.c
Log:
Make things compile under Win32 once more. Fix some warnings.
Revision ChangesPath
1.4 +8 -4 apache/src/ApacheCore.dsp
Index: ApacheCore.dsp
===
RCS file: /export/home/cvs/apache/src/ApacheCore.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheCore.dsp1997/07/22 19:25:17 1.3
+++ ApacheCore.dsp1997/08/09 11:52:03 1.4
@@ -109,6 +109,10 @@
# End Source File
# Begin Source File
+SOURCE=.\fnmatch.c
+# End Source File
+# Begin Source File
+
SOURCE=.\nt\getopt.c
# End Source File
# Begin Source File
@@ -169,10 +173,6 @@
# End Source File
# Begin Source File
-SOURCE=.\mod_browser.c
-# End Source File
-# Begin Source File
-
SOURCE=.\mod_cgi.c
# End Source File
# Begin Source File
@@ -210,6 +210,10 @@
# Begin Source File
SOURCE=.\mod_negotiation.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mod_setenvif.c
# End Source File
# Begin Source File
1.10 +328 -244 apache/src/ApacheCore.mak
Index: ApacheCore.mak
===
RCS file: /export/home/cvs/apache/src/ApacheCore.mak,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ApacheCore.mak1997/07/22 19:25:17 1.9
+++ ApacheCore.mak1997/08/09 11:52:04 1.10
@@ -28,10 +28,6 @@
NULL=nul
!ENDIF
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
!IF $(CFG) == ApacheCore - Win32 Release
OUTDIR=.\CoreR
@@ -54,6 +50,7 @@
[EMAIL PROTECTED] $(INTDIR)\alloc.obj
[EMAIL PROTECTED] $(INTDIR)\buff.obj
[EMAIL PROTECTED] $(INTDIR)\explain.obj
+ [EMAIL PROTECTED] $(INTDIR)\fnmatch.obj
[EMAIL PROTECTED] $(INTDIR)\getopt.obj
[EMAIL PROTECTED] $(INTDIR)\http_bprintf.obj
[EMAIL PROTECTED] $(INTDIR)\http_config.obj
@@ -69,7 +66,6 @@
[EMAIL PROTECTED] $(INTDIR)\mod_asis.obj
[EMAIL PROTECTED] $(INTDIR)\mod_auth.obj
[EMAIL PROTECTED] $(INTDIR)\mod_autoindex.obj
- [EMAIL PROTECTED] $(INTDIR)\mod_browser.obj
[EMAIL PROTECTED] $(INTDIR)\mod_cgi.obj
[EMAIL PROTECTED] $(INTDIR)\mod_dir.obj
[EMAIL PROTECTED] $(INTDIR)\mod_dll.obj
@@ -80,6 +76,7 @@
[EMAIL PROTECTED] $(INTDIR)\mod_log_config.obj
[EMAIL PROTECTED] $(INTDIR)\mod_mime.obj
[EMAIL PROTECTED] $(INTDIR)\mod_negotiation.obj
+ [EMAIL PROTECTED] $(INTDIR)\mod_setenvif.obj
[EMAIL PROTECTED] $(INTDIR)\mod_userdir.obj
[EMAIL PROTECTED] $(INTDIR)\modules.obj
[EMAIL PROTECTED] $(INTDIR)\multithread.obj
@@ -99,12 +96,46 @@
$(OUTDIR) :
if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR)
+CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I .\regex /D WIN32 /D NDEBUG /D\
_WINDOWS /Fp$(INTDIR)\ApacheCore.pch /YX /Fo$(INTDIR)\\
/Fd$(INTDIR)\\\
/FD /c
CPP_OBJS=.\CoreR/
CPP_SBRS=.
+
+.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) $
+
+
+MTL=midl.exe
MTL_PROJ=/nologo /D NDEBUG /mktyplib203 /win32
+RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o$(OUTDIR)\ApacheCore.bsc
BSC32_SBRS= \
@@ -122,6 +153,7 @@
$(INTDIR)\alloc.obj \
$(INTDIR)\buff.obj \
$(INTDIR)\explain.obj \
+ $(INTDIR)\fnmatch.obj \
$(INTDIR)\getopt.obj \
$(INTDIR)\http_bprintf.obj \
$(INTDIR)\http_config.obj \
@@ -137,7 +169,6 @@
$(INTDIR)\mod_asis.obj \
$(INTDIR)\mod_auth.obj \
$(INTDIR)\mod_autoindex.obj \
- $(INTDIR)\mod_browser.obj \
$(INTDIR)\mod_cgi.obj \
$(INTDIR)\mod_dir.obj \
$(INTDIR)\mod_dll.obj \
@@ -148,6 +179,7 @@
$(INTDIR)\mod_log_config.obj \
$(INTDIR)\mod_mime.obj \
$(INTDIR)\mod_negotiation.obj \
+ $(INTDIR)\mod_setenvif.obj \
$(INTDIR)\mod_userdir.obj \
$(INTDIR)\modules.obj \
$(INTDIR)\multithread.obj \
@@ -190,6 +222,8 @@
[EMAIL PROTECTED] $(INTDIR)\buff.sbr
[EMAIL PROTECTED] $(INTDIR)\explain.obj
[EMAIL PROTECTED] $(INTDIR)\explain.sbr
+ [EMAIL PROTECTED] $(INTDIR)\fnmatch.obj
+ [EMAIL PROTECTED] $(INTDIR)\fnmatch.sbr
[EMAIL PROTECTED] $(INTDIR)\getopt.obj
[EMAIL PROTECTED] $(INTDIR)\getopt.sbr
[EMAIL
cvs commit: apachen/src Makefile.nt
ben 97/08/16 07:24:03 Modified:src Makefile.nt Log: Something Bad happened to this file during the reshuffle. Made Good again. Revision ChangesPath 1.12 +102 -99 apachen/src/Makefile.nt Index: Makefile.nt === RCS file: /export/home/cvs/apachen/src/Makefile.nt,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile.nt 1997/08/13 08:37:14 1.11 +++ Makefile.nt 1997/08/16 14:24:02 1.12 @@ -1,99 +1,102 @@ -# Makefile for NT -# Note that this doesn't quite work... apache.exe doesn't depend on proxy.lib -# or regex.lib. Nor can it, without some messing about - the debug and release -# versions need different dependencies, and that isn't an option. -# One way that occurs to me to solve the problem is to have the proxy and -# regex makes delete the appropriate apache.exe. Tacky, but it'll work! -# Ben, 5 July 97 - -_apacher: -cd regex set CFG=regex - Win32 Release nmake /nologo -f regex.mak - cd . set CFG=ApacheCore - Win32 Release nmake /nologo -f ApacheCore.mak - cd . set CFG=Apache - Win32 Release nmake /nologo -f Apache.mak - cd os\win32 set CFG=ApacheModuleStatus - Win32 Release nmake /nologo -f ApacheModuleStatus.mak -# cd os\win32 set CFG=ApacheModuleInfo - Win32 Release nmake /nologo -f ApacheModuleInfo.mak - cd os\win32 set CFG=ApacheModuleAuthAnon - Win32 Release nmake /nologo -f ApacheModuleAuthAnon.mak - cd os\win32 set CFG=ApacheModuleDigest - Win32 Release nmake /nologo -f ApacheModuleDigest.mak - cd os\win32 set CFG=ApacheModuleCERNMeta - Win32 Release nmake /nologo -f ApacheModuleCERNMeta.mak - cd os\win32 set CFG=ApacheModuleExpires - Win32 Release nmake /nologo -f ApacheModuleExpires.mak - cd os\win32 set CFG=ApacheModuleHeaders - Win32 Release nmake /nologo -f ApacheModuleHeaders.mak - cd os\win32 set CFG=ApacheModuleUserTrack - Win32 Release nmake /nologo -f ApacheModuleUserTrack.mak - cd modules\proxy set CFG=ApacheModuleProxy - Win32 Release nmake /nologo -f ApacheModuleProxy.mak - -_apached: -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 os\win32 set CFG=ApacheModuleStatus - Win32 Debug nmake /nologo -f ApacheModuleStatus.mak -# cd os\win32 set CFG=ApacheModuleInfo - Win32 Debug nmake /nologo -f ApacheModuleInfo.mak - cd os\win32 set CFG=ApacheModuleAuthAnon - Win32 Debug nmake /nologo -f ApacheModuleAuthAnon.mak - cd os\win32 set CFG=ApacheModuleDigest - Win32 Debug nmake /nologo -f ApacheModuleDigest.mak - cd os\win32 set CFG=ApacheModuleCERNMeta - Win32 Debug nmake /nologo -f ApacheModuleCERNMeta.mak - cd os\win32 set CFG=ApacheModuleExpires - Win32 Debug nmake /nologo -f ApacheModuleExpires.mak - cd os\win32 set CFG=ApacheModuleHeaders - Win32 Debug nmake /nologo -f ApacheModuleHeaders.mak - cd os\win32 set CFG=ApacheModuleUserTrack - Win32 Debug nmake /nologo -f ApacheModuleUserTrack.mak - cd modules\proxy set CFG=ApacheModuleProxy - Win32 Debug nmake /nologo -f ApacheModuleProxy.mak - -installr: apacher - -mkdir \Apache - -mkdir \Apache\modules - -mkdir \Apache\logs - -mkdir \Apache\conf - copy ApacheR\Apache.exe \Apache - copy CoreR\ApacheCore.dll \Apache - copy nt\ApacheModuleStatusR\ApacheModuleStatus.dll \Apache\modules -# copy nt\ApacheModuleInfoR\ApacheModuleInfo.dll \Apache\modules - copy nt\ApacheModuleAuthAnonR\ApacheModuleAuthAnon.dll \Apache\modules - copy nt\ApacheModuleDigestR\ApacheModuleDigest.dll \Apache\modules - copy nt\ApacheModuleCERNMetaR\ApacheModuleCERNMeta.dll \Apache\modules - copy nt\ApacheModuleExpiresR\ApacheModuleExpires.dll \Apache\modules - copy nt\ApacheModuleHeadersR\ApacheModuleHeaders.dll \Apache\modules - copy nt\ApacheModuleUserTrackR\ApacheModuleUserTrack.dll \Apache\modules - copy modules\proxy\Release\ApacheModuleProxy.dll \Apache\modules - -installd: apached - -mkdir \Apache - -mkdir \Apache\modules - -mkdir \Apache\logs - -mkdir \Apache\conf - copy ApacheD\Apache.exe \Apache - copy CoreD\ApacheCore.dll \Apache - copy nt\ApacheModuleStatusD\ApacheModuleStatus.dll \Apache\modules -# copy nt\ApacheModuleInfoD\ApacheModuleInfo.dll \Apache\modules - copy nt\ApacheModuleAuthAnonD\ApacheModuleAuthAnon.dll \Apache\modules - copy nt\ApacheModuleDigestD\ApacheModuleDigest.dll \Apache\modules - copy nt\ApacheModuleCERNMetaD\ApacheModuleCERNMeta.dll \Apache\modules - copy nt\ApacheModuleExpiresD\ApacheModuleExpires.dll \Apache\modules -
cvs commit: apachen/src/modules/proxy proxy_ftp.c
ben 97/08/16 07:38:25 Modified:src/modules/proxy proxy_ftp.c Log: Life is easier if we don't have to have a pile of include paths used for a single include. Plus, then it compiles on NT. Revision ChangesPath 1.34 +1 -1 apachen/src/modules/proxy/proxy_ftp.c Index: proxy_ftp.c === RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_ftp.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- proxy_ftp.c 1997/08/15 18:30:10 1.33 +++ proxy_ftp.c 1997/08/16 14:38:25 1.34 @@ -54,7 +54,7 @@ #include mod_proxy.h #include http_main.h -#include mod_mime.h +#include ../standard/mod_mime.h /* * Decodes a '%' escaped string, and returns the number of characters
cvs commit: apachen/src/os/win32 .cvsignore
ben 97/08/17 06:03:32 Modified:src .cvsignore src/os/win32 .cvsignore Log: Bring ignores up to date. Revision ChangesPath 1.6 +6 -3 apachen/src/.cvsignore Index: .cvsignore === RCS file: /export/home/cvs/apachen/src/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore1997/07/15 22:36:49 1.5 +++ .cvsignore1997/08/17 13:03:30 1.6 @@ -5,7 +5,10 @@ Makefile.config *.mdp *.ncb -Release -Debug +*.dsw +*.opt +ApacheD +ApacheR CoreD -LaunchD +CoreR + 1.4 +9 -0 apachen/src/os/win32/.cvsignore Index: .cvsignore === RCS file: /export/home/cvs/apachen/src/os/win32/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore1997/07/20 15:05:11 1.3 +++ .cvsignore1997/08/17 13:03:31 1.4 @@ -4,11 +4,20 @@ *.plg *.dsw ApacheModuleAuthAnonD +ApacheModuleAuthAnonR ApacheModuleCERNMetaD +ApacheModuleCERNMetaR ApacheModuleDigestD +ApacheModuleDigestR ApacheModuleExpiresD +ApacheModuleExpiresR ApacheModuleHeadersD +ApacheModuleHeadersR ApacheModuleInfoD +ApacheModuleInfoR ApacheModuleRewriteD +ApacheModuleRewriteR ApacheModuleStatusD +ApacheModuleStatusR ApacheModuleUserTrackD +ApacheModuleUserTrackR
cvs commit: apachen/src/core http_protocol.c
ben 97/08/17 06:42:26 Modified:src/core http_protocol.c Log: Don't force lowercase on Win32. PR: 997 Revision ChangesPath 1.153 +2 -1 apachen/src/core/http_protocol.c Index: http_protocol.c === RCS file: /export/home/cvs/apachen/src/core/http_protocol.c,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- http_protocol.c 1997/08/15 17:59:50 1.152 +++ http_protocol.c 1997/08/17 13:42:25 1.153 @@ -545,7 +545,8 @@ if (r-uri[loop] == '\\') r-uri[loop] = '/'; }; - +#endif +#ifdef __EMX__ /* Fix OS/2 HPFS filename case problem. */ r-uri = strlwr(r-uri); #endif
cvs commit: apachen/src/modules/proxy ApacheModuleProxy.mak mod_proxy.h proxy_cache.c proxy_connect.c proxy_ftp.c
ben 97/08/17 06:56:29 Modified:src/modules/proxy ApacheModuleProxy.mak mod_proxy.h proxy_cache.c proxy_connect.c proxy_ftp.c Log: Move DEF_Explain to source files. Fix header dependency. PR: 902 Revision ChangesPath 1.3 +95 -6 apachen/src/modules/proxy/ApacheModuleProxy.mak Index: ApacheModuleProxy.mak === RCS file: /export/home/cvs/apachen/src/modules/proxy/ApacheModuleProxy.mak,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ApacheModuleProxy.mak 1997/08/13 08:37:21 1.2 +++ ApacheModuleProxy.mak 1997/08/17 13:56:26 1.3 @@ -221,8 +221,21 @@ !ELSEIF $(CFG) == ApacheModuleProxy - Win32 Debug +DEP_CPP_MOD_P=\ + ..\..\core\alloc.h\ + ..\..\core\buff.h\ + ..\..\core\conf.h\ + ..\..\core\explain.h\ + ..\..\core\http_config.h\ + ..\..\core\http_log.h\ + ..\..\core\http_protocol.h\ + ..\..\core\httpd.h\ + ..\..\os\win32\readdir.h\ + ..\..\regex\regex.h\ + .\mod_proxy.h\ + -$(INTDIR)\mod_proxy.obj : $(SOURCE) $(INTDIR) +$(INTDIR)\mod_proxy.obj : $(SOURCE) $(DEP_CPP_MOD_P) $(INTDIR) !ENDIF @@ -254,8 +267,25 @@ !ELSEIF $(CFG) == ApacheModuleProxy - Win32 Debug +DEP_CPP_PROXY=\ + ..\..\core\alloc.h\ + ..\..\core\buff.h\ + ..\..\core\conf.h\ + ..\..\core\explain.h\ + ..\..\core\http_config.h\ + ..\..\core\http_log.h\ + ..\..\core\http_main.h\ + ..\..\core\http_protocol.h\ + ..\..\core\httpd.h\ + ..\..\core\md5.h\ + ..\..\core\multithread.h\ + ..\..\core\util_date.h\ + ..\..\os\win32\readdir.h\ + ..\..\regex\regex.h\ + .\mod_proxy.h\ + -$(INTDIR)\proxy_cache.obj : $(SOURCE) $(INTDIR) +$(INTDIR)\proxy_cache.obj : $(SOURCE) $(DEP_CPP_PROXY) $(INTDIR) !ENDIF @@ -284,8 +314,22 @@ !ELSEIF $(CFG) == ApacheModuleProxy - Win32 Debug +DEP_CPP_PROXY_=\ + ..\..\core\alloc.h\ + ..\..\core\buff.h\ + ..\..\core\conf.h\ + ..\..\core\explain.h\ + ..\..\core\http_config.h\ + ..\..\core\http_log.h\ + ..\..\core\http_main.h\ + ..\..\core\http_protocol.h\ + ..\..\core\httpd.h\ + ..\..\os\win32\readdir.h\ + ..\..\regex\regex.h\ + .\mod_proxy.h\ + -$(INTDIR)\proxy_connect.obj : $(SOURCE) $(INTDIR) +$(INTDIR)\proxy_connect.obj : $(SOURCE) $(DEP_CPP_PROXY_) $(INTDIR) !ENDIF @@ -314,8 +358,22 @@ !ELSEIF $(CFG) == ApacheModuleProxy - Win32 Debug +DEP_CPP_PROXY_F=\ + ..\..\core\alloc.h\ + ..\..\core\buff.h\ + ..\..\core\conf.h\ + ..\..\core\explain.h\ + ..\..\core\http_config.h\ + ..\..\core\http_main.h\ + ..\..\core\http_protocol.h\ + ..\..\core\httpd.h\ + ..\..\os\win32\readdir.h\ + ..\..\regex\regex.h\ + ..\standard\mod_mime.h\ + .\mod_proxy.h\ + -$(INTDIR)\proxy_ftp.obj : $(SOURCE) $(INTDIR) +$(INTDIR)\proxy_ftp.obj : $(SOURCE) $(DEP_CPP_PROXY_F) $(INTDIR) !ENDIF @@ -345,8 +403,23 @@ !ELSEIF $(CFG) == ApacheModuleProxy - Win32 Debug +DEP_CPP_PROXY_H=\ + ..\..\core\alloc.h\ + ..\..\core\buff.h\ + ..\..\core\conf.h\ + ..\..\core\explain.h\ + ..\..\core\http_config.h\ + ..\..\core\http_log.h\ + ..\..\core\http_main.h\ + ..\..\core\http_protocol.h\ + ..\..\core\httpd.h\ + ..\..\core\util_date.h\ + ..\..\os\win32\readdir.h\ + ..\..\regex\regex.h\ + .\mod_proxy.h\ + -$(INTDIR)\proxy_http.obj : $(SOURCE) $(INTDIR) +$(INTDIR)\proxy_http.obj : $(SOURCE) $(DEP_CPP_PROXY_H) $(INTDIR) !ENDIF @@ -377,8 +450,24 @@ !ELSEIF $(CFG) == ApacheModuleProxy - Win32 Debug +DEP_CPP_PROXY_U=\ + ..\..\core\alloc.h\ + ..\..\core\buff.h\ + ..\..\core\conf.h\ + ..\..\core\explain.h\ + ..\..\core\http_config.h\ + ..\..\core\http_log.h\ + ..\..\core\http_main.h\ + ..\..\core\http_protocol.h\ + ..\..\core\httpd.h\ + ..\..\core\md5.h\ + ..\..\core\multithread.h\ + ..\..\os\win32\readdir.h\ + ..\..\regex\regex.h\ + .\mod_proxy.h\ + -$(INTDIR)\proxy_util.obj : $(SOURCE) $(INTDIR) +$(INTDIR)\proxy_util.obj : $(SOURCE) $(DEP_CPP_PROXY_U) $(INTDIR) !ENDIF 1.18 +0 -3 apachen/src/modules/proxy/mod_proxy.h Index: mod_proxy.h === RCS file: /export/home/cvs/apachen/src/modules/proxy/mod_proxy.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mod_proxy.h 1997/08/15 17:59:51 1.17 +++ mod_proxy.h 1997/08/17 13:56:26 1.18 @@ -103,9 +103,6
cvs commit: apachen/src/os/win32 util_win32.c
ben 97/08/18 03:59:06
Modified:src ApacheCore.dsp ApacheCore.mak
src/core conf.h http_request.c httpd.h
Added: src/os/win32 util_win32.c
Log:
First crack at Win32 filename canonicalisation. Needs work!
Revision ChangesPath
1.6 +4 -0 apachen/src/ApacheCore.dsp
Index: ApacheCore.dsp
===
RCS file: /export/home/cvs/apachen/src/ApacheCore.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApacheCore.dsp1997/08/13 08:37:13 1.5
+++ ApacheCore.dsp1997/08/18 10:59:01 1.6
@@ -253,6 +253,10 @@
# End Source File
# Begin Source File
+SOURCE=.\os\win32\util_nt.c
+# End Source File
+# Begin Source File
+
SOURCE=.\core\util_script.c
# End Source File
# Begin Source File
1.12 +61 -164 apachen/src/ApacheCore.mak
Index: ApacheCore.mak
===
RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ApacheCore.mak1997/08/13 08:37:14 1.11
+++ ApacheCore.mak1997/08/18 10:59:02 1.12
@@ -92,6 +92,7 @@
[EMAIL PROTECTED] $(INTDIR)\util_md5.obj
[EMAIL PROTECTED] $(INTDIR)\util_script.obj
[EMAIL PROTECTED] $(INTDIR)\util_snprintf.obj
+ [EMAIL PROTECTED] $(INTDIR)\util_win32.obj
[EMAIL PROTECTED] $(INTDIR)\vc50.idb
[EMAIL PROTECTED] $(OUTDIR)\ApacheCore.dll
[EMAIL PROTECTED] $(OUTDIR)\ApacheCore.exp
@@ -160,7 +161,8 @@
$(INTDIR)\util_date.obj \
$(INTDIR)\util_md5.obj \
$(INTDIR)\util_script.obj \
- $(INTDIR)\util_snprintf.obj
+ $(INTDIR)\util_snprintf.obj \
+ $(INTDIR)\util_win32.obj
$(OUTDIR)\ApacheCore.dll : $(OUTDIR) $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @
@@ -268,6 +270,8 @@
[EMAIL PROTECTED] $(INTDIR)\util_script.sbr
[EMAIL PROTECTED] $(INTDIR)\util_snprintf.obj
[EMAIL PROTECTED] $(INTDIR)\util_snprintf.sbr
+ [EMAIL PROTECTED] $(INTDIR)\util_win32.obj
+ [EMAIL PROTECTED] $(INTDIR)\util_win32.sbr
[EMAIL PROTECTED] $(INTDIR)\vc50.idb
[EMAIL PROTECTED] $(INTDIR)\vc50.pdb
[EMAIL PROTECTED] $(OUTDIR)\ApacheCore.bsc
@@ -329,7 +333,8 @@
$(INTDIR)\util_date.sbr \
$(INTDIR)\util_md5.sbr \
$(INTDIR)\util_script.sbr \
- $(INTDIR)\util_snprintf.sbr
+ $(INTDIR)\util_snprintf.sbr \
+ $(INTDIR)\util_win32.sbr
$(OUTDIR)\ApacheCore.bsc : $(OUTDIR) $(BSC32_SBRS)
$(BSC32) @
@@ -386,7 +391,8 @@
$(INTDIR)\util_date.obj \
$(INTDIR)\util_md5.obj \
$(INTDIR)\util_script.obj \
- $(INTDIR)\util_snprintf.obj
+ $(INTDIR)\util_snprintf.obj \
+ $(INTDIR)\util_win32.obj
$(OUTDIR)\ApacheCore.dll : $(OUTDIR) $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @
@@ -961,11 +967,6 @@
.\core\httpd.h\
.\os\win32\readdir.h\
.\regex\regex.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
-
-NODEP_CPP_MOD_A=\
- .\core\sfio.h\
$(INTDIR)\mod_access.obj $(INTDIR)\mod_access.sbr : $(SOURCE)\
@@ -1015,11 +1016,6 @@
.\core\util_script.h\
.\os\win32\readdir.h\
.\regex\regex.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
-
-NODEP_CPP_MOD_AC=\
- .\core\sfio.h\
$(INTDIR)\mod_actions.obj $(INTDIR)\mod_actions.sbr : $(SOURCE)\
@@ -1057,11 +1053,6 @@
.\core\httpd.h\
.\os\win32\readdir.h\
.\regex\regex.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
-
-NODEP_CPP_MOD_AL=\
- .\core\sfio.h\
$(INTDIR)\mod_alias.obj$(INTDIR)\mod_alias.sbr : $(SOURCE)\
@@ -1109,11 +1100,6 @@
.\core\util_script.h\
.\os\win32\readdir.h\
.\regex\regex.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
-
-NODEP_CPP_MOD_AS=\
- .\core\sfio.h\
$(INTDIR)\mod_asis.obj $(INTDIR)\mod_asis.sbr : $(SOURCE)
$(DEP_CPP_MOD_AS)\
@@ -1157,11 +1143,6 @@
.\core\httpd.h\
.\os\win32\readdir.h\
.\regex\regex.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
-
-NODEP_CPP_MOD_AU=\
- .\core\sfio.h\
$(INTDIR)\mod_auth.obj $(INTDIR)\mod_auth.sbr : $(SOURCE)
$(DEP_CPP_MOD_AU)\
@@ -1211,11 +1192,6 @@
.\core\util_script.h\
.\os\win32\readdir.h\
.\regex\regex.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
-
-NODEP_CPP_MOD_AUT=\
- .\core\sfio.h\
$(INTDIR)\mod_autoindex.obj$(INTDIR)\mod_autoindex.sbr :
$(SOURCE)\
@@ -1267,11 +1243,6 @@
.\core\util_script.h\
cvs commit: apachen/src ApacheCore.dsp ApacheCore.mak
ben 97/08/18 04:10:20 Modified:src ApacheCore.dsp ApacheCore.mak Log: Arg! Must remember to close the workspace before checking in! Revision ChangesPath 1.7 +34 -26apachen/src/ApacheCore.dsp Index: ApacheCore.dsp === RCS file: /export/home/cvs/apachen/src/ApacheCore.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ApacheCore.dsp1997/08/18 10:59:01 1.6 +++ ApacheCore.dsp1997/08/18 11:10:19 1.7 @@ -253,15 +253,15 @@ # End Source File # Begin Source File -SOURCE=.\os\win32\util_nt.c +SOURCE=.\core\util_script.c # End Source File # Begin Source File -SOURCE=.\core\util_script.c +SOURCE=.\core\util_snprintf.c # End Source File # Begin Source File -SOURCE=.\core\util_snprintf.c +SOURCE=.\os\win32\util_win32.c # End Source File # End Group # Begin Group Header Files @@ -269,95 +269,103 @@ # PROP Default_Filter h;hpp;hxx;hm;inl;fi;fd # Begin Source File -SOURCE=.\alloc.h +SOURCE=.\core\alloc.h +# End Source File +# Begin Source File + +SOURCE=.\core\buff.h +# End Source File +# Begin Source File + +SOURCE=.\core\conf.h # End Source File # Begin Source File -SOURCE=.\buff.h +SOURCE=.\core\explain.h # End Source File # Begin Source File -SOURCE=.\conf.h +SOURCE=.\core\fnmatch.h # End Source File # Begin Source File -SOURCE=.\explain.h +SOURCE=.\os\win32\getopt.h # End Source File # Begin Source File -SOURCE=.\nt\getopt.h +SOURCE=.\core\http_conf_globals.h # End Source File # Begin Source File -SOURCE=.\http_conf_globals.h +SOURCE=.\core\http_config.h # End Source File # Begin Source File -SOURCE=.\http_config.h +SOURCE=.\core\http_core.h # End Source File # Begin Source File -SOURCE=.\http_core.h +SOURCE=.\core\http_log.h # End Source File # Begin Source File -SOURCE=.\http_log.h +SOURCE=.\core\http_main.h # End Source File # Begin Source File -SOURCE=.\http_main.h +SOURCE=.\core\http_protocol.h # End Source File # Begin Source File -SOURCE=.\http_protocol.h +SOURCE=.\core\http_request.h # End Source File # Begin Source File -SOURCE=.\http_request.h +SOURCE=.\core\httpd.h # End Source File # Begin Source File -SOURCE=.\httpd.h +SOURCE=.\core\md5.h # End Source File # Begin Source File -SOURCE=.\md5.h +SOURCE=.\modules\standard\mod_mime.h # End Source File # Begin Source File -SOURCE=.\mod_mime.h +SOURCE=.\core\multithread.h # End Source File # Begin Source File -SOURCE=.\multithread.h +SOURCE=.\os\win32\readdir.h # End Source File # Begin Source File -SOURCE=.\nt\readdir.h +SOURCE=.\regex\regex.h # End Source File # Begin Source File -SOURCE=.\rfc1413.h +SOURCE=.\core\rfc1413.h # End Source File # Begin Source File -SOURCE=.\scoreboard.h +SOURCE=.\core\scoreboard.h # End Source File # Begin Source File -SOURCE=.\nt\service.h +SOURCE=.\os\win32\service.h # End Source File # Begin Source File -SOURCE=.\util_date.h +SOURCE=.\core\util_date.h # End Source File # Begin Source File -SOURCE=.\util_md5.h +SOURCE=.\core\util_md5.h # End Source File # Begin Source File -SOURCE=.\util_script.h +SOURCE=.\core\util_script.h # End Source File # End Group # Begin Group Resource Files 1.13 +1 -0 apachen/src/ApacheCore.mak Index: ApacheCore.mak === RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ApacheCore.mak1997/08/18 10:59:02 1.12 +++ ApacheCore.mak1997/08/18 11:10:19 1.13 @@ -845,6 +845,7 @@ .\core\http_log.h\ .\core\http_main.h\ .\core\http_protocol.h\ + .\core\http_request.h\ .\core\httpd.h\ .\core\util_date.h\ .\os\win32\readdir.h\
cvs commit: apachen/src/main http_main.c
ben 97/08/24 10:10:22
Modified:src/main http_main.c
Log:
Add child_{init,exit} to Win32.
Revision ChangesPath
1.208 +6 -0 apachen/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- http_main.c 1997/08/24 16:12:28 1.207
+++ http_main.c 1997/08/24 17:10:18 1.208
@@ -3523,6 +3523,7 @@
csd = -1;
dupped_csd = -1;
requests_this_child = 0;
+
(void)update_child_status(child_num, SERVER_READY, (request_rec*)NULL);
/*
@@ -3774,6 +3775,8 @@
* - Exit
*/
+child_init_modules(pconf, server_conf);
+
allowed_globals.jobsemaphore = create_semaphore(0);
allowed_globals.jobmutex = create_mutex(NULL);
@@ -3946,6 +3949,9 @@
}
destroy_semaphore(allowed_globals.jobsemaphore);
destroy_mutex(allowed_globals.jobmutex);
+
+child_exit_modules(pconf, server_conf);
+
cleanup_scoreboard();
exit(0);
cvs commit: apachen/src/main http_main.c
ben 97/08/24 11:41:31
Modified:src/main http_main.c
Log:
Remove do-nothing cruft.
Revision ChangesPath
1.209 +0 -30 apachen/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- http_main.c 1997/08/24 17:10:18 1.208
+++ http_main.c 1997/08/24 18:41:29 1.209
@@ -3804,20 +3804,6 @@
count_down = max_jobs_after_exit_request;
release_mutex(start_mutex);
start_mutex_released = 1;
-/* set the listen queue to 1 */
-{
- listen_rec *lr = listeners;
-
- do {
- /* to prove a point - Ben */
- ap_assert(!lr-used);
- if(lr-used)
- {
- listen(lr-fd, 1);
- }
- lr = lr-next;
- } while (lr != listeners);
-}
}
if(!start_exit)
{
@@ -3904,22 +3890,6 @@
if(!start_mutex_released)
{
release_mutex(start_mutex);
-}
-
-{
- listen_rec *lr;
-
- lr = listeners;
- do {
- /* prove the point again */
- ap_assert(!lr-used);
- if(lr-used)
- {
- closesocket(lr-fd);
- lr-fd = -1;
- }
- lr = lr-next;
- } while (lr != listeners);
}
for(i=0; inthreads; i++)
cvs commit: apachen/src CHANGES
ben 97/08/24 11:46:18 Modified:src CHANGES Log: Document name canonicalisation. Revision ChangesPath 1.417 +5 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.416 retrieving revision 1.417 diff -u -r1.416 -r1.417 --- CHANGES 1997/08/24 18:23:57 1.416 +++ CHANGES 1997/08/24 18:46:16 1.417 @@ -1,5 +1,10 @@ Changes with Apache 1.3a2 + *) Canonicalise filenames under Win32. Short filenames are + converted to long ones. Backslashes are converted to forward + slashes. Case is converted to lower. Parts of URLs that do not + correspond to files are left completely alone. [Ben Laurie] + *) PORT: 2 new OSs added to the list of ports: Encore's UMAX V: Arieh Markel [EMAIL PROTECTED] Acorn RISCiX: Stephen Borrill [EMAIL PROTECTED]
cvs commit: apachen/src .cvsignore
ben 97/08/24 11:47:00 Modified:src .cvsignore Log: A couple more bits of Win32 gubbins. Revision ChangesPath 1.8 +1 -0 apachen/src/.cvsignore Index: .cvsignore === RCS file: /export/home/cvs/apachen/src/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore1997/08/19 23:00:25 1.7 +++ .cvsignore1997/08/24 18:46:59 1.8 @@ -9,6 +9,7 @@ *.ncb *.dsw *.opt +*.plg ApacheD ApacheR CoreD
cvs commit: apachen/src/os/win32 ApacheModuleAuthAnon.mak ApacheModuleCERNMeta.mak ApacheModuleDigest.mak ApacheModuleExpires.mak ApacheModuleHeaders.mak ApacheModuleStatus.mak ApacheModuleUserTrack.mak
ben 97/08/30 07:27:32
Modified:src/os/win32 ApacheModuleAuthAnon.mak
ApacheModuleCERNMeta.mak ApacheModuleDigest.mak
ApacheModuleExpires.mak ApacheModuleHeaders.mak
ApacheModuleStatus.mak ApacheModuleUserTrack.mak
Log:
Fix dependencies.
Revision ChangesPath
1.6 +0 -5 apachen/src/os/win32/ApacheModuleAuthAnon.mak
Index: ApacheModuleAuthAnon.mak
===
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleAuthAnon.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApacheModuleAuthAnon.mak 1997/08/23 14:12:44 1.5
+++ ApacheModuleAuthAnon.mak 1997/08/30 14:27:29 1.6
@@ -214,11 +214,6 @@
..\..\main\httpd.h\
..\..\regex\regex.h\
.\readdir.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
-
-NODEP_CPP_MOD_A=\
- ..\..\main\sfio.h\
$(INTDIR)\mod_auth_anon.obj : $(SOURCE) $(DEP_CPP_MOD_A) $(INTDIR)
1.6 +0 -5 apachen/src/os/win32/ApacheModuleCERNMeta.mak
Index: ApacheModuleCERNMeta.mak
===
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleCERNMeta.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApacheModuleCERNMeta.mak 1997/08/23 14:12:45 1.5
+++ ApacheModuleCERNMeta.mak 1997/08/30 14:27:29 1.6
@@ -212,11 +212,6 @@
..\..\main\util_script.h\
..\..\regex\regex.h\
.\readdir.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
-
-NODEP_CPP_MOD_C=\
- ..\..\main\sfio.h\
$(INTDIR)\mod_cern_meta.obj : $(SOURCE) $(DEP_CPP_MOD_C) $(INTDIR)
1.6 +0 -5 apachen/src/os/win32/ApacheModuleDigest.mak
Index: ApacheModuleDigest.mak
===
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleDigest.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApacheModuleDigest.mak1997/08/23 14:12:45 1.5
+++ ApacheModuleDigest.mak1997/08/30 14:27:29 1.6
@@ -216,11 +216,6 @@
..\..\main\util_md5.h\
..\..\regex\regex.h\
.\readdir.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
-
-NODEP_CPP_MOD_D=\
- ..\..\main\sfio.h\
$(INTDIR)\mod_digest.obj : $(SOURCE) $(DEP_CPP_MOD_D) $(INTDIR)
1.6 +0 -5 apachen/src/os/win32/ApacheModuleExpires.mak
Index: ApacheModuleExpires.mak
===
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleExpires.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApacheModuleExpires.mak 1997/08/23 14:12:45 1.5
+++ ApacheModuleExpires.mak 1997/08/30 14:27:29 1.6
@@ -208,11 +208,6 @@
..\..\main\httpd.h\
..\..\regex\regex.h\
.\readdir.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
-
-NODEP_CPP_MOD_E=\
- ..\..\main\sfio.h\
$(INTDIR)\mod_expires.obj : $(SOURCE) $(DEP_CPP_MOD_E) $(INTDIR)
1.6 +0 -5 apachen/src/os/win32/ApacheModuleHeaders.mak
Index: ApacheModuleHeaders.mak
===
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleHeaders.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApacheModuleHeaders.mak 1997/08/23 14:12:46 1.5
+++ ApacheModuleHeaders.mak 1997/08/30 14:27:30 1.6
@@ -206,11 +206,6 @@
..\..\main\httpd.h\
..\..\regex\regex.h\
.\readdir.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
-
-NODEP_CPP_MOD_H=\
- ..\..\main\sfio.h\
$(INTDIR)\mod_headers.obj : $(SOURCE) $(DEP_CPP_MOD_H) $(INTDIR)
1.6 +16 -1 apachen/src/os/win32/ApacheModuleStatus.mak
Index: ApacheModuleStatus.mak
===
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleStatus.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApacheModuleStatus.mak1997/08/23 14:12:48 1.5
+++ ApacheModuleStatus.mak1997/08/30 14:27:30 1.6
@@ -204,8 +204,23 @@
!ELSEIF $(CFG) == ApacheModuleStatus - Win32 Debug
+DEP_CPP_MOD_S=\
+ ..\..\main\alloc.h\
+ ..\..\main\buff.h\
+ ..\..\main\conf.h\
+ ..\..\main\http_config.h\
+ ..\..\main\http_core.h\
+ ..\..\main\http_log.h\
+ ..\..\main\http_main.h\
+ ..\..\main\http_protocol.h\
+ ..\..\main\httpd.h\
+
cvs commit: apachen/src/main http_request.c
ben 97/08/31 09:28:52 Modified:src/main http_request.c Log: Temporary(?) fix for Win32 Auth not working. Revision ChangesPath 1.80 +3 -0 apachen/src/main/http_request.c Index: http_request.c === RCS file: /export/home/cvs/apachen/src/main/http_request.c,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- http_request.c1997/08/25 16:02:27 1.79 +++ http_request.c1997/08/31 16:28:51 1.80 @@ -382,7 +382,10 @@ entry_dir = entry_core-d; if (entry_core-r +/* FIXME: Temporarily removed, pending an explanation of function, in order to + fix Win32 [Ben] || entry_dir[0] != '/' +*/ || entry_core-d_components i) break; this_conf = NULL;
cvs commit: apachen/src/os/win32 ApacheModuleRewrite.dsp
ben 97/09/05 12:38:42
Modified:src/modules/proxy mod_proxy.h proxy_cache.c proxy_connect.c
proxy_ftp.c proxy_http.c proxy_util.c
src/os/win32 ApacheModuleRewrite.dsp
Log:
Fix warnings.
Revision ChangesPath
1.21 +4 -4 apachen/src/modules/proxy/mod_proxy.h
Index: mod_proxy.h
===
RCS file: /export/home/cvs/apachen/src/modules/proxy/mod_proxy.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_proxy.h 1997/09/05 00:26:33 1.20
+++ mod_proxy.h 1997/09/05 19:38:32 1.21
@@ -131,7 +131,7 @@
struct proxy_services
{
const char *scheme;
-int port;
+unsigned short port;
};
/* static information about a remote proxy */
@@ -140,7 +140,7 @@
const char *scheme;/* the schemes handled by this proxy, or '*' */
const char *protocol; /* the scheme used to talk to this proxy */
const char *hostname; /* the hostname of this proxy */
-int port; /* the port for this proxy */
+unsigned short port; /* the port for this proxy */
};
struct proxy_alias {
@@ -238,7 +238,7 @@
/* proxy_connect.c */
int proxy_connect_handler(request_rec *r, struct cache_req *c, char *url,
-const char *proxyhost, int proxyport);
+const char *proxyhost, unsigned short proxyport);
/* proxy_ftp.c */
@@ -250,7 +250,7 @@
int proxy_http_canon(request_rec *r, char *url, const char *scheme,
int def_port);
int proxy_http_handler(request_rec *r, struct cache_req *c, char *url,
-const char *proxyhost, int proxyport);
+const char *proxyhost, unsigned short proxyport);
/* proxy_util.c */
1.25 +4 -3 apachen/src/modules/proxy/proxy_cache.c
Index: proxy_cache.c
===
RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_cache.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- proxy_cache.c 1997/08/23 22:59:11 1.24
+++ proxy_cache.c 1997/09/05 19:38:34 1.25
@@ -87,8 +87,9 @@
else return 0;
}
-static int curbytes, cachesize, every;
-static unsigned long int curblocks;
+static int every;
+static unsigned curbytes, cachesize;
+static unsigned long curblocks;
static time_t now, expire;
static char *filename;
static mutex *garbage_mutex = NULL;
@@ -873,7 +874,7 @@
proxy_cache_tidy(struct cache_req *c)
{
server_rec *s=c-req-server;
-long int bc;
+unsigned long bc;
if (c-fp == NULL) return;
1.16 +3 -2 apachen/src/modules/proxy/proxy_connect.c
Index: proxy_connect.c
===
RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_connect.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- proxy_connect.c 1997/09/05 00:26:33 1.15
+++ proxy_connect.c 1997/09/05 19:38:34 1.16
@@ -94,14 +94,15 @@
int
proxy_connect_handler(request_rec *r, struct cache_req *c, char *url,
-const char *proxyhost, int proxyport)
+const char *proxyhost, unsigned short proxyport)
{
struct sockaddr_in server;
struct in_addr destaddr;
struct hostent server_hp;
const char *host, *err;
char *p;
-int port, sock;
+unsigned short port;
+int sock;
char buffer[HUGE_STRING_LEN];
int nbytes, i, j;
fd_set fds;
1.36 +6 -5 apachen/src/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===
RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_ftp.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- proxy_ftp.c 1997/08/17 13:56:27 1.35
+++ proxy_ftp.c 1997/09/05 19:38:35 1.36
@@ -249,13 +249,14 @@
char urlptr[HUGE_STRING_LEN];
long total_bytes_sent;
register int n, o, w;
+unsigned l;
conn_rec *con = r-connection;
tempurl = pstrdup(r-pool, url);
-if ((n = strcspn(tempurl, @)) != strlen(tempurl)) /* hide
user/passwd */
+if ((l = strcspn(tempurl, @)) != strlen(tempurl)) /* hide
user/passwd */
{
- memmove(tempurl + (n - 5), tempurl, 6);
- tempurl += n - 5; /* leave room for ftp:// */
+ memmove(tempurl + (l - 5), tempurl, 6);
+ tempurl += l - 5; /* leave room for ftp:// */
}
n = decodeenc(tempurl);
@@ -393,7 +394,7 @@
{
char *host, *path, *p, *user, *password, *parms;
const char *err;
-int port, userlen, i, j, len, sock, dsock, rc, nocache;
+int userlen, i, j, len, sock,
cvs commit: apachen/src/modules/proxy ApacheModuleProxy.mak
ben 97/09/05 12:39:22
Modified:src/modules/proxy ApacheModuleProxy.mak
Log:
Why has this changed?
Revision ChangesPath
1.5 +149 -25 apachen/src/modules/proxy/ApacheModuleProxy.mak
Index: ApacheModuleProxy.mak
===
RCS file: /export/home/cvs/apachen/src/modules/proxy/ApacheModuleProxy.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ApacheModuleProxy.mak 1997/08/23 14:12:43 1.4
+++ ApacheModuleProxy.mak 1997/09/05 19:39:21 1.5
@@ -199,6 +199,9 @@
!IF $(CFG) == ApacheModuleProxy - Win32 Release || $(CFG) ==\
ApacheModuleProxy - Win32 Debug
SOURCE=.\mod_proxy.c
+
+!IF $(CFG) == ApacheModuleProxy - Win32 Release
+
DEP_CPP_MOD_P=\
..\..\main\alloc.h\
..\..\main\buff.h\
@@ -211,17 +214,36 @@
..\..\os\win32\readdir.h\
..\..\regex\regex.h\
.\mod_proxy.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
-NODEP_CPP_MOD_P=\
- ..\..\main\sfio.h\
+
+$(INTDIR)\mod_proxy.obj : $(SOURCE) $(DEP_CPP_MOD_P) $(INTDIR)
+
+
+!ELSEIF $(CFG) == ApacheModuleProxy - Win32 Debug
+
+DEP_CPP_MOD_P=\
+ ..\..\main\alloc.h\
+ ..\..\main\buff.h\
+ ..\..\main\conf.h\
+ ..\..\main\explain.h\
+ ..\..\main\http_config.h\
+ ..\..\main\http_log.h\
+ ..\..\main\http_protocol.h\
+ ..\..\main\httpd.h\
+ ..\..\os\win32\readdir.h\
+ ..\..\regex\regex.h\
+ .\mod_proxy.h\
$(INTDIR)\mod_proxy.obj : $(SOURCE) $(DEP_CPP_MOD_P) $(INTDIR)
+!ENDIF
+
SOURCE=.\proxy_cache.c
+
+!IF $(CFG) == ApacheModuleProxy - Win32 Release
+
DEP_CPP_PROXY=\
..\..\main\alloc.h\
..\..\main\buff.h\
@@ -238,18 +260,40 @@
..\..\os\win32\readdir.h\
..\..\regex\regex.h\
.\mod_proxy.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
- {$(INCLUDE)}sys\utime.h\
-NODEP_CPP_PROXY=\
- ..\..\main\sfio.h\
+
+$(INTDIR)\proxy_cache.obj : $(SOURCE) $(DEP_CPP_PROXY) $(INTDIR)
+
+
+!ELSEIF $(CFG) == ApacheModuleProxy - Win32 Debug
+
+DEP_CPP_PROXY=\
+ ..\..\main\alloc.h\
+ ..\..\main\buff.h\
+ ..\..\main\conf.h\
+ ..\..\main\explain.h\
+ ..\..\main\http_config.h\
+ ..\..\main\http_log.h\
+ ..\..\main\http_main.h\
+ ..\..\main\http_protocol.h\
+ ..\..\main\httpd.h\
+ ..\..\main\md5.h\
+ ..\..\main\multithread.h\
+ ..\..\main\util_date.h\
+ ..\..\os\win32\readdir.h\
+ ..\..\regex\regex.h\
+ .\mod_proxy.h\
$(INTDIR)\proxy_cache.obj : $(SOURCE) $(DEP_CPP_PROXY) $(INTDIR)
+!ENDIF
+
SOURCE=.\proxy_connect.c
+
+!IF $(CFG) == ApacheModuleProxy - Win32 Release
+
DEP_CPP_PROXY_=\
..\..\main\alloc.h\
..\..\main\buff.h\
@@ -263,17 +307,37 @@
..\..\os\win32\readdir.h\
..\..\regex\regex.h\
.\mod_proxy.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
-NODEP_CPP_PROXY_=\
- ..\..\main\sfio.h\
+
+$(INTDIR)\proxy_connect.obj : $(SOURCE) $(DEP_CPP_PROXY_) $(INTDIR)
+
+
+!ELSEIF $(CFG) == ApacheModuleProxy - Win32 Debug
+
+DEP_CPP_PROXY_=\
+ ..\..\main\alloc.h\
+ ..\..\main\buff.h\
+ ..\..\main\conf.h\
+ ..\..\main\explain.h\
+ ..\..\main\http_config.h\
+ ..\..\main\http_log.h\
+ ..\..\main\http_main.h\
+ ..\..\main\http_protocol.h\
+ ..\..\main\httpd.h\
+ ..\..\os\win32\readdir.h\
+ ..\..\regex\regex.h\
+ .\mod_proxy.h\
$(INTDIR)\proxy_connect.obj : $(SOURCE) $(DEP_CPP_PROXY_) $(INTDIR)
+!ENDIF
+
SOURCE=.\proxy_ftp.c
+
+!IF $(CFG) == ApacheModuleProxy - Win32 Release
+
DEP_CPP_PROXY_F=\
..\..\main\alloc.h\
..\..\main\buff.h\
@@ -287,17 +351,37 @@
..\..\regex\regex.h\
..\standard\mod_mime.h\
.\mod_proxy.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
-NODEP_CPP_PROXY_F=\
- ..\..\main\sfio.h\
+
+$(INTDIR)\proxy_ftp.obj : $(SOURCE) $(DEP_CPP_PROXY_F) $(INTDIR)
+
+
+!ELSEIF $(CFG) == ApacheModuleProxy - Win32 Debug
+
+DEP_CPP_PROXY_F=\
+ ..\..\main\alloc.h\
+ ..\..\main\buff.h\
+ ..\..\main\conf.h\
+ ..\..\main\explain.h\
+ ..\..\main\http_config.h\
+ ..\..\main\http_main.h\
+ ..\..\main\http_protocol.h\
+ ..\..\main\httpd.h\
+ ..\..\os\win32\readdir.h\
+ ..\..\regex\regex.h\
+ ..\standard\mod_mime.h\
+ .\mod_proxy.h\
$(INTDIR)\proxy_ftp.obj : $(SOURCE) $(DEP_CPP_PROXY_F) $(INTDIR)
+!ENDIF
+
SOURCE=.\proxy_http.c
+
+!IF $(CFG) == ApacheModuleProxy - Win32 Release
+
DEP_CPP_PROXY_H=\
cvs commit: apachen/src/modules/proxy mod_proxy.h proxy_cache.c proxy_connect.c proxy_ftp.c proxy_http.c proxy_util.c
ben 97/09/06 07:17:02
Modified:src/modules/proxy mod_proxy.h proxy_cache.c proxy_connect.c
proxy_ftp.c proxy_http.c proxy_util.c
Log:
Unfix warnings.
Revision ChangesPath
1.22 +4 -4 apachen/src/modules/proxy/mod_proxy.h
Index: mod_proxy.h
===
RCS file: /export/home/cvs/apachen/src/modules/proxy/mod_proxy.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mod_proxy.h 1997/09/05 19:38:32 1.21
+++ mod_proxy.h 1997/09/06 14:16:56 1.22
@@ -131,7 +131,7 @@
struct proxy_services
{
const char *scheme;
-unsigned short port;
+int port;
};
/* static information about a remote proxy */
@@ -140,7 +140,7 @@
const char *scheme;/* the schemes handled by this proxy, or '*' */
const char *protocol; /* the scheme used to talk to this proxy */
const char *hostname; /* the hostname of this proxy */
-unsigned short port; /* the port for this proxy */
+int port; /* the port for this proxy */
};
struct proxy_alias {
@@ -238,7 +238,7 @@
/* proxy_connect.c */
int proxy_connect_handler(request_rec *r, struct cache_req *c, char *url,
-const char *proxyhost, unsigned short proxyport);
+const char *proxyhost, int proxyport);
/* proxy_ftp.c */
@@ -250,7 +250,7 @@
int proxy_http_canon(request_rec *r, char *url, const char *scheme,
int def_port);
int proxy_http_handler(request_rec *r, struct cache_req *c, char *url,
-const char *proxyhost, unsigned short proxyport);
+const char *proxyhost, int proxyport);
/* proxy_util.c */
1.26 +3 -4 apachen/src/modules/proxy/proxy_cache.c
Index: proxy_cache.c
===
RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_cache.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- proxy_cache.c 1997/09/05 19:38:34 1.25
+++ proxy_cache.c 1997/09/06 14:16:56 1.26
@@ -87,9 +87,8 @@
else return 0;
}
-static int every;
-static unsigned curbytes, cachesize;
-static unsigned long curblocks;
+static int curbytes, cachesize, every;
+static unsigned long int curblocks;
static time_t now, expire;
static char *filename;
static mutex *garbage_mutex = NULL;
@@ -874,7 +873,7 @@
proxy_cache_tidy(struct cache_req *c)
{
server_rec *s=c-req-server;
-unsigned long bc;
+long int bc;
if (c-fp == NULL) return;
1.17 +2 -3 apachen/src/modules/proxy/proxy_connect.c
Index: proxy_connect.c
===
RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_connect.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- proxy_connect.c 1997/09/05 19:38:34 1.16
+++ proxy_connect.c 1997/09/06 14:16:56 1.17
@@ -94,15 +94,14 @@
int
proxy_connect_handler(request_rec *r, struct cache_req *c, char *url,
-const char *proxyhost, unsigned short proxyport)
+const char *proxyhost, int proxyport)
{
struct sockaddr_in server;
struct in_addr destaddr;
struct hostent server_hp;
const char *host, *err;
char *p;
-unsigned short port;
-int sock;
+int port, sock;
char buffer[HUGE_STRING_LEN];
int nbytes, i, j;
fd_set fds;
1.37 +5 -6 apachen/src/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===
RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_ftp.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- proxy_ftp.c 1997/09/05 19:38:35 1.36
+++ proxy_ftp.c 1997/09/06 14:16:57 1.37
@@ -249,14 +249,13 @@
char urlptr[HUGE_STRING_LEN];
long total_bytes_sent;
register int n, o, w;
-unsigned l;
conn_rec *con = r-connection;
tempurl = pstrdup(r-pool, url);
-if ((l = strcspn(tempurl, @)) != strlen(tempurl)) /* hide
user/passwd */
+if ((n = strcspn(tempurl, @)) != strlen(tempurl)) /* hide
user/passwd */
{
- memmove(tempurl + (l - 5), tempurl, 6);
- tempurl += l - 5; /* leave room for ftp:// */
+ memmove(tempurl + (n - 5), tempurl, 6);
+ tempurl += n - 5; /* leave room for ftp:// */
}
n = decodeenc(tempurl);
@@ -394,7 +393,7 @@
{
char *host, *path, *p, *user, *password, *parms;
const char *err;
-int userlen, i, j, len, sock, dsock, rc, nocache;
+int port, userlen, i, j, len, sock, dsock, rc, nocache;
int passlen = 0;
cvs commit: apachen/src/modules/proxy ApacheModuleProxy.dsp
ben 97/09/13 16:10:53
Modified:src ApacheCore.mak
src/main http_main.c scoreboard.h
src/modules/proxy ApacheModuleProxy.dsp
Log:
Make things compile under Win32 again.
Revision ChangesPath
1.16 +113 -289 apachen/src/ApacheCore.mak
Index: ApacheCore.mak
===
RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ApacheCore.mak1997/09/12 08:05:42 1.15
+++ ApacheCore.mak1997/09/13 23:10:47 1.16
@@ -28,10 +28,6 @@
NULL=nul
!ENDIF
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
!IF $(CFG) == ApacheCore - Win32 Release
OUTDIR=.\CoreR
@@ -101,12 +97,46 @@
$(OUTDIR) :
if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR)
+CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I .\regex /I .\main /D WIN32 /D\
NDEBUG /D _WINDOWS /Fp$(INTDIR)\ApacheCore.pch /YX /Fo$(INTDIR)\\\
/Fd$(INTDIR)\\ /FD /c
CPP_OBJS=.\CoreR/
CPP_SBRS=.
+
+.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) $
+
+
+MTL=midl.exe
MTL_PROJ=/nologo /D NDEBUG /mktyplib203 /win32
+RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o$(OUTDIR)\ApacheCore.bsc
BSC32_SBRS= \
@@ -284,12 +314,46 @@
$(OUTDIR) :
if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR)
+CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I .\regex /I .\main /D
WIN32\
/D _DEBUG /D _WINDOWS /FR$(INTDIR)\\ /Fp$(INTDIR)\ApacheCore.pch
/YX\
/Fo$(INTDIR)\\ /Fd$(INTDIR)\\ /FD /c
CPP_OBJS=.\CoreD/
CPP_SBRS=.\CoreD/
+
+.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) $
+
+
+MTL=midl.exe
MTL_PROJ=/nologo /D _DEBUG /mktyplib203 /win32
+RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o$(OUTDIR)\ApacheCore.bsc
BSC32_SBRS= \
@@ -401,36 +465,6 @@
!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) $
-
-
!IF $(CFG) == ApacheCore - Win32 Release || $(CFG) ==\
ApacheCore - Win32 Debug
@@ -444,7 +478,6 @@
.\main\conf.h\
.\main\httpd.h\
.\main\multithread.h\
- .\main\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\
@@ -461,7 +494,7 @@
.\main\conf.h\
.\main\httpd.h\
.\main\multithread.h\
- .\os\win32\os.h\
+ .\main\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\
@@ -483,14 +516,8 @@
.\main\conf.h\
.\main\http_main.h\
.\main\httpd.h\
- .\main\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
-
-NODEP_CPP_BUFF_=\
- .\main\sfio.h\
$(INTDIR)\buff.obj : $(SOURCE) $(DEP_CPP_BUFF_) $(INTDIR)
@@ -505,7 +532,7 @@
.\main\conf.h\
.\main\http_main.h\
.\main\httpd.h\
- .\os\win32\os.h\
+ .\main\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\
@@ -588,14 +615,8 @@
.\main\buff.h\
.\main\conf.h\
.\main\httpd.h\
- .\main\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
-
-NODEP_CPP_HTTP_=\
- .\main\sfio.h\
$(INTDIR)\http_bprintf.obj : $(SOURCE) $(DEP_CPP_HTTP_) $(INTDIR)
@@ -609,7 +630,7 @@
.\main\buff.h\
.\main\conf.h\
.\main\httpd.h\
- .\os\win32\os.h\
+ .\main\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\
@@ -636,14 +657,8 @@
.\main\http_log.h\
.\main\http_request.h\
.\main\httpd.h\
- .\main\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\
- {$(INCLUDE)}sys\stat.h\
- {$(INCLUDE)}sys\types.h\
-
cvs commit: apachen/src/os/win32 ApacheOS.dsp ApacheOS.mak
ben 97/09/13 16:46:31
Modified:src ApacheCore.dsp ApacheCore.mak
src/main conf.h
src/os/win32 ApacheOS.dsp ApacheOS.mak
Log:
Use os.h in its original place.
Revision ChangesPath
1.10 +4 -0 apachen/src/ApacheCore.dsp
Index: ApacheCore.dsp
===
RCS file: /export/home/cvs/apachen/src/ApacheCore.dsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ApacheCore.dsp1997/09/12 08:05:41 1.9
+++ ApacheCore.dsp1997/09/13 23:46:25 1.10
@@ -337,6 +337,10 @@
# End Source File
# Begin Source File
+SOURCE=.\os\win32\os.h
+# End Source File
+# Begin Source File
+
SOURCE=.\os\win32\readdir.h
# End Source File
# Begin Source File
1.17 +72 -106 apachen/src/ApacheCore.mak
Index: ApacheCore.mak
===
RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ApacheCore.mak1997/09/13 23:10:47 1.16
+++ ApacheCore.mak1997/09/13 23:46:26 1.17
@@ -28,6 +28,10 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
!IF $(CFG) == ApacheCore - Win32 Release
OUTDIR=.\CoreR
@@ -97,46 +101,12 @@
$(OUTDIR) :
if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR)
-CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I .\regex /I .\main /D WIN32 /D\
NDEBUG /D _WINDOWS /Fp$(INTDIR)\ApacheCore.pch /YX /Fo$(INTDIR)\\\
/Fd$(INTDIR)\\ /FD /c
CPP_OBJS=.\CoreR/
CPP_SBRS=.
-
-.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) $
-
-
-MTL=midl.exe
MTL_PROJ=/nologo /D NDEBUG /mktyplib203 /win32
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o$(OUTDIR)\ApacheCore.bsc
BSC32_SBRS= \
@@ -314,46 +284,12 @@
$(OUTDIR) :
if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR)
-CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I .\regex /I .\main /D
WIN32\
/D _DEBUG /D _WINDOWS /FR$(INTDIR)\\ /Fp$(INTDIR)\ApacheCore.pch
/YX\
/Fo$(INTDIR)\\ /Fd$(INTDIR)\\ /FD /c
CPP_OBJS=.\CoreD/
CPP_SBRS=.\CoreD/
-
-.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) $
-
-
-MTL=midl.exe
MTL_PROJ=/nologo /D _DEBUG /mktyplib203 /win32
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o$(OUTDIR)\ApacheCore.bsc
BSC32_SBRS= \
@@ -465,6 +401,36 @@
!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) $
+
+
!IF $(CFG) == ApacheCore - Win32 Release || $(CFG) ==\
ApacheCore - Win32 Debug
@@ -494,7 +460,7 @@
.\main\conf.h\
.\main\httpd.h\
.\main\multithread.h\
- .\main\os.h\
+ .\os\win32\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\
@@ -532,7 +498,7 @@
.\main\conf.h\
.\main\http_main.h\
.\main\httpd.h\
- .\main\os.h\
+ .\os\win32\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\
@@ -630,7 +596,7 @@
.\main\buff.h\
.\main\conf.h\
.\main\httpd.h\
- .\main\os.h\
+ .\os\win32\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\
@@ -678,7 +644,7 @@
.\main\http_log.h\
.\main\http_request.h\
.\main\httpd.h\
- .\main\os.h\
+ .\os\win32\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\
@@ -734,10 +700,10 @@
.\main\http_request.h\
.\main\httpd.h\
.\main\md5.h\
- .\main\os.h\
.\main\rfc1413.h\
.\main\scoreboard.h\
.\main\util_md5.h\
+ .\os\win32\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\
@@ -780,7 +746,7 @@
.\main\http_log.h\
Re: cvs commit: apache-2.0/docs stacked_io
Marc Slemko wrote: On 8 Mar 1998 [EMAIL PROTECTED] wrote: +[djg: I'd like to consider filesystem metadata as well -- we only need +a few bits of metadata to do HTTP: file size and last modified. We +need an etag generation function, it is specific to the filters in +use. You see, I'm envisioning a bottom layer which pulls data out of +a database rather than reading from a file.] Yes, I strongly agree. Being able to add this sort of thing via modules would be very cool. Now, you may or may not want to implement the filesystem support as a moudule but that doesn't really matter. Best book seen today: WebTV for dummies. First, there were books like C for dummies. You know, reasonably complex topic, cool that they are calling people dummies. Then there were books like Netscape for dummies, or even AOL for Dummies fits in here. Those are books that you go god, anyone needing that must be a dummy. But with WebTV for dummies, all I think of is yup, sounds like an appropriate book. I love some of the names of the dummies books though. Client/Server Computing for Dummies. Crossword Puzzles for Dummies Bach for Dummies Baroque for Dummies Beer for Dummies Bird Watching for Dummies Business Plans for Dummies Building an Intranet for Dummies Cats for Dummies. (by Gina Spadafori; read quickly that name looks like someone else) Cooking for Dummies (hmm... cna take that one two ways...) Dating for Dummies Nuclear Physics for Dummies (just kidding) Ever since a friend of mine was approached to write xyz for Dummies (subject elided to protect the guilty), I've realised these should all be ... from Dummies, coz the deals they offer to write these things are of the type my agent describes as humiliating. 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 authorhttp://www.apache-ssl.org/ London, England. |Apache: TDG http://www.ora.com/catalog/apache
Re: cvs commit: apache-1.3/src/include hide.h
Ralf S. Engelschall wrote:
rse 98/03/13 08:49:45
Modified:src/main http_core.c
src/include hide.h
Log:
More statics which reduce the global exported symbol table.
[snip]
-const char *set_server_string_slot (cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_server_string_slot (cmd_parms *cmd, void *dummy,
+char *arg)
{
/* This one's pretty generic... */
This one should be part of the API (even if no-one does use it - they
should!)
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 authorhttp://www.apache-ssl.org/
London, England. |Apache: TDG http://www.ora.com/catalog/apache
Re: cvs commit: apache-1.3/src/main util.c
[EMAIL PROTECTED] wrote: dgaudet 98/03/14 13:27:11 Modified:src/main util.c Log: Ben does this give you warnings? It generates better code -- otherwise the compiler is stuck doing a bunch of byte - int extensions. This way only one extension occurs. Nope, this gives no warnings. Might be an idea to comment it so some smartass doesn't notice that it should be unsigned char... 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 authorhttp://www.apache-ssl.org/ London, England. |Apache: TDG http://www.ora.com/catalog/apache
Re: cvs commit: apache-1.3/src/modules/standard mod_include.c mod_log_agent.c mod_log_referer.c mod_mime_magic.c
[EMAIL PROTECTED] wrote: +cls-agent_fd = ap_piped_log_write_fd(pl); Not so sure about this ... surely it can't be an fd if it works for Win32? 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 authorhttp://www.apache-ssl.org/ London, England. |Apache: TDG http://www.ora.com/catalog/apache
Re: cvs commit: apache-1.3/src CHANGES
[EMAIL PROTECTED] wrote: brian 98/06/27 10:58:40 Modified:src CHANGES Log: All those who submit code towards a problem, not just the final integrator (despite any amount of rework) should be credited. True, but: a) A complete rewrite without reference to the original is not a rework (not that I begrudge a credit even in that case, however it is not strictly correct, and requiring a patcher to find and credit all attempts at fixing a problem is really asking a bit much). b) You've added Bill for the trailing .s but AFAICR he didn't ever submit a patch for it, only Alexei did (and, even though I didn't actually use Alexei's code, I still credited him). c) You've added Bill for the all dot directories problem, but I thought it was Manoj that contributed the code I didn't use? 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/recruit/
Re: cvs commit: apache-1.3/src/os/win32 util_win32.c
[EMAIL PROTECTED] wrote: - if(nSlashes == 3) /* then we need to add one more to get \\machine\share\ */ + /* then we need to add one more to get \\machine\share\ */ + if(nSlashes == 3) OK, this is a bit of a quibble, but... it seems to me that moving the comment to before the if() is damaging the meaning - it is only true if the if is true. 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/
Re: cvs commit: apache-1.3/src/main util.c
[EMAIL PROTECTED] wrote: 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. That wasn't the assumption, implicit or otherwise. The assumption was that !NULL is true. BTW, I quote KR ed. 2: the constant zero may be assigned to a pointer, and a pointer may be compared with the constant zero. The symbolic constant NULL is often used in place of zero. So, you appear to be objecting to the wisdom of God. Cheers, Ben. -- http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-2.0/mpm/src/main iol_unix.c Makefile.tmpl buff.c http_connection.c http_protocol.c http_request.c
[EMAIL PROTECTED] wrote: dgaudet 99/06/18 16:35:01 Modified:mpm/src CHANGES mpm/src/include buff.h mpm/src/main Makefile.tmpl buff.c http_connection.c http_protocol.c http_request.c Added: mpm/src/docs buff.txt mpm/src/include ap_iol.h mpm/src/main iol_unix.c Log: I'm sure this is wrong... but it's my start. i/o layering. Hoorah! Doupleplusone. Cheers, Ben. -- http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-2.0/mpm/src Configuration.mpm
[EMAIL PROTECTED] wrote: jim 99/06/19 15:16:04 Modified:mpm/src Configuration.mpm Log: FreeBSD requires this to grab the thread lib for pthreads. Uncomment when trying on that I used -lc_r - is there a difference? Cheers, Ben. -- http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-1.3/src/main http_main.c
[EMAIL PROTECTED] wrote: coar99/07/20 10:44:21 Modified:src/main http_main.c Log: *SecurityDescriptor() should be returning an error on Win98, but sometimes doesn't -- so check the last error if it claims all went well, just in case it's fibbing. Eeek! Things that _don't_ fail don't clear the last error in general. Cheers, Ben. -- http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-2.0/mpm/src/modules/mpm/mpmt_pthread mpmt_pthread.c
[EMAIL PROTECTED] wrote: manoj 99/07/29 13:06:20 Modified:mpm/src/modules/mpm/dexter dexter.c mpm/src/modules/mpm/mpmt_pthread mpmt_pthread.c Log: Use Ben Hyde's warning fix on two other MPMs. Tch! Ben Laurie! Cheers, Ben. -- http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-2.0/src/modules/mpm/mpmt_pthread acceptlock.c scoreboard.c
[EMAIL PROTECTED] wrote: -lock_fd[i] = ap_popenf(p, lock_fname, O_WRONLY, 0600); +ap_open(p, lock_fname, APR_WRITE, APR_UREAD | APR_UWRITE, tempfile); +ap_get_os_file(tempfile, *lock_fd[i]); Que? *lock_fd[i]? Cheers, Ben. -- http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-2.0/src/lib/apr/file_io/unix open.c
Ryan Bloom wrote:
-if ((*new)-filedes 0 (*new)-filehand == NULL) {
+if ((*new)-filedes 0 || (*new)-filehand == NULL) {
(*new)-filedes = -1;
(*new)-eof_hit = 1;
return errno;
This is wrong. This says that we NEVER open the file correctly. This is
because we only ever set one of the two options, either the filedes or the
filehand, NEVER both.
Yeah but filedes == 0 when you use filehand (which is possibly a bug).
We are checking for the error condition, not the
successful case. Either the filedes or the filehand WILL be not set after
each open. I have serious doubts that the code even works anymore. If
it does, it is only because we aren't checking return code properly.
OK, well it didn't work before, and it now does _when_ it is using
filehand. I agree this it is still broken, though, but less so than
before.
Cheers,
Ben.
--
http://www.apache-ssl.org/ben.html
My grandfather once told me that there are two kinds of people: those
who work and those who take the credit. He told me to try to be in the
first group; there was less competition there.
- Indira Gandhi
Re: cvs commit: apache-2.0/src Configure
[EMAIL PROTECTED] wrote: manoj 99/10/09 13:28:41 Modified:src Configure Log: Make Configure run autoheader in the APR directory. Revision ChangesPath 1.9 +1 -1 apache-2.0/src/Configure Index: Configure === RCS file: /home/cvs/apache-2.0/src/Configure,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -u -r1.8 -r1.9 --- Configure 1999/10/01 16:22:48 1.8 +++ Configure 1999/10/09 20:28:40 1.9 @@ -1727,7 +1727,7 @@ if [ -d ./lib/apr ]; then if [ ! -f ./lib/apr/configure ]; then echo + bootstrapping Apache Portable Runtime (APR) -(cd lib/apr autoconf) +(cd lib/apr autoconf autoheader) Ah. This really ought to be triggered by the existence of autoconf, or it doesn't actually help much (after the first time), does it? Cheers, Ben. -- http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-2.0/src/modules/standard mod_cgi.c
[EMAIL PROTECTED] wrote:
stoddard99/10/12 07:45:59
Modified:src/modules/standard mod_cgi.c
Log:
Fix bug interpreting cgi_child return code. Do some clean-up.
Revision ChangesPath
1.8 +6 -16 apache-2.0/src/modules/standard/mod_cgi.c
Index: mod_cgi.c
===
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgi.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_cgi.c 1999/10/12 04:06:58 1.7
+++ mod_cgi.c 1999/10/12 14:45:57 1.8
@@ -295,7 +295,7 @@
char *argv0;
};
-static int cgi_child(struct cgi_child_stuff *child_stuff,
+static ap_status_t cgi_child(struct cgi_child_stuff *child_stuff,
BUFF **script_out, BUFF **script_in, BUFF
**script_err)
{
struct cgi_child_stuff *cld = child_stuff;
@@ -308,7 +308,7 @@
ap_procattr_t *procattr;
ap_proc_t *procnew;
ap_os_proc_t fred;
-int rc;
+ap_status_t rc = APR_SUCCESS;
#ifdef DEBUG_CGI
#ifdef OS2
@@ -346,11 +346,6 @@
* NB only ISINDEX scripts get decoded arguments.
*/
-#ifdef TPF
-ap_unblock_alarms();
-
-return (0);
-#else
ap_cleanup_for_exec();
if ((ap_createprocattr_init(procattr, child_context) != APR_SUCCESS)
||
@@ -363,9 +358,7 @@
/* Something bad happened, tell the world. */
ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
couldn't create child process: %s, r-filename);
-ap_unblock_alarms();
-
-return (-1);
+rc = !APR_SUCCESS;
Errr, what? If the thing fails, you are supposed to return the error!
Cheers,
Ben.
--
http://www.apache-ssl.org/ben.html
My grandfather once told me that there are two kinds of people: those
who work and those who take the credit. He told me to try to be in the
first group; there was less competition there.
- Indira Gandhi
Re: cvs commit: apache-2.0/src/lib/apr/file_io/win32 fileacc.c
[EMAIL PROTECTED] wrote: stoddard99/11/02 06:24:57 Modified:src/lib/apr/file_io/win32 fileacc.c Log: call ap_getfileinfo if the file has not been stat'ed Eek! Can we use statted instead of stated for the member? This is bound to lead to confusion! Cheers, Ben. -- http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
[EMAIL PROTECTED] wrote: gstein 99/11/26 11:31:23 Modified:src/modules/standard mod_rewrite.c Log: The floating point rounding performed by the ap_snprintf() was throwing off the distribution of the random value. Nah, what threw it off was that it was just plain wrong. Cheers, Ben. -- http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-1.3/cgi-bin printenv
Marc Slemko wrote: 5. surround values with quotes to allow one to better recognize newlines (as in SERVER_SIGNATURE) and whitespaces and also print newlines as \n and as \ for a more Shell- and C-style syntax. Is it really standard to not display 's normally, but to stick a \ in front of them? I don't see that much. Standard or not, if you are going to do it, you really ought to replace \ with \\, too. Cheers, Ben. -- http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-2.0/src buildconf configure.in
[EMAIL PROTECTED] wrote: manoj 99/12/19 17:54:40 Modified:src buildconf configure.in Log: Make Apache's configure script run APR's. OK, but the config.cache should still be removed, surely? Also, BTW, the current version completely fails to build for me (lots of unresolved externals) - what's the current recommended build path? I'm slightly puzzled by what's going on with APR - it seems to build a dozen different libraries, but Apache only seems to use one. What am I missing? Cheers, Ben. -- SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-2.0/src buildconf configure.in
Ryan Bloom wrote: OK, but the config.cache should still be removed, surely? Also, BTW, the current version completely fails to build for me (lots of unresolved externals) - what's the current recommended build path? I'm slightly puzzled by what's going on with APR - it seems to build a dozen different libraries, but Apache only seems to use one. What am I missing? APR hasn't built a dozen different libraries for a long time. We are only building the one libapr.a. Should I send a log? Perhaps there's a step missing in the build? I dunno. I'm confused. What platform are you on? FreeBSD. I have the code working just fine on Linux and Windows. If you are using the prefork MPM, you have to specify LIBS=-lpthread. I let it choose (it chose threaded). If you are on any other platform, you are on your own. I'm _always_ on my own :-) The configure script has basically been written on Linux, and it is assumed it will be modified as we port 2.0. Consider me porting and modifying! Cheers, Ben. -- SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-2.0/src/lib/apr Makefile.in
[EMAIL PROTECTED] wrote: ben 99/12/22 03:46:36 Modified:src/lib/apr Makefile.in Log: We now link on FreeBSD 2.2.x. But somewhere recently we've started to require GNU make. Cheers, Ben. -- SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-2.0/src/lib/apr Makefile.in
Ryan Bloom wrote: On Wed, 22 Dec 1999, Ben Laurie wrote: [EMAIL PROTECTED] wrote: ben 99/12/22 03:46:36 Modified:src/lib/apr Makefile.in Log: We now link on FreeBSD 2.2.x. But somewhere recently we've started to require GNU make. When did that happen? Is it APR or Apache that is requiring GNU make? Diagnosed: its the include stuff. You can't say: -include $(DEP_FILES) in BSD make. You have to include them individually with .include and quotemarks... Does that work with GNU make? Cheers, Ben. -- SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-2.0/src/lib/apr Makefile.in
Sascha Schumann wrote: On Wed, Dec 22, 1999 at 05:52:05PM +, Ben Laurie wrote: Ryan Bloom wrote: On Wed, 22 Dec 1999, Ben Laurie wrote: [EMAIL PROTECTED] wrote: ben 99/12/22 03:46:36 Modified:src/lib/apr Makefile.in Log: We now link on FreeBSD 2.2.x. But somewhere recently we've started to require GNU make. When did that happen? Is it APR or Apache that is requiring GNU make? Diagnosed: its the include stuff. You can't say: -include $(DEP_FILES) in BSD make. You have to include them individually with .include and quotemarks... Does that work with GNU make? include filename is the portable version. Works with GNU, BSD, SysV make. Aha. Thanks. Cheers, Ben. -- SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-2.0/src/lib/apr Makefile.in
Sascha Schumann wrote: On Wed, Dec 22, 1999 at 05:52:05PM +, Ben Laurie wrote: Ryan Bloom wrote: On Wed, 22 Dec 1999, Ben Laurie wrote: [EMAIL PROTECTED] wrote: ben 99/12/22 03:46:36 Modified:src/lib/apr Makefile.in Log: We now link on FreeBSD 2.2.x. But somewhere recently we've started to require GNU make. When did that happen? Is it APR or Apache that is requiring GNU make? Diagnosed: its the include stuff. You can't say: -include $(DEP_FILES) in BSD make. You have to include them individually with .include and quotemarks... Does that work with GNU make? include filename is the portable version. Works with GNU, BSD, SysV make. Marvellous. In that case it is automake that is broken. I'm running v1.4. Cheers, Ben. -- SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-2.0/src/lib/apr Makefile.in
Sascha Schumann wrote: On Wed, Dec 22, 1999 at 06:27:18PM +, Ben Laurie wrote: Sascha Schumann wrote: On Wed, Dec 22, 1999 at 05:52:05PM +, Ben Laurie wrote: Ryan Bloom wrote: On Wed, 22 Dec 1999, Ben Laurie wrote: [EMAIL PROTECTED] wrote: ben 99/12/22 03:46:36 Modified:src/lib/apr Makefile.in Log: We now link on FreeBSD 2.2.x. But somewhere recently we've started to require GNU make. When did that happen? Is it APR or Apache that is requiring GNU make? Diagnosed: its the include stuff. You can't say: -include $(DEP_FILES) in BSD make. You have to include them individually with .include and quotemarks... Does that work with GNU make? include filename is the portable version. Works with GNU, BSD, SysV make. Marvellous. In that case it is automake that is broken. I'm running v1.4. make clean? Yes, that's broken :( Eh? What I mean is that it is automake that is generation the -include directive that does not work with BSD make. So, I can't fix it unless we can fix automake. Cheers, Ben. -- SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-2.0/src/modules/standard mod_digest.c mod_vhost_alias.c
[EMAIL PROTECTED] wrote: rbb 99/12/31 09:06:16 Modified:src/modules/standard mod_digest.c mod_vhost_alias.c Log: Update these modules to Apache 2.0. Not tested, but they compile again. On that note ... how do you actually get a module into Apache 2.0? I tried to add mod_actions earlier today (./configure --enable-actions) but it didn't seem to result in a server that understood Action. Not sure I'm keen on that method of doing it, anyway. Cheers, Ben. -- SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm http://www.apache-ssl.org/ben.html My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there. - Indira Gandhi
Re: cvs commit: apache-2.0/src/lib/apr/time/unix timestr.c
[EMAIL PROTECTED] wrote: src/lib/apr/include apr_portable.h src/lib/apr/locks/unix crossproc.c locks.h src/lib/apr/time/unix timestr.c Log: Make interprocess mutexes actually choose, fix semaphore mutexes. What does this mean? It means don't force them to be always fcntl, i.e. actually use the choice instead of overriding it. Index: apr_portable.h === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- apr_portable.h 2000/01/09 20:58:22 1.18 +++ apr_portable.h 2000/01/23 01:13:45 1.19 @@ -81,6 +81,9 @@ #if APR_HAVE_PTHREAD_H #include pthread.h #endif +#ifdef HAVE_STRUCT_UNION_SEMUN +#include sys/sem.h +#endif This is bad. We cannot use HAVE_ macros in public header files, because they aren't namepsace protected. It really doesn't matter if we named them ourselves or if autoconf named them for us. Please change this to APR_HAVE_STRUCT_UNION_SEMUN. Sure, but I couldn't figure out where/how that happens/should happen. Cheers, Ben. -- SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm http://www.apache-ssl.org/ben.html Y19100 no-prize winner! http://www.ntk.net/index.cgi?back=2000/now0121.txt
Re: cvs commit: apache-2.0/src/lib/apr/locks/unix locks.h
[EMAIL PROTECTED] wrote:
1.10 +1 -4 apache-2.0/src/lib/apr/locks/unix/locks.h
Index: locks.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- locks.h 2000/01/23 01:13:47 1.9
+++ locks.h 2000/01/24 13:59:02 1.10
@@ -88,9 +88,6 @@
#if HAVE_FCNTL_H
#include fcntl.h
#endif
-#ifdef HAVE_STRUCT_UNION_SEMUN
-#include sys/sem.h
-#endif
#if APR_HAS_THREADS
#if HAVE_PTHREAD_H
@@ -99,7 +96,7 @@
#endif
/* End System Headers */
-#ifndef HAVE_STRUCT_UNION_SEMUN
+#if !APR_HAVE_UNION_SEMUN APR_USE_SYSVSEM_SERIALIZE
/* it makes no sense, but this isn't defined on solaris */
union semun {
long val;
Que? If you don't include sys/sem.h, then this doesn't compile - why did
you remove it?
BTW, why are these structures included in the locking structure at all?
They're essentially constant static structures, but they currently exist
in each lock.
Cheers,
Ben.
--
SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm
http://www.apache-ssl.org/ben.html
Y19100 no-prize winner!
http://www.ntk.net/index.cgi?back=2000/now0121.txt
Re: cvs commit: apache-2.0/src/lib/apr/locks/unix locks.h
[EMAIL PROTECTED] wrote:
-#ifdef HAVE_STRUCT_UNION_SEMUN
-#include sys/sem.h
-#endif
#if APR_HAS_THREADS
#if HAVE_PTHREAD_H
@@ -99,7 +96,7 @@
#endif
/* End System Headers */
-#ifndef HAVE_STRUCT_UNION_SEMUN
+#if !APR_HAVE_UNION_SEMUN APR_USE_SYSVSEM_SERIALIZE
/* it makes no sense, but this isn't defined on solaris */
union semun {
long val;
Que? If you don't include sys/sem.h, then this doesn't compile - why did
you remove it?
If you look about four lines above this,. we include sys/sem.h if it is on
the system. The problem was we weren't checking for it. I put the check
into configure.in, so we should be including it. I just didn't see a need
for sys/sem.h to be included twice. :-)
Aha! :-)
In which case, it'd make sense to use HAVE_SYS_SEM_H for the other one,
too.
BTW, why are these structures included in the locking structure at all?
They're essentially constant static structures, but they currently exist
in each lock.
I have no good answer for this. I'll look into it though.
:-)
Cheers,
Ben.
--
SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm
http://www.apache-ssl.org/ben.html
Y19100 no-prize winner!
http://www.ntk.net/index.cgi?back=2000/now0121.txt
Re: cvs commit: apache-2.0/src/os/unix iol_socket.c unixd.c
[EMAIL PROTECTED] wrote: rbb 00/01/28 10:02:32 Modified:src/ap ap_hooks.c ap_sha1.c src/helpers build-modules-c.awk src/main buff.c gen_test_char.c http_config.c http_connection.c http_core.c http_main.c http_protocol.c http_request.c http_vhost.c iol_file.c listen.c rfc1413.c util.c util_md5.c util_script.c util_uri.c src/modules/mpm/prefork prefork.c src/modules/standard mod_actions.c mod_alias.c mod_asis.c mod_auth.c mod_dir.c mod_echo.c mod_setenvif.c src/os/unix iol_socket.c unixd.c Log: Include ap_config.h before httpd.h, this ensures that AP_USE_HSREGEX is defined correctly in all C files. If its a requirement, shouldn't httpd.h include ap_config.h, rather then requiring module authors to magically know they should do this? Cheers, Ben. -- SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm http://www.apache-ssl.org/ben.html Y19100 no-prize winner! http://www.ntk.net/index.cgi?back=2000/now0121.txt
