You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by Ben Laurie <be...@hyperreal.org> on 1997/09/05 21:38:47 UTC
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 Changes Path
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, dsock, rc, nocache;
int passlen = 0;
int csd = 0;
struct sockaddr_in server;
@@ -417,7 +418,7 @@
/* stuff for PASV mode */
unsigned int presult, h0, h1, h2, h3, p0, p1;
unsigned int paddr;
- unsigned short pport;
+ unsigned short pport, port;
struct sockaddr_in data_addr;
int pasvmode = 0;
char pasv[64];
1.31 +2 -2 apachen/src/modules/proxy/proxy_http.c
Index: proxy_http.c
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_http.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- proxy_http.c 1997/09/01 03:07:27 1.30
+++ proxy_http.c 1997/09/05 19:38:36 1.31
@@ -139,7 +139,7 @@
*/
int
proxy_http_handler(request_rec *r, struct cache_req *c, char *url,
- const char *proxyhost, int proxyport)
+ const char *proxyhost, unsigned short proxyport)
{
char *p;
const char *err, *desthost;
@@ -154,7 +154,7 @@
char buffer[HUGE_STRING_LEN];
pool *pool=r->pool;
const long int zero=0L;
- int destport = 0;
+ unsigned short destport = 0;
char *destportstr = NULL;
char *urlptr = NULL;
1.28 +2 -1 apachen/src/modules/proxy/proxy_util.c
Index: proxy_util.c
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_util.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- proxy_util.c 1997/09/02 16:12:14 1.27
+++ proxy_util.c 1997/09/05 19:38:36 1.28
@@ -110,7 +110,8 @@
char *
proxy_canonenc(pool *p, const char *x, int len, enum enctype t, int isenc)
{
- int i, j, ch;
+ int i, j;
+ char ch;
char *y;
const char *allowed; /* characters which should not be encoded */
const char *reserved; /* characters which much not be en/de-coded */
1.5 +2 -2 apachen/src/os/win32/ApacheModuleRewrite.dsp
Index: ApacheModuleRewrite.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleRewrite.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ApacheModuleRewrite.dsp 1997/08/31 16:43:17 1.4
+++ ApacheModuleRewrite.dsp 1997/09/05 19:38:40 1.5
@@ -55,7 +55,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem: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
+# ADD LINK32 ..\..\CoreR\ApacheCore.lib wsock32.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:windows /dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleRewrite - Win32 Debug"
@@ -81,7 +81,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem: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 /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