|
1.3 bug fixes: msg#00060web.lighttpd
Hello, Compiler and bug fixes below: diff -Naur lighttpd-1.3.0/src/connections.c lighttpd-1.3.0-patch/src/connections.c --- lighttpd-1.3.0/src/connections.c Thu Sep 16 11:28:25 2004 +++ lighttpd-1.3.0-patch/src/connections.c Fri Sep 17 14:01:08 2004 @@ -136,7 +136,9 @@ } int connection_close(server *srv, connection *con) { +#ifdef USE_OPENSSL server_socket *srv_sock = con->srv_socket; +#endif #if 0 struct timeval tv; @@ -220,7 +222,9 @@ static int connection_handle_read(server *srv, connection *con) { int len; buffer *b; +#ifdef USE_OPENSSL server_socket *srv_sock = con->srv_socket; +#endif b = chunkqueue_get_append_buffer(con->read_queue); buffer_prepare_copy(b, 4096); @@ -1144,7 +1148,9 @@ int connection_state_machine(server *srv, connection *con) { int done = 0, r; +#ifdef USE_OPENSSL server_socket *srv_sock = con->srv_socket; +#endif #if 0 fprintf(stderr, "3. s(%d): %s ", diff -Naur lighttpd-1.3.0/src/inet_ntop_cache.c lighttpd-1.3.0-patch/src/inet_ntop_cache.c --- lighttpd-1.3.0/src/inet_ntop_cache.c Sat Sep 11 00:39:16 2004 +++ lighttpd-1.3.0-patch/src/inet_ntop_cache.c Fri Sep 17 14:01:32 2004 @@ -2,6 +2,7 @@ #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> +#include <string.h> #include "base.h" diff -Naur lighttpd-1.3.0/src/mod_rrdtool.c lighttpd-1.3.0-patch/src/mod_rrdtool.c --- lighttpd-1.3.0/src/mod_rrdtool.c Wed Sep 1 15:47:26 2004 +++ lighttpd-1.3.0-patch/src/mod_rrdtool.c Fri Sep 17 14:01:53 2004 @@ -235,7 +235,7 @@ buffer_append_string(p->cmd, "RRA:MIN:0.5:24:775 "); buffer_append_string(p->cmd, "RRA:MIN:0.5:288:797\n"); - if (-1 == (r != write(p->write_fd, p->cmd->ptr, p->cmd->used - 1))) { + if (-1 == (r = write(p->write_fd, p->cmd->ptr, p->cmd->used - 1))) { log_error_write(srv, __FILE__, __LINE__, "ss", "rrdtool-write: failed", strerror(errno)); @@ -285,7 +285,7 @@ buffer_append_long(p->cmd, p->requests); BUFFER_APPEND_STRING_CONST(p->cmd, "\n"); - if (-1 == (r != write(p->write_fd, p->cmd->ptr, p->cmd->used - 1))) { + if (-1 == (r = write(p->write_fd, p->cmd->ptr, p->cmd->used - 1))) { p->rrdtool_running = 0; log_error_write(srv, __FILE__, __LINE__, "ss", |
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| Previous by Date: | Re: Fixed Referer/User Agent patch: 00060, Jan Kneschke |
|---|---|
| Next by Date: | 1.3 + pcre problems: 00060, zell |
| Previous by Thread: | regarding 1.3.0i: 00060, Jan Kneschke |
| Next by Thread: | Re: 1.3 bug fixes: 00060, Jan Kneschke |
| Indexes: | [Date] [Thread] [Top] [All Lists] |
| News | FAQ | advertise |