www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

fixups for remaining current warnings

Browse Source 
Submitted by:	Chuck Murcko


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85563 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chuck Murcko
2000-06-13 06:17:47 +00:00
parent 54a3c92ce6
commit 54c34b3ea7
4 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/proxy/proxy_connect.c
View File

@@ -115,15 +115,15 @@ int ap_proxy_connect_handler(request_rec *r, ap_cache_el *c, char *url,
const char *proxyhost, int proxyport) const char *proxyhost, int proxyport)
{ {
struct in_addr destaddr; struct in_addr destaddr;
const char *host, *err; const char *host;
char *p; char *p;
int port; int port;
ap_socket_t *sock; ap_socket_t *sock;
char buffer[HUGE_STRING_LEN]; char buffer[HUGE_STRING_LEN];
int nbytes, i, j; int nbytes, i;
BUFF *sock_buff; BUFF *sock_buff;
ap_socket_t *client_sock; ap_socket_t *client_sock=NULL;
ap_pollfd_t *pollfd; ap_pollfd_t *pollfd;
ap_int32_t pollcnt; ap_int32_t pollcnt;
ap_int16_t pollevent; ap_int16_t pollevent;

5
modules/proxy/proxy_ftp.c
View File

@@ -460,12 +460,11 @@ static int ftp_unauthorized (request_rec *r, int log_it)
*/ */
int ap_proxy_ftp_handler(request_rec *r, ap_cache_el *c, char *url) int ap_proxy_ftp_handler(request_rec *r, ap_cache_el *c, char *url)
{ {
char *host, *path, *strp, *parms, *server_addr; char *host, *path, *strp, *parms;
char *cwd = NULL; char *cwd = NULL;
char *user = NULL; char *user = NULL;
/* char *account = NULL; how to supply an account in a URL? */ /* char *account = NULL; how to supply an account in a URL? */
const char *password = NULL; const char *password = NULL;
const char *err;
ap_socket_t *sock, *dsock, *inc; ap_socket_t *sock, *dsock, *inc;
int port, i, j, len, rc, nocache = 0; int port, i, j, len, rc, nocache = 0;
ap_socket_t *csd; ap_socket_t *csd;
@@ -485,9 +484,7 @@ int ap_proxy_ftp_handler(request_rec *r, ap_cache_el *c, char *url)
/* stuff for PASV mode */ /* stuff for PASV mode */
unsigned int presult, h0, h1, h2, h3, p0, p1; unsigned int presult, h0, h1, h2, h3, p0, p1;
unsigned int paddr;
unsigned short pport; unsigned short pport;
struct sockaddr_in data_addr;
int pasvmode = 0; int pasvmode = 0;
char pasv[64]; char pasv[64];
char *pstr, dates[AP_RFC822_DATE_LEN]; char *pstr, dates[AP_RFC822_DATE_LEN];

10
modules/proxy/proxy_http.c
View File

@@ -172,15 +172,14 @@ int ap_proxy_http_handler(request_rec *r, ap_cache_el *c, char *url,
{ {
const char *strp; const char *strp;
char *strp2; char *strp2;
const char *err, *desthost; const char *desthost;
ap_socket_t *sock; ap_socket_t *sock;
int i, j, len, backasswards, content_length=-1; int i, len, backasswards, content_length=-1;
ap_array_header_t *reqhdrs_arr; ap_array_header_t *reqhdrs_arr;
ap_table_t *resp_hdrs; ap_table_t *resp_hdrs=NULL;
ap_table_entry_t *reqhdrs; ap_table_entry_t *reqhdrs;
struct sockaddr_in server; struct sockaddr_in server;
struct in_addr destaddr; struct in_addr destaddr;
struct hostent server_hp;
BUFF *f, *cachefp=NULL; BUFF *f, *cachefp=NULL;
char buffer[HUGE_STRING_LEN]; char buffer[HUGE_STRING_LEN];
char portstr[32]; char portstr[32];
@@ -456,7 +455,8 @@ int ap_proxy_http_handler(request_rec *r, ap_cache_el *c, char *url,
ap_bwrite(r->connection->client, buffer, len, &cntr); ap_bwrite(r->connection->client, buffer, len, &cntr);
if (cachefp && ap_bwrite(cachefp, buffer, len, &cntr) != len) { if (cachefp && ap_bwrite(cachefp, buffer, len, &cntr) != len) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
"proxy: error writing extra data to cache"); "proxy: error writing extra data to cache %ld",
(long)cachefp);
ap_proxy_cache_error(&c); ap_proxy_cache_error(&c);
} }
} }

3
modules/proxy/proxy_util.c
View File

@@ -496,9 +496,8 @@ long int ap_proxy_send_fb(proxy_completion *completion, BUFF *f, request_rec *r,
int ok; int ok;
char buf[IOBUFSIZE]; char buf[IOBUFSIZE];
long total_bytes_rcvd, in_buffer; long total_bytes_rcvd, in_buffer;
proxy_server_conf *conf = (proxy_server_conf *) ap_get_module_config(r->server->module_config, &proxy_module);
ap_ssize_t cntr; ap_ssize_t cntr;
register int n, o, w; register int n, o;
conn_rec *con = r->connection; conn_rec *con = r->connection;
int alternate_timeouts = 1; /* 1 if we alternate between soft & hard timeouts */ int alternate_timeouts = 1; /* 1 if we alternate between soft & hard timeouts */
BUFF *cachefp = NULL; BUFF *cachefp = NULL;