bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed duplicate code from process_server_headers() and removed the calls

Browse Source 
to strlen(); readline() already returns the length of the string, so use
that instead.
This commit is contained in:
Robert James Kaes 2001-12-19 20:40:23 +00:00
parent e964cf0d35
commit 63a1fa96cc
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -2,6 +2,9 @@
* src/reqs.c (write_message): Encapsulate code to handle sending * src/reqs.c (write_message): Encapsulate code to handle sending
snprintf() built lines to a file descriptor. snprintf() built lines to a file descriptor.
(process_server_headers): Removed duplicate code and used the
return value from readline() instead of recaculating it by
strlen().
2001-12-18 Robert James Kaes <rjkaes@flarenet.com> 2001-12-18 Robert James Kaes <rjkaes@flarenet.com>

23
src/reqs.c
View File

@ -1,4 +1,4 @@
/* $Id: reqs.c,v 1.48 2001-12-19 05:20:01 rjkaes Exp $ /* $Id: reqs.c,v 1.49 2001-12-19 20:40:23 rjkaes Exp $
* *
* This is where all the work in tinyproxy is actually done. Incoming * This is where all the work in tinyproxy is actually done. Incoming
* connections have a new thread created for them. The thread then * connections have a new thread created for them. The thread then
@ -702,28 +702,25 @@ static int
process_server_headers(struct conn_s *connptr) process_server_headers(struct conn_s *connptr)
{ {
char *header; char *header;
ssize_t len;
for (;;) { while (1) {
if (readline(connptr->server_fd, &header) <= 0) { if ((len = readline(connptr->server_fd, &header)) <= 0) {
DEBUG2("Server (file descriptor %d) closed connection.", DEBUG2("Server (file descriptor %d) closed connection.",
connptr->server_fd); connptr->server_fd);
return -1; return -1;
} }
if (safe_write(connptr->client_fd, header, len) < 0) {
safefree(header);
return -1;
}
if (header[0] == '\n' if (header[0] == '\n'
|| (header[0] == '\r' && header[1] == '\n')) { || (header[0] == '\r' && header[1] == '\n'))
break; break;
}
if (safe_write(connptr->client_fd, header, strlen(header)) < 0) {
safefree(header); safefree(header);
return -1;
}
}
if (safe_write(connptr->client_fd, header, strlen(header)) < 0) {
safefree(header);
return -1;
} }
safefree(header); safefree(header);