diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2003-01-30 18:21:39 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2003-01-30 18:21:39 +0000 |
| commit | 2a2d2b5094ee88dba5984eddfc4135b66bb8007e (patch) | |
| tree | c8f15571d41075aa7fd0558273ef817934468c6c | |
| parent | 86de4cbef5f075840406e24e16a2b1417f721bb3 (diff) | |
| download | nginx-2a2d2b5094ee88dba5984eddfc4135b66bb8007e.tar.gz nginx-2a2d2b5094ee88dba5984eddfc4135b66bb8007e.zip | |
nginx-0.0.1-2003-01-30-21:21:39 import
| -rw-r--r-- | src/core/nginx.c | 5 | ||||
| -rw-r--r-- | src/http/ngx_http.h | 3 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.h | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_socket.h | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index 5652e4167..3133f8792 100644 --- 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 719781efc..ca2d5c117 100644 --- 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 522cb25c2..c4d15ca87 100644 --- 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 2a602d2be..b4be76240 100644 --- 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()" |