diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2010-11-21 22:45:18 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2010-11-21 22:45:18 +0000 |
| commit | f2c43d19b91f8847c1dfd87721254b44f963d9a2 (patch) | |
| tree | 4710d37952455e247de95eedf55ea05ee4df9f69 /apps/s_server.c | |
| parent | 0cedaa6c89235ed396068f2ebf546c9a909439e1 (diff) | |
| download | src-f2c43d19b91f8847c1dfd87721254b44f963d9a2.tar.gz src-f2c43d19b91f8847c1dfd87721254b44f963d9a2.zip | |
Import OpenSSL 0.9.8p.vendor/openssl/0.9.8p
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=215643
svn path=/vendor-crypto/openssl/0.9.8p/; revision=215644; tag=vendor/openssl/0.9.8p
Diffstat (limited to 'apps/s_server.c')
| -rw-r--r-- | apps/s_server.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index 88b308ca388f..9ef643e2b4df 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -2075,12 +2075,14 @@ static int www_body(char *hostname, int s, unsigned char *context) { char *buf=NULL; int ret=1; - int i,j,k,blank,dot; + int i,j,k,dot; struct stat st_buf; SSL *con; SSL_CIPHER *c; BIO *io,*ssl_bio,*sbio; +#ifdef RENEG long total_bytes; +#endif buf=OPENSSL_malloc(bufsize); if (buf == NULL) return(0); @@ -2151,7 +2153,6 @@ static int www_body(char *hostname, int s, unsigned char *context) SSL_set_msg_callback_arg(con, bio_s_out); } - blank=0; for (;;) { if (hack) @@ -2388,7 +2389,9 @@ static int www_body(char *hostname, int s, unsigned char *context) BIO_puts(io,"HTTP/1.0 200 ok\r\nContent-type: text/plain\r\n\r\n"); } /* send the file */ +#ifdef RENEG total_bytes=0; +#endif for (;;) { i=BIO_read(file,buf,bufsize); |