nginx-0.0.3-2004-03-16-16:35:20 import
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 436f1e8..224605a 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -2,7 +2,7 @@
#define _NGINX_H_INCLUDED_
-#define NGINX_VER "nginx/0.0.2"
+#define NGINX_VER "nginx/0.0.3"
#define NGINX_CONF (u_char *) "nginx.conf"
#define NGINX_PID "nginx.pid"
#define NGINX_NEW_PID_EXT ".newbin"
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index 9f593f0..fd67b76 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -3,14 +3,62 @@
#include <ngx_core.h>
+ngx_inline static size_t ngx_sprint_uchar(u_char *text, u_char c, size_t len)
+{
+ size_t n;
+ ngx_uint_t c1, c2;
+
+ n = 0;
+
+ if (len == n) {
+ return n;
+ }
+
+ c1 = c / 100;
+
+ if (c1) {
+ *text++ = (u_char) (c1 + '0');
+ n++;
+
+ if (len == n) {
+ return n;
+ }
+ }
+
+ c2 = (c % 100) / 10;
+
+ if (c1 || c2) {
+ *text++ = (u_char) (c2 + '0');
+ n++;
+
+ if (len == n) {
+ return n;
+ }
+ }
+
+ c2 = c % 10;
+
+ *text++ = (u_char) (c2 + '0');
+ n++;
+
+ return n;
+}
+
+
/* AF_INET only */
size_t ngx_sock_ntop(int family, struct sockaddr *addr, u_char *text,
size_t len)
{
u_char *p;
+ size_t n;
+ ngx_uint_t i;
struct sockaddr_in *addr_in;
+ if (len == 0) {
+ return 0;
+ }
+
if (family != AF_INET) {
return 0;
}
@@ -18,19 +66,101 @@
addr_in = (struct sockaddr_in *) addr;
p = (u_char *) &addr_in->sin_addr;
+ if (len > INET_ADDRSTRLEN) {
+ len = INET_ADDRSTRLEN;
+ }
+
+ n = ngx_sprint_uchar(text, p[0], len);
+
+ i = 1;
+
+ do {
+ if (len == n) {
+ text[n - 1] = '\0';
+ return n;
+ }
+
+ text[n++] = '.';
+
+ if (len == n) {
+ text[n - 1] = '\0';
+ return n;
+ }
+
+ n += ngx_sprint_uchar(&text[n], p[i++], len - n);
+
+ } while (i < 4);
+
+ if (len == n) {
+ text[n] = '\0';
+ return n;
+ }
+
+ text[n] = '\0';
+
+ return n;
+
+#if 0
return ngx_snprintf((char *) text,
len > INET_ADDRSTRLEN ? INET_ADDRSTRLEN : len,
"%u.%u.%u.%u", p[0], p[1], p[2], p[3]);
+#endif
}
-size_t ngx_inet_ntop(int family, u_char *addr, u_char *text, size_t len)
+size_t ngx_inet_ntop(int family, void *addr, u_char *text, size_t len)
{
+ u_char *p;
+ size_t n;
+ ngx_uint_t i;
+
+ if (len == 0) {
+ return 0;
+ }
+
if (family != AF_INET) {
return 0;
}
+ p = (u_char *) addr;
+
+ if (len > INET_ADDRSTRLEN) {
+ len = INET_ADDRSTRLEN;
+ }
+
+ n = ngx_sprint_uchar(text, p[0], len);
+
+ i = 1;
+
+ do {
+ if (len == n) {
+ text[n - 1] = '\0';
+ return n;
+ }
+
+ text[n++] = '.';
+
+ if (len == n) {
+ text[n - 1] = '\0';
+ return n;
+ }
+
+ n += ngx_sprint_uchar(&text[n], p[i++], len - n);
+
+ } while (i < 4);
+
+ if (len == n) {
+ text[n] = '\0';
+ return n;
+ }
+
+ text[n] = '\0';
+
+ return n;
+
+#if 0
return ngx_snprintf((char *) text,
len > INET_ADDRSTRLEN ? INET_ADDRSTRLEN : len,
- "%u.%u.%u.%u", addr[0], addr[1], addr[2], addr[3]);
+ "%u.%u.%u.%u", p[0], p[1], p[2], p[3]);
+#endif
}
diff --git a/src/core/ngx_inet.h b/src/core/ngx_inet.h
index f5f5e0d..074d43c 100644
--- a/src/core/ngx_inet.h
+++ b/src/core/ngx_inet.h
@@ -4,7 +4,7 @@
size_t ngx_sock_ntop(int family, struct sockaddr *addr, u_char *text,
size_t len);
-size_t ngx_inet_ntop(int family, u_char *addr, u_char *text, size_t len);
+size_t ngx_inet_ntop(int family, void *addr, u_char *text, size_t len);
#endif /* _NGX_INET_H_INCLUDED_ */
diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c
index 10326bc..55c4a50 100644
--- a/src/core/ngx_output_chain.c
+++ b/src/core/ngx_output_chain.c
@@ -265,8 +265,14 @@
ctx->last = &cl->next;
}
+ ngx_log_debug1(NGX_LOG_DEBUG_CORE, ctx->connection->log, 0,
+ "WRITER0: %X", ctx->out);
+
ctx->out = ngx_write_chain(ctx->connection, ctx->out);
+ ngx_log_debug1(NGX_LOG_DEBUG_CORE, ctx->connection->log, 0,
+ "WRITER1: %X", ctx->out);
+
if (ctx->out == NGX_CHAIN_ERROR) {
return NGX_ERROR;
}
