nginx-0.0.1-2003-01-30-21:21:39 import

diff --git a/src/core/nginx.c b/src/core/nginx.c
index 5652e416738bcdcdc74f03fbfc074e1e5b3fc984..3133f879243a21ad14a4459cd5fa5ae48856525a 100644 (file)
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -52,11 +52,12 @@ int main(int argc, char *const *argv)
     ngx_pool = ngx_create_pool(16 * 1024, &ngx_log);
     /* */
 
-#if !(WIN32)
+#if (WIN32)
+    ngx_init_sockets(&ngx_log);
+#else
     ngx_set_signals(&ngx_log);
 #endif
 
-    ngx_init_sockets(&ngx_log);
 
     ngx_init_array(ngx_listening_sockets, ngx_pool, 10, sizeof(ngx_listen_t),
                    1);

diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h
index 719781efc6be36fe30876755a5f6f4ed967cdf52..ca2d5c117c0e7ac78e16766a206a079872674bee 100644 (file)
--- a/src/http/ngx_http.h
+++ b/src/http/ngx_http.h
@@ -245,6 +245,9 @@ int ngx_http_init_connection(ngx_connection_t *c);
 int ngx_http_discard_body(ngx_http_request_t *r);
 
 
+int ngx_http_special_response(ngx_http_request_t *r, int error);
+
+
 extern int  ngx_max_module;
 extern ngx_array_t  ngx_http_servers;
 

diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 522cb25c2023b42114a1b35d8b12d6b0fa9de862..c4d15ca87be51c38ef826533997d3fc4e6e7dad7 100644 (file)
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -85,6 +85,8 @@ extern int ngx_http_max_module;
 
 int ngx_http_core_translate_handler(ngx_http_request_t *r);
 
+int ngx_http_error(ngx_http_request_t *r, int error);
+int ngx_http_close_request(ngx_http_request_t *r);
 
 
 #endif /* _NGX_HTTP_CORE_H_INCLUDED_ */

diff --git a/src/os/unix/ngx_socket.h b/src/os/unix/ngx_socket.h
index 2a602d2be87aa327e5fd04e1bbf9b386223bc570..b4be76240d34753ef0a8eae27b9e9ba43f1f5236 100644 (file)
--- a/src/os/unix/ngx_socket.h
+++ b/src/os/unix/ngx_socket.h
@@ -8,8 +8,6 @@
 
 typedef int  ngx_socket_t;
 
-#define ngx_init_sockets
-
 #define ngx_socket(af, type, proto, flags)   socket(af, type, proto)
 #define ngx_socket_n        "socket()"