]> git.kaiwu.me - nginx.git/commitdiff
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
authorIgor Sysoev <igor@sysoev.ru>
Tue, 28 Sep 2004 08:34:51 +0000 (08:34 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Tue, 28 Sep 2004 08:34:51 +0000 (08:34 +0000)
216 files changed:
src/core/nginx.c
src/core/nginx.h
src/core/ngx_array.c
src/core/ngx_array.h
src/core/ngx_buf.c
src/core/ngx_buf.h
src/core/ngx_conf_file.c
src/core/ngx_conf_file.h
src/core/ngx_config.h
src/core/ngx_connection.c
src/core/ngx_connection.h
src/core/ngx_core.h
src/core/ngx_crc.h
src/core/ngx_cycle.c
src/core/ngx_cycle.h
src/core/ngx_file.c
src/core/ngx_file.h
src/core/ngx_garbage_collector.c
src/core/ngx_garbage_collector.h
src/core/ngx_inet.c
src/core/ngx_inet.h
src/core/ngx_list.c
src/core/ngx_list.h
src/core/ngx_log.c
src/core/ngx_log.h
src/core/ngx_output_chain.c
src/core/ngx_palloc.c
src/core/ngx_palloc.h
src/core/ngx_parse.c
src/core/ngx_parse.h
src/core/ngx_radix_tree.c
src/core/ngx_radix_tree.h
src/core/ngx_rbtree.c
src/core/ngx_rbtree.h
src/core/ngx_regex.c
src/core/ngx_regex.h
src/core/ngx_slab.c
src/core/ngx_slab.h
src/core/ngx_spinlock.c
src/core/ngx_string.c
src/core/ngx_string.h
src/core/ngx_table.h
src/core/ngx_times.c
src/core/ngx_times.h
src/event/modules/ngx_aio_module.c
src/event/modules/ngx_aio_module.h
src/event/modules/ngx_devpoll_module.c
src/event/modules/ngx_epoll_module.c
src/event/modules/ngx_iocp_module.c
src/event/modules/ngx_iocp_module.h
src/event/modules/ngx_kqueue_module.c
src/event/modules/ngx_kqueue_module.h
src/event/modules/ngx_overlapped_module.c [deleted file]
src/event/modules/ngx_poll_module.c
src/event/modules/ngx_rtsig_module.c
src/event/modules/ngx_select_module.c
src/event/ngx_event.c
src/event/ngx_event.h
src/event/ngx_event_accept.c
src/event/ngx_event_acceptex.c
src/event/ngx_event_aio_read.c [deleted file]
src/event/ngx_event_aio_write.c [deleted file]
src/event/ngx_event_busy_lock.c
src/event/ngx_event_busy_lock.h
src/event/ngx_event_connect.c
src/event/ngx_event_connect.h
src/event/ngx_event_connectex.c
src/event/ngx_event_mutex.c
src/event/ngx_event_openssl.c
src/event/ngx_event_openssl.h
src/event/ngx_event_pipe.c
src/event/ngx_event_pipe.h
src/event/ngx_event_posted.c
src/event/ngx_event_posted.h
src/event/ngx_event_recv.c [deleted file]
src/event/ngx_event_thread.c [deleted file]
src/event/ngx_event_timer.c
src/event/ngx_event_timer.h
src/event/ngx_event_wsarecv.c [deleted file]
src/http/modules/ngx_http_access_handler.c
src/http/modules/ngx_http_charset_filter.c
src/http/modules/ngx_http_chunked_filter.c
src/http/modules/ngx_http_gzip_filter.c
src/http/modules/ngx_http_headers_filter.c
src/http/modules/ngx_http_index_handler.c
src/http/modules/ngx_http_not_modified_filter.c
src/http/modules/ngx_http_range_filter.c
src/http/modules/ngx_http_rewrite_handler.c
src/http/modules/ngx_http_ssi_filter.c
src/http/modules/ngx_http_ssl_module.c
src/http/modules/ngx_http_ssl_module.h
src/http/modules/ngx_http_static_handler.c
src/http/modules/ngx_http_status_handler.c
src/http/modules/ngx_http_userid_filter.c
src/http/modules/proxy/ngx_http_proxy_cache.c
src/http/modules/proxy/ngx_http_proxy_handler.c
src/http/modules/proxy/ngx_http_proxy_handler.h
src/http/modules/proxy/ngx_http_proxy_header.c
src/http/modules/proxy/ngx_http_proxy_parse.c
src/http/modules/proxy/ngx_http_proxy_upstream.c
src/http/ngx_http.c
src/http/ngx_http.h
src/http/ngx_http_busy_lock.c
src/http/ngx_http_busy_lock.h
src/http/ngx_http_cache.c
src/http/ngx_http_cache.h
src/http/ngx_http_config.h
src/http/ngx_http_copy_filter.c
src/http/ngx_http_core_module.c
src/http/ngx_http_core_module.h
src/http/ngx_http_file_cache.c
src/http/ngx_http_header_filter.c
src/http/ngx_http_log_handler.c
src/http/ngx_http_log_handler.h
src/http/ngx_http_parse.c
src/http/ngx_http_parse_time.c
src/http/ngx_http_request.c
src/http/ngx_http_request.h
src/http/ngx_http_request_body.c
src/http/ngx_http_script.c
src/http/ngx_http_script.h
src/http/ngx_http_special_response.c
src/http/ngx_http_write_filter.c
src/imap/ngx_imap.c
src/imap/ngx_imap.h
src/imap/ngx_imap_handler.c
src/imap/ngx_imap_parse.c
src/imap/ngx_imap_proxy.c
src/os/unix/ngx_aio.h
src/os/unix/ngx_aio_read.c
src/os/unix/ngx_aio_read_chain.c
src/os/unix/ngx_aio_write.c
src/os/unix/ngx_aio_write_chain.c
src/os/unix/ngx_alloc.c
src/os/unix/ngx_alloc.h
src/os/unix/ngx_atomic.h
src/os/unix/ngx_channel.c
src/os/unix/ngx_channel.h
src/os/unix/ngx_daemon.c
src/os/unix/ngx_errno.c
src/os/unix/ngx_errno.h
src/os/unix/ngx_files.c
src/os/unix/ngx_files.h
src/os/unix/ngx_freebsd.h
src/os/unix/ngx_freebsd_config.h
src/os/unix/ngx_freebsd_init.c
src/os/unix/ngx_freebsd_rfork_thread.c
src/os/unix/ngx_freebsd_rfork_thread.h
src/os/unix/ngx_freebsd_sendfile_chain.c
src/os/unix/ngx_linux.h
src/os/unix/ngx_linux_config.h
src/os/unix/ngx_linux_init.c
src/os/unix/ngx_linux_sendfile_chain.c
src/os/unix/ngx_os.h
src/os/unix/ngx_posix_config.h
src/os/unix/ngx_posix_init.c
src/os/unix/ngx_process.c
src/os/unix/ngx_process.h
src/os/unix/ngx_process_cycle.c
src/os/unix/ngx_process_cycle.h
src/os/unix/ngx_pthread_thread.c
src/os/unix/ngx_readv_chain.c
src/os/unix/ngx_recv.c
src/os/unix/ngx_send.c
src/os/unix/ngx_sendv.c [deleted file]
src/os/unix/ngx_sendv.h [deleted file]
src/os/unix/ngx_shared.c
src/os/unix/ngx_shared.h
src/os/unix/ngx_socket.c
src/os/unix/ngx_socket.h
src/os/unix/ngx_solaris.h
src/os/unix/ngx_solaris_config.h
src/os/unix/ngx_solaris_init.c
src/os/unix/ngx_solaris_sendfilev_chain.c
src/os/unix/ngx_thread.h
src/os/unix/ngx_time.c
src/os/unix/ngx_time.h
src/os/unix/ngx_types.h
src/os/unix/ngx_unix_init.c [deleted file]
src/os/unix/ngx_user.h
src/os/unix/ngx_writev_chain.c
src/os/unix/ngx_x86_mutex.h [deleted file]
src/os/unix/rfork_thread.S
src/os/win32/ngx_alloc.c
src/os/win32/ngx_alloc.h
src/os/win32/ngx_atomic.h
src/os/win32/ngx_errno.c
src/os/win32/ngx_errno.h
src/os/win32/ngx_files.c
src/os/win32/ngx_files.h
src/os/win32/ngx_os.h
src/os/win32/ngx_os_thread.c [deleted file]
src/os/win32/ngx_os_thread.h [deleted file]
src/os/win32/ngx_process.c
src/os/win32/ngx_process.h
src/os/win32/ngx_process_cycle.c
src/os/win32/ngx_process_cycle.h
src/os/win32/ngx_recv.h [deleted file]
src/os/win32/ngx_sendfile.c [deleted file]
src/os/win32/ngx_sendv.c [deleted file]
src/os/win32/ngx_sendv.h [deleted file]
src/os/win32/ngx_service.c
src/os/win32/ngx_shared.h
src/os/win32/ngx_socket.c
src/os/win32/ngx_socket.h
src/os/win32/ngx_stat.c
src/os/win32/ngx_thread.h
src/os/win32/ngx_time.c
src/os/win32/ngx_time.h
src/os/win32/ngx_types.h
src/os/win32/ngx_user.h
src/os/win32/ngx_win32_config.h
src/os/win32/ngx_win32_init.c
src/os/win32/ngx_wsarecv.c
src/os/win32/ngx_wsarecv_chain.c
src/os/win32/ngx_wsasend_chain.c

index e9046fd9597ca9dc667814df78535b8f5e014477..920b60163af396e31c60d500a92da62e878bc8a4 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 769a9bf411274d4cbbe7b962ba68af3ec58801aa..c53ad7a545f207feb1aaa275c69e280f856ae9a6 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGINX_H_INCLUDED_
 #define _NGINX_H_INCLUDED_
 
index 8ecb83f86f9476e9391129de60acfce6ca4c97d1..0bc25a931bb234d806dda81f1b7d08315fc244ac 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index a6a1c8aea9e20b1b1e344f324dfb05f323c1f919..6a2fe0357b9afe94ca6803282552157d6d08ccc1 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_ARRAY_H_INCLUDED_
 #define _NGX_ARRAY_H_INCLUDED_
 
index 16398a638b95ae3752481f5fda7bce5b1d7acf3b..ca64783e78f3dbef8e51cee103b3eeabe025a771 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index 1927ed4157489084153b4df0c08f707976bf7120..fa2a544d06e41489f090fe6e566bc4f85ff76890 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_BUF_H_INCLUDED_
 #define _NGX_BUF_H_INCLUDED_
 
@@ -6,46 +12,9 @@
 #include <ngx_core.h>
 
 
-#if 0
-/* the buf type */
-
-/* the buf's content is in memory */
-#define NGX_HUNK_IN_MEMORY    0x0001
-/* the buf's content can be changed */
-#define NGX_HUNK_TEMP         0x0002
-/* the buf's content is in cache and can not be changed */
-#define NGX_HUNK_MEMORY       0x0004
-#define NGX_HUNK_MMAP         0x0008
-
-/* the buf's content is recycled */
-#define NGX_HUNK_RECYCLED     0x0010
-
-/* the buf's content is in a file */
-#define NGX_HUNK_FILE         0x0020
-
-#define NGX_HUNK_STORAGE      (NGX_HUNK_IN_MEMORY                            \
-                               |NGX_HUNK_TEMP|NGX_HUNK_MEMORY|NGX_HUNK_MMAP  \
-                               |NGX_HUNK_RECYCLED|NGX_HUNK_FILE)
-
-/* the buf flags */
+typedef void *            ngx_buf_tag_t;
 
-/* in thread state flush means to write the buf completely before return */
-/* in event state flush means to start to write the buf */
-#define NGX_HUNK_FLUSH        0x0100
-
-/* the last buf */
-#define NGX_HUNK_LAST         0x0200
-
-
-#define NGX_HUNK_PREREAD      0x2000
-#define NGX_HUNK_LAST_SHADOW  0x4000
-#define NGX_HUNK_TEMP_FILE    0x8000
-#endif
-
-
-typedef void *                   ngx_buf_tag_t;
-
-typedef struct ngx_buf_s         ngx_buf_t;
+typedef struct ngx_buf_s  ngx_buf_t;
 
 struct ngx_buf_s {
     u_char          *pos;
@@ -61,17 +30,18 @@ struct ngx_buf_s {
     ngx_buf_t       *shadow;
 
 
-    /* the buf's content can be changed */
+    /* the buf's content could be changed */
     unsigned         temporary:1;
 
     /*
      * the buf's content is in a memory cache or in a read only memory
-     * and can not be changed
+     * and must not be changed
      */
     unsigned         memory:1;
 
-    /* the buf's content is mmap()ed and can not be changed */
+    /* the buf's content is mmap()ed and must not be changed */
     unsigned         mmap:1;
+
     unsigned         recycled:1;
     unsigned         in_file:1;
     unsigned         flush:1;
index e0fec6fa07e8694d9de2c19098afdddb6800b011..99c5df1cf1e3cf82c63bc75fc42bfe9a80f84a76 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index d2c76131ad1b8ada454a3b4211e3adbb627d498f..567c86cfdbcdf28e25e970f8dfcb23fb52d7928c 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_HTTP_CONF_FILE_H_INCLUDED_
 #define _NGX_HTTP_CONF_FILE_H_INCLUDED_
 
index 63a42efd10d2a0baca9302615c1c19b9ec973529..f23176dbab0489a21c7b4f9c73d22daee92a469c 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_CONFIG_H_INCLUDED_
 #define _NGX_CONFIG_H_INCLUDED_
 
@@ -116,5 +122,10 @@ typedef long               ngx_flag_t;
 #define INET_ADDRSTRLEN  16
 #endif
 
+#define NGX_MAXHOSTNAMELEN 64
+/*
+#define NGX_MAXHOSTNAMELEN MAXHOSTNAMELEN
+*/
+
 
 #endif /* _NGX_CONFIG_H_INCLUDED_ */
index 5fc99b39efef297774b1c6f20553cb8b6b7556eb..5b663740ab243c2d594acaa8ed6793f8e429f93f 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index fbfe67fd2e185e70179299ebee07f7edde9973e3..a9250848dbb3f9f2d64cf264252fdeeae6a55aa8 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_CONNECTION_H_INCLUDED_
 #define _NGX_CONNECTION_H_INCLUDED_
 
index 0a12fb21a224381f964aab72e1e13cfe6cf57565..671956e3309ee08afd29e246f7ec6d85529d6df5 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_CORE_H_INCLUDED_
 #define _NGX_CORE_H_INCLUDED_
 
@@ -70,11 +76,4 @@ typedef void (*ngx_event_handler_pt)(ngx_event_t *ev);
 #define CRLF   "\x0d\x0a"
 
 
-
-#define NGX_MAXHOSTNAMELEN 64
-/*
-#define NGX_MAXHOSTNAMELEN MAXHOSTNAMELEN
-*/
-
-
 #endif /* _NGX_CORE_H_INCLUDED_ */
index c6234c37ad3af66e19a666cb321c307b7889a9ad..208001d48b62c38c8b516115ce43dfed64cc506f 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_CRC_H_INCLUDED_
 #define _NGX_CRC_H_INCLUDED_
 
@@ -9,9 +15,10 @@ ngx_inline static uint32_t ngx_crc(char *data, size_t len)
     uint32_t  sum;
 
     for (sum = 0; len; len--) {
+
         /*
          * gcc 2.95.2 x86 and icc 7.1.006 compile that operator
-         *                                into the single rol opcode.
+         *                                into the single "rol" opcode.
          * msvc 6.0sp2 compiles it into four opcodes.
          */
         sum = sum >> 1 | sum << 31;
index e5b30b1005befa1257a3cc7048b9698c17592820..86528ba1ecbe22dfb958907941021be6927d9cad 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 1b24dd3336f7a057d43b5dbfe906a2f7240450e3..f1e88b1ed2940da91fa9bdb2900857718d97c521 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_CYCLE_H_INCLUDED_
 #define _NGX_CYCLE_H_INCLUDED_
 
index ef92a0ab1d6e54ddf19a22afe15fc945b35c40b3..7ae77de6ebd2dd329620da6b9f075f6d32171091 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index db46d5408f82ce6e6743e4d47f623d3d7d7e9d7f..d6ca67db07ee5bc4674eef2aadf6f9fff1eb2d5f 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_FILE_H_INCLUDED_
 #define _NGX_FILE_H_INCLUDED_
 
index 924f11adddb37bfbdadd58115ba5e48d07dd580c..ea2529aad63c4a9481eb05246874402bec3d8136 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_garbage_collector.h>
index 5bc8471dcc67374ef7ca9106904c90220c5f7223..b445944e9e8d62558aead25053363f31da89f976 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_GARBAGE_COLLECTOR_H_INCLUDED_
 #define _NGX_GARBAGE_COLLECTOR_H_INCLUDED_
 
index 94d0c72e5c1fc996c4e60866557fe69a526a41b1..5000ee0769fb65103bde4a3a28490b673165b949 100644 (file)
@@ -1,4 +1,10 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index dbdf6f0b308208fbb960321e05d6ae1484e8781c..5e30c9e33fdd065e1a3ac25adaaacd99fbdc25cc 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_INET_H_INCLUDED_
 #define _NGX_INET_H_INCLUDED_
 
index 885f8f508a595d1d53221239d41fefbe162b20d8..85e3b6459f3dc0db336965e865686a3b7d994734 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index f43f235e55c99f16c65f98214e6234dfbf9e530e..b65eff361cd6879da5b297918c22e0708d12c360 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_LIST_H_INCLUDED_
 #define _NGX_LIST_H_INCLUDED_
 
index e542920d4b1d54e70d3e216fa25ff108ff163b8a..b23d8bba1aa2aa03f69048072de0f3891e4393a8 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index 45ab6e07c2ad35db282b6154dd27745c73641246..782d28ae8f77b907ad854c32fa9549ea8b55d467 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_LOG_H_INCLUDED_
 #define _NGX_LOG_H_INCLUDED_
 
@@ -24,8 +30,8 @@
 #define NGX_LOG_DEBUG_IMAP        0x200
 
 /*
- * after the adding a new debug level do not forget to update
- * debug_levels[] in src/core/ngx_log.c
+ * do not forget to update debug_levels[] in src/core/ngx_log.c
+ * after the adding a new debug level
  */
 
 #define NGX_LOG_DEBUG_FIRST       NGX_LOG_DEBUG_CORE
 #define NGX_LOG_DEBUG_ALL         0x7ffffff0
 
 
-/*
-    "[%time] [%level] %pid#%tid: %message:(%errno)%errstr, while %action"
-        " %peer and while processing %context"
-
-    ----
-    message = "recv() failed";
-    errno = 32;
-    action = "reading request headers from client";
-    peer = "192.168.1.1";
-    context = "URL /"
-
-    "[2002/08/20 12:00:00] [error] 412#3: recv() failed (32: Broken pipe)"
-    " while reading request headers from client 192.168.1.1"
-    " and while processing URL /"
-
-    ----
-    message = "recv() failed";
-    errno = 32;
-    ngx_http_proxy_error_context_t:
-        action = "reading headers from server %s for client %s and "
-                 "while processing %s"
-        backend = "127.0.0.1";
-        peer = "192.168.1.1";
-        context = "URL /"
-
-    "[2002/08/20 12:00:00] [error] 412#3: recv() failed (32: Broken pipe)"
-    " while reading headers from backend 127.0.0.1"
-    " for client 192.168.1.1 and while processing URL /"
-
-    ----
-    "[alert] 412#3: ngx_alloc: malloc() 102400 bytes failed (12: Cannot "
-    "allocate memory) while reading request headers from client 192.168.1.1"
-    " and while processing URL /"
-
-
-    OLD:
-    "... while ", action = "reading client request headers"
-    "... while reading client request headers"
-    "... while ", action = "reading client request headers"
-                  context: pop3 user account
-    "... while reading client command for 'john_doe'"
-*/
-
-
 typedef size_t  (*ngx_log_handler_pt) (void *ctx, char *buf, size_t len);
 
 
@@ -88,7 +50,7 @@ struct ngx_log_s {
     ngx_log_handler_pt   handler;
 };
 
-#define MAX_ERROR_STR  2048
+#define MAX_ERROR_STR   2048
 
 
 /*********************************/
index 8efd369edca426bea592f2d23064e9dec0fbc1d0..f40dfd313771e5fa5c8f8bdc809980b7bedf31da 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 132eb70d79fd2e8c6689ca870bdae5a288fd3c37..47f9a86456a7ec476d4b9c02cb54586c3b9d35a4 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index 1700efb4594e83082c5881334783f25306e53d24..3a3f244b3c05b8f771db49469a9179cf74b1070d 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_PALLOC_H_INCLUDED_
 #define _NGX_PALLOC_H_INCLUDED_
 
@@ -8,7 +14,7 @@
 
 /*
  * NGX_MAX_ALLOC_FROM_POOL should be (ngx_page_size - 1), i.e. 4095 on x86.
- * On FreeBSD 5.x it allows to use zero copy send.
+ * On FreeBSD 5.x it allows to use the zero copy sending.
  * On Windows NT it decreases a number of locked pages in a kernel.
  */
 #define NGX_MAX_ALLOC_FROM_POOL  (ngx_pagesize - 1)
index 9d62f703bc9f4b7a608daa7ee4e3c0559355a20b..8edcc5a61a85e0480e949b322b83c10be6df0624 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index 630cabecc81d945ec86f84e3c6da0b700462090f..1423a97a3621e8ecbd88738025b5f569e43b3da2 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_PARSE_H_INCLUDED_
 #define _NGX_PARSE_H_INCLUDED_
 
index 5c7a801d889f128ad45e6befcc88f5b52c0749c8..15949e5e12bc20c739dec33895a199c3e59ea74a 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index a5b8c62438773edf90cbe7a125fc6137588d70d6..2e3319b360bc9980fbf2f9eb8faceb6a42347ba9 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_RADIX_TREE_H_INCLUDED_
 #define _NGX_RADIX_TREE_H_INCLUDED_
 
index 083ec10f8360ec13348675a37e2d31088e558cff..f3c7ac9d400d71a0b1d71ed8b90cbc7f7c58e289 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index 04d7622922e80f7b5899d33d72a93ce3305d2211..47ced3ea25b70fc45a316b611c74d47f50e93be2 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_RBTREE_H_INCLUDED_
 #define _NGX_RBTREE_H_INCLUDED_
 
index f4d827d836cf91bdb7dbf06fa8564816db93c2d2..9cae52a89a867895d30f506e86f9436e3d9ceffc 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index 3a99a2f36ba29d45b39dfb602bed27c1e2fc97a9..1d19686afc4be3176fa0b210398bee27bed3f509 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_REGEX_H_INCLUDED_
 #define _NGX_REGEX_H_INCLUDED_
 
index dad7265303214f8ce6a50403a15e6cfc7954c21c..93d7565f60c2adf909c6f33c3470eebe07fe83f2 100644 (file)
@@ -1,8 +1,11 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
 
-void *ngx_slab_alloc(ngx_slab_pool_t *pool, size_t size)
-{
 
 
+void *ngx_slab_alloc(ngx_slab_pool_t *pool, size_t size)
+{
    return NULL;
 }
index 11b249aeea1be12448c8c2f066991ea9e4fa43a7..0ae71004a9747ce5a2776f8b4a32b4a83a9f7d29 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_SLAB_H_INCLUDED_
 #define _NGX_SLAB_H_INCLUDED_
 
index 4de23c13b92c28270a8533e1aae26b9fd7c92c75..16e6a5c8155cb640c5881929897fd740740cf7e6 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index 4cdb267ddf072b64fd1c137290e0fe2aac360474..21de8916b7b24d9df841f856d409e55d3bb5ef7d 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index 6b22a67bab0655644a18275ce431d4c40a6c99ab..44754250827af37983058551a35a37691c208d5e 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_STRING_H_INCLUDED_
 #define _NGX_STRING_H_INCLUDED_
 
@@ -19,48 +25,47 @@ typedef struct {
 #if (WIN32)
 
 #define ngx_strncasecmp(s1, s2, n)                                           \
-                          strnicmp((const char *) s1, (const char *) s2, n)
+                           strnicmp((const char *) s1, (const char *) s2, n)
 #define ngx_strcasecmp(s1, s2)                                               \
-                          stricmp((const char *) s1, (const char *) s2)
+                           stricmp((const char *) s1, (const char *) s2)
 
-#define ngx_snprintf              _snprintf
-#define ngx_vsnprintf             _vsnprintf
+#define ngx_snprintf       _snprintf
+#define ngx_vsnprintf      _vsnprintf
 
 #else
 
 #define ngx_strncasecmp(s1, s2, n)                                           \
-                          strncasecmp((const char *) s1, (const char *) s2, n)
+                           strncasecmp((const char *) s1, (const char *) s2, n)
 #define ngx_strcasecmp(s1, s2)                                               \
-                          strcasecmp((const char *) s1, (const char *) s2)
+                           strcasecmp((const char *) s1, (const char *) s2)
 
-#define ngx_snprintf              snprintf
-#define ngx_vsnprintf             vsnprintf
+#define ngx_snprintf       snprintf
+#define ngx_vsnprintf      vsnprintf
 
 #endif
 
 
 #define ngx_strncmp(s1, s2, n)                                               \
-                          strncmp((const char *) s1, (const char *) s2, n)
+                            strncmp((const char *) s1, (const char *) s2, n)
 
 /* msvc and icc compile strcmp() to inline loop */
-#define ngx_strcmp(s1, s2)        strcmp((const char *) s1, (const char *) s2)
+#define ngx_strcmp(s1, s2)  strcmp((const char *) s1, (const char *) s2)
 
-#define ngx_strstr(s1, s2)        strstr((const char *) s1, (const char *) s2)
-#define ngx_strlen(s)             strlen((const char *) s)
+#define ngx_strstr(s1, s2)  strstr((const char *) s1, (const char *) s2)
+#define ngx_strlen(s)       strlen((const char *) s)
 
 /*
- * msvc and icc compile memset() to inline "rep stos"
- * while ZeroMemory and bzero are calls.
- *
- * icc can also inline mov's of a zeroed register for small blocks.
+ * msvc and icc compile memset() to the inline "rep stos"
+ * while ZeroMemory() and bzero() are the calls.
+ * icc may also inline several mov's of a zeroed register for small blocks.
  */
 #define ngx_memzero(buf, n)       memset(buf, 0, n)
 
-/* msvc and icc compile memcpy() to inline "rep movs" */
+/* msvc and icc compile memcpy() to the inline "rep movs" */
 #define ngx_memcpy(dst, src, n)   memcpy(dst, src, n)
 #define ngx_cpymem(dst, src, n)   ((u_char *) memcpy(dst, src, n)) + n
 
-/* msvc and icc compile memcmp() to inline loop */
+/* msvc and icc compile memcmp() to the inline loop */
 #define ngx_memcmp                memcmp
 
 u_char *ngx_cpystrn(u_char *dst, u_char *src, size_t n);
index f49ec3af5bb3ba0057f9035cd3660b53788ff471..7315ea3a7197034703d1f857f89462363ac0806e 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_TABLE_H_INCLUDED_
 #define _NGX_TABLE_H_INCLUDED_
 
index b6d5a3f1dbd6f68563498f3b4807a43be588a4d7..90ceaaeab559677b07551494862d231e5464ec66 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
@@ -12,7 +17,7 @@ static ngx_int_t  ngx_gmtoff;
 
 
 /*
- * In the threaded mode only one thread updates cached time and strings
+ * In the threaded mode only one thread updates the cached time and strings
  * and these operations are protected by the mutex.  The reading of the cached
  * time and strings is not protected by the mutex.  To avoid the race
  * conditions for non-atomic values we use the NGX_TIME_SLOTS slots to store
@@ -290,6 +295,7 @@ void ngx_gmtime(time_t t, ngx_tm_t *tp)
     mon += 2;
 
     if (yday >= 306) {
+
         /*
          * there is no "yday" in Win32 SYSTEMTIME
          *
index 426040577ba578d5de32d0da16448ce6ad44ed96..5384b531979e036434d35aedc040dd0582b3735f 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_TIMES_H_INCLUDED_
 #define _NGX_TIMES_H_INCLUDED_
 
index 7f9a22cecaf5fba4d94e3e761ef4f3ec9cf40015..c62e1d501f1b7c7b2f97eea9084cce2f073b480e 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 71eb9e4d7ebe87afebc096b448a7e0c53917a660..80bd393965c1d1d448ab6018d3071e4066b9ffd2 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_AIO_MODULE_H_INCLUDED_
 #define _NGX_AIO_MODULE_H_INCLUDED_
 
index 3706e015936115fca193606faabd86f238399ea6..ee29a72a8e0ee64e9273740dc7c36eff22e87a8e 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/
+ * Copyright (C) 2002-2004 Igor Sysoev
  */
 
 
index ebe2cabfe8254dc8f92904f939b468fa54072dd7..ace4cf34489bbcecd1641fa075a989a0c6d9c46f 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/
+ * Copyright (C) 2002-2004 Igor Sysoev
  */
 
 
index 5273152ede3f944b578cac58502fa922f63d5be2..5d1d75849663bfc7979a93ebeb9b61d204f155ff 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/
+ * Copyright (C) 2002-2004 Igor Sysoev
  */
 
 
index a1c1efd3d8ee9c99d9e3521b85e727f94e990392..b55b489d3e422061d20183b5f180b9d7819d4344 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_IOCP_MODULE_H_INCLUDED_
 #define _NGX_IOCP_MODULE_H_INCLUDED_
 
index a1d6f59078c8ab396583ad243ef5fa103221675a..f8cdcd8d7a6b95a327088fa6fe40317c3dd615fb 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/
+ * Copyright (C) 2002-2004 Igor Sysoev
  */
 
 
index ab1a12b9cbca75dab895eff3794a9fd9b5027973..0ea98624d90b2a0e5f119bb1f54d99ff61d03075 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_KQUEUE_MODULE_H_INCLUDED_
 #define _NGX_KQUEUE_MODULE_H_INCLUDED_
 
diff --git a/src/event/modules/ngx_overlapped_module.c b/src/event/modules/ngx_overlapped_module.c
deleted file mode 100644 (file)
index c3af39d..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-    event = WSACreateEvent(void);
-    WSAEventSelect(s, event, FD_ACCEPT);
-
-
-int ngx_overlapped_process_events(ngx_log_t *log)
-{
-    if (acceptex)
-        n = SleepEx(timer, 1);
-    else
-        n = WSAWaitForMultipleEvents(nevents, events, 0, timer, 1);
-
-    if (n == WSA_WAIT_TIMEOUT)
-        close some event;
-
-    if (n == WSA_IO_COMPLETION)
-        again
-
-    /* try it with AcceptEx() on NT to detect connected sockets */
-    if (!acceptex) {
-        WSAEnumNetworkEvents(
-            sockets[n - WSA_WAIT_EVENT_0],
-            events[n - WSA_WAIT_EVENT_0],
-            net_events);
-
-        if (net_events.lNetworkEvents & FD_ACCEPT) {
-            if (net_events.iErrorCode[FD_ACCEPT_BIT] != 0)
-                accept error
-                again
-
-            ngx_event_accept(); OR post AcceptEx();
-        }
-    }
-}
-
-void CALLBACK overlapped_completion_procedure(DWORD error, DWORD nbytes,
-                         LPWSAOVERLAPPED overlapped, DWORD flags)
-{
-    run event handler
-}
index 7c23f5fb1eee735f125d11c52783bbd163492b0a..eefc3a92806b9a6a228d283dd82c8b6c365175e8 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/
+ * Copyright (C) 2002-2004 Igor Sysoev
  */
 
 
index 6a83e9c1b7a64f17f9a5199339f85e95186a910e..995ae322ed1e45c26ecef97fea7c4b1dc4e58332 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/
+ * Copyright (C) 2002-2004 Igor Sysoev
  */
 
 
index 56b50cdf97c9699507d7fd5bd7a7e55c835153a4..d441fbeeb6cc60c63cb9104c3278afd3f6e8bc44 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/
+ * Copyright (C) 2002-2004 Igor Sysoev
  */
 
 
index a2e275b92f771426dab3cadd7020d646182e1474..6328bf184c981b0737c61a8cea17cb935f6fc382 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 9e41fed86abb1671dca1aa48ae3610d20fa1948a..b492a65fd87bcf3ab1a78269e5786658c7e9104f 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_EVENT_H_INCLUDED_
 #define _NGX_EVENT_H_INCLUDED_
 
index 9ab04310cc516d097980c3f9e1cac061d962c93b..9044c44ce82ff669466148f784cd9282fc58752f 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index d6388994b7682c0ed1765cf81d79e63ca158f2d4..0cd74dee511763a4ab84f32faef81e87a71b8f05 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
diff --git a/src/event/ngx_event_aio_read.c b/src/event/ngx_event_aio_read.c
deleted file mode 100644 (file)
index 4561cf4..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_errno.h>
-#include <ngx_log.h>
-#include <ngx_recv.h>
-#include <ngx_connection.h>
-#include <ngx_event.h>
-
-#if (HAVE_KQUEUE)
-#include <ngx_kqueue_module.h>
-#endif
-
-
-/*
-    The data is ready - 3 syscalls:
-        aio_read(), aio_error(), aio_return()
-    The data is not ready - 4 (kqueue) or 5 syscalls:
-        aio_read(), aio_error(), notifiction,
-                                             aio_error(), aio_return()
-                                             aio_cancel(), aio_error()
-*/
-
-ssize_t ngx_event_aio_read(ngx_connection_t *c, char *buf, size_t size)
-{
-    int           rc, first, canceled;
-    ngx_event_t  *ev;
-
-    ev = c->read;
-
-    canceled = 0;
-
-    if (ev->timedout) {
-        ngx_set_socket_errno(NGX_ETIMEDOUT);
-        ngx_log_error(NGX_LOG_ERR, ev->log, 0, "aio_read() timed out");
-
-        rc = aio_cancel(c->fd, &ev->aiocb);
-        if (rc == -1) {
-            ngx_log_error(NGX_LOG_CRIT, ev->log, ngx_errno,
-                          "aio_cancel() failed");
-            return NGX_ERROR;
-        }
-
-        ngx_log_debug(ev->log, "aio_cancel: %d" _ rc);
-
-        canceled = 1;
-
-        ev->ready = 1;
-    }
-
-    first = 0;
-
-    if (!ev->ready) {
-        ngx_memzero(&ev->aiocb, sizeof(struct aiocb));
-
-        ev->aiocb.aio_fildes = c->fd;
-        ev->aiocb.aio_buf = buf;
-        ev->aiocb.aio_nbytes = size;
-
-#if (HAVE_KQUEUE)
-        ev->aiocb.aio_sigevent.sigev_notify_kqueue = kq;
-        ev->aiocb.aio_sigevent.sigev_notify = SIGEV_KEVENT;
-        ev->aiocb.aio_sigevent.sigev_value.sigval_ptr = ev;
-#endif
-
-        if (aio_read(&ev->aiocb) == -1) {
-            ngx_log_error(NGX_LOG_CRIT, ev->log, ngx_errno,
-                          "aio_read() failed");
-            return NGX_ERROR;
-        }
-
-        ngx_log_debug(ev->log, "aio_read: OK");
-
-        ev->active = 1;
-        first = 1;
-    }
-
-    ev->ready = 0;
-
-    rc = aio_error(&ev->aiocb);
-    if (rc == -1) {
-        ngx_log_error(NGX_LOG_CRIT, ev->log, ngx_errno, "aio_error() failed");
-        return NGX_ERROR;
-    }
-
-    if (rc != 0) {
-        if (rc == NGX_EINPROGRESS) {
-            if (!first) {
-                ngx_log_error(NGX_LOG_CRIT, ev->log, rc,
-                              "aio_read() still in progress");
-            }
-            return NGX_AGAIN;
-        }
-
-        if (rc == NGX_ECANCELED && canceled) {
-            return NGX_ERROR;
-        }
-
-        ngx_log_error(NGX_LOG_CRIT, ev->log, rc, "aio_read() failed");
-        return NGX_ERROR;
-    }
-
-    rc = aio_return(&ev->aiocb);
-    if (rc == -1) {
-        ngx_log_error(NGX_LOG_CRIT, ev->log, ngx_errno, "aio_return() failed");
-
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug(ev->log, "aio_read: %d" _ rc);
-
-    return rc;
-}
diff --git a/src/event/ngx_event_aio_write.c b/src/event/ngx_event_aio_write.c
deleted file mode 100644 (file)
index 72d35c4..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_errno.h>
-#include <ngx_log.h>
-#include <ngx_recv.h>
-#include <ngx_connection.h>
-#include <ngx_event.h>
-
-#if (HAVE_KQUEUE)
-#include <ngx_kqueue_module.h>
-#endif
-
-
-/*
-    The data is ready - 3 syscalls:
-        aio_write(), aio_error(), aio_return()
-    The data is not ready - 4 (kqueue) or 5 syscalls:
-        aio_write(), aio_error(), notifiction,
-                                             aio_error(), aio_return()
-                                             aio_cancel(), aio_error()
-*/
-
-ssize_t ngx_event_aio_write(ngx_connection_t *c, char *buf, size_t size)
-{
-    int           rc, first, canceled;
-    ngx_event_t  *ev;
-
-    ev = c->write;
-
-    canceled = 0;
-
-ngx_log_debug(ev->log, "aio: ev->ready: %d" _ ev->ready);
-ngx_log_debug(ev->log, "aio: aiocb: %08x" _ &ev->aiocb);
-
-    if (ev->timedout) {
-        ngx_set_socket_errno(NGX_ETIMEDOUT);
-        ngx_log_error(NGX_LOG_ERR, ev->log, 0, "aio_write() timed out");
-
-        rc = aio_cancel(c->fd, &ev->aiocb);
-        if (rc == -1) {
-            ngx_log_error(NGX_LOG_CRIT, ev->log, ngx_errno,
-                          "aio_cancel() failed");
-            return NGX_ERROR;
-        }
-
-        ngx_log_debug(ev->log, "aio_cancel: %d" _ rc);
-
-        canceled = 1;
-
-        ev->ready = 1;
-    }
-
-    first = 0;
-
-    if (!ev->ready) {
-        ngx_memzero(&ev->aiocb, sizeof(struct aiocb));
-
-        ev->aiocb.aio_fildes = c->fd;
-        ev->aiocb.aio_buf = buf;
-        ev->aiocb.aio_nbytes = size;
-
-#if (HAVE_KQUEUE)
-        ev->aiocb.aio_sigevent.sigev_notify_kqueue = kq;
-        ev->aiocb.aio_sigevent.sigev_notify = SIGEV_KEVENT;
-        ev->aiocb.aio_sigevent.sigev_value.sigval_ptr = ev;
-#endif
-
-        if (aio_write(&ev->aiocb) == -1) {
-            ngx_log_error(NGX_LOG_CRIT, ev->log, ngx_errno,
-                          "aio_write() failed");
-            return NGX_ERROR;
-        }
-
-        ngx_log_debug(ev->log, "aio_write: OK");
-
-        ev->active = 1;
-        first = 1;
-    }
-
-    ev->ready = 0;
-
-    rc = aio_error(&ev->aiocb);
-    if (rc == -1) {
-        ngx_log_error(NGX_LOG_CRIT, ev->log, ngx_errno, "aio_error() failed");
-        return NGX_ERROR;
-    }
-
-    if (rc != 0) {
-        if (rc == NGX_EINPROGRESS) {
-            if (!first) {
-                ngx_log_error(NGX_LOG_CRIT, ev->log, rc,
-                              "aio_write() still in progress");
-            }
-            return NGX_AGAIN;
-        }
-
-        if (rc == NGX_ECANCELED && canceled) {
-            return NGX_ERROR;
-        }
-
-        ngx_log_error(NGX_LOG_CRIT, ev->log, rc, "aio_write() failed");
-        return NGX_ERROR;
-    }
-
-    rc = aio_return(&ev->aiocb);
-    if (rc == -1) {
-        ngx_log_error(NGX_LOG_CRIT, ev->log, ngx_errno, "aio_return() failed");
-
-        return NGX_ERROR;
-    }
-
-    ngx_log_debug(ev->log, "aio_write: %d" _ rc);
-
-    return rc;
-}
index a4db7f94b96b4de56ced8a218004ed2255095862..e3dd41ae9d605c0dd1da3b9b2bbc5aac62742068 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 3862c6f0199ebd097a3e26e4bfbb9e99d72b312c..2f9907349f7d604b2ddf0f0da83da01616266b40 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_EVENT_BUSY_LOCK_H_INCLUDED_
 #define _NGX_EVENT_BUSY_LOCK_H_INCLUDED_
 
index f0fb691d05692f74735cac4a7e38d2010006219f..ad2148538e6adbc1cd2787b5efb37b6aae9be3c2 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 8a3e17fdfda5012bf91990be674009a6eeb32cba..5493b623bf873630016c1f419de61cd5dc705a44 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_EVENT_CONNECT_H_INCLUDED_
 #define _NGX_EVENT_CONNECT_H_INCLUDED_
 
index ed12283848d38bf02e8aa888c8391fb89f4b8ad6..7cb7c31f3e40ce77366664c2986287262ed7fc05 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 4f83e4865233e7e956078e4612eb3736c636234c..b77c389b91658ef37a482b589d076b705bec724c 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 0116787a28680f601ae778e0f22b347fe2cf87f3..bbc185f7e3625a4253ee7fc1c2070300c5741d3d 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 6c28ba5a717c0452f3871ff06c320ab18a8d4007..5e3faa39f1a776272bb4316191cfe6c993d699c1 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_EVENT_OPENSSL_H_INCLUDED_
 #define _NGX_EVENT_OPENSSL_H_INCLUDED_
 
index e324a230a8d6d533a083ce95f059c8f779515685..8e2094bc6a43870c685b7be2c6396d27e655be25 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
@@ -656,8 +661,12 @@ ngx_inline static void ngx_event_pipe_remove_shadow_links(ngx_buf_t *buf)
 #if 0
         b->type &= ~(NGX_HUNK_TEMP|NGX_HUNK_IN_MEMORY|NGX_HUNK_RECYCLED);
 #endif
-        b->temporary = 0;
-        b->recycled = 0;
+        b->in_file = 0;
+        b->temp_file = 0;
+        b->flush = 0;
+        b->zerocopy_busy = 0;
+        b->last_shadow = 0;
+
         b->shadow = NULL;
         b = next;
     }
@@ -669,9 +678,10 @@ ngx_inline static void ngx_event_pipe_remove_shadow_links(ngx_buf_t *buf)
                  |NGX_HUNK_LAST_SHADOW);
 #endif
 
-    b->temporary = 0;
-    b->recycled = 0;
-    b->last_shadow = 0;
+    b->in_file = 0;
+    b->temp_file = 0;
+    b->flush = 0;
+    b->zerocopy_busy = 0;
 
     b->shadow = NULL;
 
index e85fc617084ed963673ea260ca5af3d38395642c..f6430f946402f2eb7bc488288db4b7355afa91da 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_EVENT_PIPE_H_INCLUDED_
 #define _NGX_EVENT_PIPE_H_INCLUDED_
 
index 835c73f7492c0ad1d0eb706248138f454ec5ac43..31fa1fe1d85fc9a9bdcd51dcb64b66b66b838a9f 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 5a3039357e79ef11f007186a86ea5d4466356c45..055bec32819f03da8b565aeda6c8d7ad96cc34a7 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_EVENT_POSTED_H_INCLUDED_
 #define _NGX_EVENT_POSTED_H_INCLUDED_
 
diff --git a/src/event/ngx_event_recv.c b/src/event/ngx_event_recv.c
deleted file mode 100644 (file)
index c083e8f..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_errno.h>
-#include <ngx_log.h>
-#include <ngx_recv.h>
-#include <ngx_connection.h>
-
-ssize_t ngx_event_recv_core(ngx_connection_t *c, char *buf, size_t size)
-{
-    ssize_t       n;
-    ngx_err_t     err;
-    ngx_event_t  *ev;
-
-    ev = c->read;
-
-/* DEBUG */
-#if (HAVE_KQUEUE)
-    if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) {
-        ngx_log_debug(c->log, "ngx_event_recv: eof:%d, avail:%d, err:%d" _
-                      ev->eof _ ev->available _ ev->error);
-    }
-#endif
-
-#if (USE_KQUEUE)
-
-    if (ev->eof && ev->available == 0) {
-
-        if (ev->error == 0) {
-            return 0;
-        }
-
-        ngx_set_socket_errno(ev->error);
-        err = ev->error;
-        n = -1;
-
-    } else {
-        n = ngx_recv(c->fd, buf, size, 0);
-
-        if (n == -1) {
-            err = ngx_socket_errno;
-        }
-    }
-
-    if (n == -1) {
-        ev->ready = 0;
-
-        if (err == NGX_ECONNRESET && ev->ignore_econnreset) {
-            return 0;
-        }
-
-        if (err == NGX_EAGAIN) {
-            ngx_log_error(NGX_LOG_INFO, c->log, err, "recv() returned EAGAIN");
-            return NGX_AGAIN;
-        }
-
-        ngx_log_error(NGX_LOG_ERR, c->log, err, "recv() failed");
-        return NGX_ERROR;
-    }
-
-    ev->available -= n;
-    if (ev->available == 0) {
-        ev->ready = 0;
-    }
-
-    return n;
-
-#elif (HAVE_KQUEUE)
-
-    if ((ngx_event_flags & NGX_HAVE_KQUEUE_EVENT)
-        && ev->eof && ev->available == 0) {
-
-        if (ev->error == 0) {
-            return 0;
-        }
-
-        ngx_set_socket_errno(ev->error);
-        err = ev->error;
-        n = -1;
-
-    } else {
-        n = ngx_recv(c->fd, buf, size, 0);
-ngx_log_debug(c->log, "ngx_event_recv: read:%d:%d" _ n _ size);
-
-        if (n == -1) {
-            err = ngx_socket_errno;
-        }
-    }
-
-    if (n == -1) {
-        ev->ready = 0;
-
-        if (err == NGX_ECONNRESET && ev->ignore_econnreset) {
-            return 0;
-        }
-
-        if (err == NGX_EAGAIN) {
-            ngx_log_error(NGX_LOG_INFO, c->log, err, "recv() returned EAGAIN");
-            return NGX_AGAIN;
-        }
-
-        ngx_log_error(NGX_LOG_ERR, c->log, err, "recv() failed");
-        return NGX_ERROR;
-    }
-
-    if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) {
-        ev->available -= n;
-        if (ev->available == 0) {
-            ev->ready = 0;
-        }
-
-    } else if ((size_t) n < size) {
-        ev->ready = 0;
-    }
-
-    return n;
-
-#else /* not kqueue */
-
-    n = ngx_recv(c->fd, buf, size, 0);
-
-    if (n == -1) {
-        err = ngx_socket_errno;
-
-        ev->ready = 0;
-
-        if (err == NGX_ECONNRESET && ev->ignore_econnreset) {
-            return 0;
-        }
-
-        if (err == NGX_EAGAIN) {
-            ngx_log_error(NGX_LOG_INFO, c->log, err, "recv() returned EAGAIN");
-            return NGX_AGAIN;
-        }
-
-        ngx_log_error(NGX_LOG_ERR, c->log, err, "recv() failed");
-        return NGX_ERROR;
-    }
-
-    if ((size_t) n < size) {
-        ev->ready = 0;
-    }
-
-    return n;
-
-#endif
-}
diff --git a/src/event/ngx_event_thread.c b/src/event/ngx_event_thread.c
deleted file mode 100644 (file)
index 527b49c..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-
-volitile int  ngx_last_posted_event;
-
-
-typedef struct {
-    ngx_tid_t   tid;
-    ngx_cv_t    cv;
-} ngx_thread_data_t;
-
-static ngx_thread_data_t  *threead_data;
-
-
-
-
-
-{
-
-    err = ngx_thread_cond_wait(ngx_thread_data_cv, ngx_thread_data_mutex);
-
-    tid = ngx_thread_self();
-
-    for (i = 0; i < thread_data_n; i++) {
-        if (thread_data[i].tid == tid) {
-            cv = thread_data[i].cv;
-            break;
-        }
-    }
-
-    if (i == thread_data_n) {
-        error
-        return
-    }
-
-
-    for ( ;; ) {
-
-        err = ngx_thread_cond_wait(cv, ngx_posted_events_mutex);
-        if (err) {
-            ngx_log_error(NGX_ALERT, log, err,
-                          ngx_thread_cond_wait_n " failed, thread is exiting");
-            return;
-        }
-
-        for ( ;; ) {
-            ev = NULL;
-
-            for (i = ngx_last_posted_event; i > 0; i--) {
-                ev = ngx_posted_events[i];
-
-                if (ev == NULL) {
-                    continue;
-                }
-
-                err = ngx_thread_mutex_trylock(ev->mutex);
-
-                if (err == 0) {
-                    ngx_posted_events[i] = NULL;
-
-                    while (ngx_posted_events[ngx_last_posted_event] == NULL) {
-                        ngx_last_posted_event--;
-                    }
-
-                    break;
-                }
-
-                if (err == NGX_EBUSY) {
-                    ev = NULL;
-                    continue;
-                }
-
-                ngx_log_error(NGX_ALERT, log, err,
-                              ngx_thread_mutex_unlock_n " failed,
-                              thread is exiting");
-
-                ngx_worker_thread_error();
-                return;
-            }
-
-            err = ngx_thread_mutex_unlock(ngx_posted_events_mutex);
-            if (err) {
-                ngx_log_error(NGX_ALERT, log, err,
-                              ngx_thread_mutex_unlock_n
-                              " failed, thread exiting");
-                return;
-            }
-
-            if (ev == NULL) {
-                break;
-            }
-
-            ngx_event_handle_event(ev);
-
-            err = ngx_thread_mutex_unlock(ev->mutex);
-            if (err) {
-                ngx_log_error(NGX_ALERT, log, err,
-                              ngx_thread_mutex_unlock_n
-                              " failed, thread exiting");
-
-                ngx_worker_thread_error();
-                return;
-            }
-
-            err = ngx_thread_mutex_lock(ngx_posted_events_mutex);
-            if (err) {
-                ngx_log_error(NGX_ALERT, log, err,
-                              ngx_thread_mutex_lock_n
-                              " failed, thread exiting");
-                return;
-            }
-        }
-
-        if (restart) {
-            ngx_log_error(NGX_INFO, log, 0, "thread is exiting");
-            return;
-        }
-    }
-}
-
-ngx_worker_thread_error()
-{
-    ngx_err_t  err;
-
-    err = ngx_thread_mutex_unlock(ngx_posted_events_mutex);
-    if (err) {
-        ngx_log_error(NGX_ALERT, log, err,
-                      ngx_thread_mutex_unlock_n
-                      " failed, thread exiting");
-    }
-}
index 5b0c871b0593f4b0036c271dd64beda415cc648f..0fbf66e9c9312372c6080affe59450d8b53b72ee 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 0ff640539a12133c0a9da0d5a2ebbe6806ba2e03..fb9bc28949e66c6cd2eb04028f07956e8b970a83 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_EVENT_TIMER_H_INCLUDED_
 #define _NGX_EVENT_TIMER_H_INCLUDED_
 
diff --git a/src/event/ngx_event_wsarecv.c b/src/event/ngx_event_wsarecv.c
deleted file mode 100644 (file)
index b97f97d..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-
-#include <ngx_config.h>
-
-#include <ngx_core.h>
-#include <ngx_errno.h>
-#include <ngx_log.h>
-#include <ngx_connection.h>
-#include <ngx_event.h>
-
-
-ssize_t ngx_event_wsarecv(ngx_connection_t *c, char *buf, size_t size)
-{
-    int           rc;
-    u_int         flags;
-    size_t        bytes;
-    ngx_err_t     err;
-    WSABUF        wsabuf[1];
-    ngx_event_t  *ev;
-    LPWSAOVERLAPPED_COMPLETION_ROUTINE  handler;
-
-    ev = c->read;
-
-/* DEBUG */ bytes = 0;
-
-    if (ev->timedout) {
-        ngx_set_socket_errno(NGX_ETIMEDOUT);
-        ngx_log_error(NGX_LOG_ERR, ev->log, 0, "WSARecv() timed out");
-
-        return NGX_ERROR;
-    }
-
-    if (ev->ready) {
-        ev->ready = 0;
-
-#if (HAVE_IOCP) /* iocp */
-
-        if (ngx_event_flags & NGX_HAVE_IOCP_EVENT) {
-            if (ev->ovlp.error) {
-                ngx_log_error(NGX_LOG_ERR, c->log, ev->ovlp.error,
-                              "WSARecv() failed");
-                return NGX_ERROR;
-            }
-
-            return ev->available;
-        }
-
-#endif
-
-        if (WSAGetOverlappedResult(c->fd, (LPWSAOVERLAPPED) &ev->ovlp,
-                                   &bytes, 0, NULL) == 0) {
-            err = ngx_socket_errno;
-            ngx_log_error(NGX_LOG_CRIT, ev->log, err,
-                         "WSARecv() or WSAGetOverlappedResult() failed");
-
-            return NGX_ERROR;
-        }
-
-        return bytes;
-    }
-
-    ngx_memzero(&ev->ovlp, sizeof(WSAOVERLAPPED));
-    wsabuf[0].buf = buf;
-    wsabuf[0].len = size;
-    flags = 0;
-
-#if 0
-    handler = ev->handler;
-#else
-    handler = NULL;
-#endif
-
-    rc = WSARecv(c->fd, wsabuf, 1, &bytes, &flags,
-                 (LPWSAOVERLAPPED) &ev->ovlp, handler);
-
-    ngx_log_debug(ev->log, "WSARecv: %d:%d" _ rc _ bytes);
-
-    if (rc == -1) {
-        err = ngx_socket_errno;
-        if (err == WSA_IO_PENDING) {
-            return NGX_AGAIN;
-
-        } else {
-            ngx_log_error(NGX_LOG_CRIT, ev->log, err, "WSARecv() failed");
-            return NGX_ERROR;
-        }
-    }
-
-#if (HAVE_IOCP) /* iocp */
-
-    if (ngx_event_flags & NGX_HAVE_IOCP_EVENT) {
-        return NGX_AGAIN;
-    }
-
-#endif
-
-    return bytes;
-}
index 086f2fc0e6777f2185ab35658dc631236d64211c..c9ca35f7f9c712a83fd5098b5a84e67cfa079c2a 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index 662f0b28ad7a1b1c8052df765702d7a457623b8f..6906fdb09bb81996ce240093fa27f4f19b4c9452 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index bd4c270ce6e9ab6016925c679e8681ed9e38db0c..41c7d82e81f37e219422a96c14ba3a060d324e12 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index 1a373784dc4f81f7ac8721a8a4db2d840e62e9a8..af89a382006f1017903a78c2751b3695151be85f 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index 00c0070ea4fbeaec13f1886e10ba55d901853ba5..a32233f0a95108d92f7eb3b1fa521891a80aff88 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index 87619435de1cf92097e834e64bc9a025db26b6c0..6d2ec0572bc1623e089ce387a26acf5154ba3602 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index f14a78b0823f32c246e69e99632fb4177bebc8b0..a25e321d5423d4b2eaff4bf563083b38d8e99b59 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index ce13766eb696eeb73b6016dcc2ae608c85f2e3fc..aaeccd2519d98e51e82fa8f3a8faa733443bfcb0 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index 6f00db7e840ae3ac75e43484145ad97f013493ea..ace05c8b7efcaea437690ea5b6c893d62134337c 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index f4ddb318ed0e4fdae15abe4ee1e69dad71f1ee6b..a1169f7ed358bb5d8b83dd292a2b063a8ace0c14 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index 699bd8f6a2001985fc20fd95ad3cac184f53ccc9..9cc4df115a688f179b127d632771eb092d8acb63 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index 2bb1fe1feed718255cc099d9058d7056a27620e2..2024f8df74a737d44ae6e1beee705a912d856be5 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_HTTP_SSL_H_INCLUDED_
 #define _NGX_HTTP_SSL_H_INCLUDED_
 
index 5d27ccafc840c1f775026620f0b90e239629df68..a9ce704956397e7dc4d3127055c60d767048c81e 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index 6fc1e777d47725ec8aedc86d8fbcbc4b3640e313..e0f32ce78e797c767b85caa43b244e2776e7189a 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index e37accf8f86c09cd7521510f2bd714752d72f334..b7e4506fde3cc65b79e09ffe0f520382ed7be79a 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index ce2226d41105576fdf99d0120ee2d1e715c127ce..aa9388843ef6c2c097ec33b69a328c17e610258b 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index af5e546360d47afa2713942578f1013dd8340136..a5cfc7c1b9861763cb23def3c8042c483f8b4be8 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index 27799bbb999db99850ac455f4d8f7bba3ab73606..e3c936ad9ac638c0e72bdaf0a4fd61c231183540 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_HTTP_PROXY_HANDLER_H_INCLUDED_
 #define _NGX_HTTP_PROXY_HANDLER_H_INCLUDED_
 
index 9e72f629bf8642a1db979b454647d22836cff6db..e00a47ae0271d7ff0e111cba89c186851f44a95e 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index 5e76dc0439692fbedc257d5a570a688199af60ab..096c9fa1fcbc6bb7b94d5f6cc0e24ec6e6962148 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index 0cffbce784278ad5a4afd444ec3a6f77ac49da76..8070fd85edd35ccc92456f25a9e9908cd1daa3e5 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 9eb023809942d59529ca6bbbcdb4b23a2f3d7f25..01c08bb84840f0a675f2611fb6c2274721f8d00f 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 23a95ed5a96f162d1de31b67a51b4d700b55d05f..4097c78f7f917c51e1c871ca88ccaf20e44986bd 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_HTTP_H_INCLUDED_
 #define _NGX_HTTP_H_INCLUDED_
 
index 4bef15a609e11765f80ce9978021d68a2a1217ba..92a663b0c42999c6e73498f8ee61856035c88e67 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index dd7ab6fdc0f56d57d23910d8a4a0dbfc79314139..985eb9149f7a9be3ba9e627a90ef25019d09053e 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_HTTP_BUSY_LOCK_H_INCLUDED_
 #define _NGX_HTTP_BUSY_LOCK_H_INCLUDED_
 
index 479caeae98487cf463e9bc2dfb25993f960ba0b8..3b3257b0ca3ecb77f4514cfe9570fffb4f4b3c88 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index 25bf678777c03cec6ba6916f18f8fe58dc8607d9..1804e4c80e3b2202141fc74780f9434698e7656d 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_HTTP_CACHE_H_INCLUDED_
 #define _NGX_HTTP_CACHE_H_INCLUDED_
 
index ee11941024818de18cfc0ff6e671ba2d207d0a46..0de9b45c56b188e8432324a0e660610480c41823 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_HTTP_CONFIG_H_INCLUDED_
 #define _NGX_HTTP_CONFIG_H_INCLUDED_
 
index 617153046a6bed28a5b303ee172764c96d98e091..34c47a7b39141592b82666248e6e511efe9b7607 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index a40548e180c8145a6fbf764c119e6391f1fab6ad..194a519084f822cbd751f0e3e85a4feeb5a49824 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 5e0e344d90c14755458eb40de3477e8e3e087ae2..8d6490b248e1e791b8f7bdf1df0c9f5458d13ccb 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_HTTP_CORE_H_INCLUDED_
 #define _NGX_HTTP_CORE_H_INCLUDED_
 
index 10cb3edcf72897127f2a438be009b6a7a8dbebf2..7d920e57068970db03eb8d564675dd0eaa896e24 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index 20389426c958d241fddb71f7e185b3eb7d7c27fa..7ece679bd85fdcc6c14823b716e28249819bf9d7 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index 3de6b10dd65d64da64cb797a401d51c803f8a5b5..b9dcd05de8719b8f545a707eb2085305ab8eac98 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index d29e70d60b744754cc60880ac81a462e7b6c5361..2efa232bc2119af0ca01d31f6792ff4d657af3d2 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_HTTP_LOG_HANDLER_H_INCLUDED_
 #define _NGX_HTTP_LOG_HANDLER_H_INCLUDED_
 
index b1fb6c67238e46a99cb00ce62e2424debfb625f3..3b79c1c284610438f75348d0506e04a4fa69375e 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
@@ -39,7 +44,7 @@ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
     while (p < b->last && state < sw_done) {
         ch = *p++;
 
-        /* gcc 2.95.2 and vc 6.0 compile this switch as an jump table */
+        /* gcc 2.95.2 and msvc 6.0 compile this switch as an jump table */
 
         switch (state) {
 
index ea2a22474f542a8e9500018e3d0030a61e41ee4d..49eb931d641b7ac7104c3b04d5d3a0ffcdedf031 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_types.h>
index 209ed0cf39b5f3d9feafb06b50ae47b4e69eb4c0..d27cd8ddb8c47cb852f706692078cf23aacbdab8 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 79b25b032c6f8efa8aab61ef7fcbedc643868160..ab7e49f5364040eec76a5ce64e80223166d8ae57 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_HTTP_REQUEST_H_INCLUDED_
 #define _NGX_HTTP_REQUEST_H_INCLUDED_
 
index 800f5491e15abf67feb7e4e1d7547e41da45e0e6..348f2d184cd97619db6b900cd4822d15f046db63 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 19e582a6a564589a84f4b302d0675ebef5f34116..57123de03d18c29597dda2120975e6145e3666c7 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index d3fd5fb8ba6821f8ce2817f2d7421462b29b0f0a..84b99a0c4208e7a7c364bbfa6b76dcdd7acc66eb 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_HTTP_SCRIPT_H_INCLUDED_
 #define _NGX_HTTP_SCRIPT_H_INCLUDED_
 
index 17efa5a908c5d9dc2773ae85ea61fb3007baba02..62ba2b90916e2e2a9f91a3e243a0a8b73dd9832f 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
index 2c0989d0a4ef7e9f079290cf43af60c4e1c392d7..c3ec7ac2e07773d3bd92d5a1eba9ce37bd585d43 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index eb12b6790fb77c91bb27a73e1661576dbeaea6df..acc95af7a19a62d183ba805d818506cc3bff458d 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 023f809ecf24b309b0703dedc4651e54b1943fe9..2cc81bd97060873a19da525bb507d0a873aef4ac 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_IMAP_H_INCLUDED_
 #define _NGX_IMAP_H_INCLUDED_
 
index 6c97416d04874ecec6906facf37a0dd75d0a93d3..788d840b3670583d66c322d95cbe7331b47b0621 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 8e875f9fb52e841b56311fb5a560f25cbfd85e9a..bd757501c7df7ff43a26de896f30338e9a2076e5 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 6c9c859fc7dac45f2f3f94f05877e3f15cfd2360..b42f47d27e0a744dcd807c1f89a0b935092560de 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index a10e0b0f3f1193a23af9e37e06ee3e132d17437e..66807efa0ae058d741816137274f3b4093cd64af 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_AIO_H_INCLUDED_
 #define _NGX_AIO_H_INCLUDED_
 
index 6c0c40084ed16a6f4eb0a848ca637c3f67972842..49602f994a2d35d30caf98e96b8847f0fccf87a1 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index a2a12d23e12d06e412a44a7293d5391d14bd4ff5..333c8e404c8c6b7c59107fd6fd6ae7d14233e9ca 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 319af12614f07ad44840e24c7445807e7f565705..e16189a93015c77e4dfdb6efb2bab94ef1f79285 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 2bfa59021e05156972398a1d09d544ab76370dab..294dc1247f6f414e63a79aac025190ab54d15c43 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index bb3a299e10cbeed595560759737d677c6dbafd03..d2e7205e68eb519fa73458f9e988d17b4b2a61ba 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index 650f8bef3333d3a96fe6e16eb23ea91ca69754a8..91016e59889f3957ff6d79b183951e53075183e3 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_ALLOC_H_INCLUDED_
 #define _NGX_ALLOC_H_INCLUDED_
 
@@ -16,7 +22,7 @@ void *ngx_calloc(size_t size, ngx_log_t *log);
  * Linux has memalign() or posix_memalign()
  * Solaris has memalign()
  * FreeBSD has not memalign() or posix_memalign() but its malloc() alignes
- * allocations bigger than page size at page boundary.
+ * allocations bigger than page size at the page boundary.
  */
 
 #if (HAVE_POSIX_MEMALIGN || HAVE_MEMALIGN)
index c5197e56e6a72445aba219980ee98d23f19c76ab..6d50985b754c0a5639006a93c16638ab7687b9f6 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_ATOMIC_H_INCLUDED_
 #define _NGX_ATOMIC_H_INCLUDED_
 
index 694b1d83cec8785b5c52adecae94ccc20d1f4963..d2ca1ecbd4577decd3f53d1993ad30da6c826044 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_channel.h>
index 2768252320b0649ab8f003656c10a4d83ef5d2c1..3cb1c55ecd775d888cf6b684616d6b7f83b660ed 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_CHANNEL_H_INCLUDED_
 #define _NGX_CHANNEL_H_INCLUDED_
 
index 8bad5444afd481164ebb2430b0878a4ddc989e27..be2a91aa200fc2231acf518a5cafe0f78cbb7e51 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index 3b12528f72de39a6990289a04af8564c0e9b7372..9b9c6a96dce418318048cd98ebeb9e06fe999035 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index f539a1225a3ea6192177f50a1ea4ece7cc4bab28..bb86b4b2c6f4a716e42895edda278c5b5036d8f1 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_ERRNO_H_INCLUDED_
 #define _NGX_ERRNO_H_INCLUDED_
 
index 8b906f097ef1c3e678a1af7987c43aa60851ce81..ae336ae5fadab21ff00dee9a80c3df4ccbe9a3dc 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index 1553144cf179da3e13d41e30f6312231ec9b5884..cb50fcee79285ab84ed3cb41b63d14248369c9f4 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_FILES_H_INCLUDED_
 #define _NGX_FILES_H_INCLUDED_
 
index cfafecf6dacef981707bd2d2bcd72957409403a0..a16b407283349a4565e1c9e4d04b1b7907473700 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_FREEBSD_H_INCLUDED_
 #define _NGX_FREEBSD_H_INCLUDED_
 
index d3c41e89b34a02d21c01344ab2e3c2afa19cde3b..80e70e1a6a736fec7a0632a94ba661e86f4bb412 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_FREEBSD_CONFIG_H_INCLUDED_
 #define _NGX_FREEBSD_CONFIG_H_INCLUDED_
 
index 3084831cdf07ed70c69930eaf6a78b3a5f83eb1d..e59a593cf4b4462e245c22b1659e5a50a1e9feb1 100644 (file)
@@ -1,22 +1,31 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
 
-/* FreeBSD 3.4 at least */
+/* FreeBSD 3.0 at least */
 char ngx_freebsd_kern_ostype[20];
 char ngx_freebsd_kern_osrelease[20];
 int ngx_freebsd_kern_osreldate;
 int ngx_freebsd_hw_ncpu;
-int ngx_freebsd_machdep_hlt_logical_cpus;
 int ngx_freebsd_net_inet_tcp_sendspace;
-int ngx_freebsd_sendfile_nbytes_bug;
-int ngx_freebsd_use_tcp_nopush;
+
+/* FreeBSD 4.9 */
+int ngx_freebsd_machdep_hlt_logical_cpus;
 
 /* FreeBSD 5.0 */
 int ngx_freebsd_kern_ipc_zero_copy_send;
 
 
+int ngx_freebsd_sendfile_nbytes_bug;
+int ngx_freebsd_use_tcp_nopush;
+
+
 ngx_os_io_t ngx_os_io = {
     ngx_unix_recv,
     ngx_readv_chain,
index 5f651c38b8e933810b3d1a6dbdbc43724ba79e67..361fc8fb479c2bd654b2b3833c600ccbab46bd2d 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/
+ * Copyright (C) 2002-2004 Igor Sysoev
  */
 
 
index ce68a4efca756308db8d74bc0008e88e664a9536..f5b880335095a6137835dca888a13cdff08ac268 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_FREEBSD_RFORK_THREAD_H_INCLUDED_
 #define _NGX_FREEBSD_RFORK_THREAD_H_INCLUDED_
 
index 5a8164f4f142d1e498954c4e274978b42e7bae50..81aec555c3112b73ec77bb9109d74a79bb9cd45c 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/
+ * Copyright (C) 2002-2004 Igor Sysoev
  */
 
 
index b3e4155713520c13077f2f4cb5dd2cdfb885be23..ba1299184c6fe33d6da03146efa988aa75245189 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_LINUX_H_INCLUDED_
 #define _NGX_LINUX_H_INCLUDED_
 
index 757a2943b146dee16ab633365a3f5ec2055b8eb5..b18ec5d9df42dfeeb85d67ff036ba3d46ab6c421 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_LINUX_CONFIG_H_INCLUDED_
 #define _NGX_LINUX_CONFIG_H_INCLUDED_
 
index 7379c6a18674a42da608e16a15591de9cbcd0467..847c0134a51029c1740751aabf2bbd0a06575633 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index 3f8671266d1606bd755c7cba1b8cff60b136101e..e8f0cefef4be6adca40f03522eec6636eaf4bfc7 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/
+ * Copyright (C) 2002-2004 Igor Sysoev
  */
 
 
index e4e94f2d81c9e2f29f6f029fc29b9a1ab5fcec3b..8fd162de027ad8b0efd47c152b49c46254d1d09a 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_OS_H_INCLUDED_
 #define _NGX_OS_H_INCLUDED_
 
index 53ee9e812f1c8698f8cecf9ee1a9d57877d1df97..75be90aeec36e9196b29e6ad2207df0b6de3180f 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_POSIX_CONFIG_H_INCLUDED_
 #define _NGX_POSIX_CONFIG_H_INCLUDED_
 
index 7498ae609e7b92b1d159257a0d36a7a5447e6560..6a64981a467c04226cf2de09490d4e6d874d2574 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index cd6fd2f1e607554caf9300ee19ec036b9d5f04be..ca6b88c3fda741b94fb9ce747c045ea28d432623 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 31549062cdf4b9708af2e3114500241f70c959c7..6e00d447c2561b407390027ab3f1693c3452e37a 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_PROCESS_H_INCLUDED_
 #define _NGX_PROCESS_H_INCLUDED_
 
index 941bc42879d18931219fea59b9338d95f72f72d0..5614bd2e02c49faa512bf6a44dd716311fa8e558 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 7c14d3a837dbc35298f2b7c9832ee55703c35064..4900a34bc96bb23b9259a06485adf1153854c4d7 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_PROCESS_CYCLE_H_INCLUDED_
 #define _NGX_PROCESS_CYCLE_H_INCLUDED_
 
index 621565621aa9cb3cc1000fb93daa795e0ab3a141..22ef889d6517ac17ed677df673bef7cb35645ccf 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/
+ * Copyright (C) 2002-2004 Igor Sysoev
  */
 
 
index 9458872b7c907a6db8c73f662a373e56dbeb30ec..b12198f320136b9e25a9e07cf467cd78581c59a4 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index d4d28d77db7dda3f9d1b123296e0d8a4d33b2659..60dd91d22b68adabbdb91678784b6d84a076e419 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 2bcbdf9d71ef7c7777878fcdb2637a31ae345287..86160057feb51913594528213bacf6741835da3c 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
diff --git a/src/os/unix/ngx_sendv.c b/src/os/unix/ngx_sendv.c
deleted file mode 100644 (file)
index 810caae..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#include <ngx_core.h>
-#include <ngx_types.h>
-#include <ngx_errno.h>
-#include <ngx_connection.h>
-#include <ngx_log.h>
-#include <ngx_sendv.h>
-
-ssize_t ngx_sendv(ngx_connection_t *c, ngx_iovec_t *iovec, int n)
-{
-    ssize_t rc;
-    ngx_err_t err;
-
-    rc = writev(c->fd, iovec, n);
-
-    if (rc == -1) {
-        err = ngx_socket_errno;
-        if (err == NGX_EAGAIN) {
-            ngx_log_error(NGX_LOG_INFO, c->log, err, "sendv() eagain");
-            return NGX_AGAIN;
-        }
-
-        ngx_log_error(NGX_LOG_ERR, c->log, err, "sendv() failed");
-        return NGX_ERROR;
-    }
-
-    return rc;
-}
diff --git a/src/os/unix/ngx_sendv.h b/src/os/unix/ngx_sendv.h
deleted file mode 100644 (file)
index 0859a25..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _NGX_SENDV_H_INCLUDED_
-#define _NGX_SENDV_H_INCLUDED_
-
-
-#include <ngx_types.h>
-#include <ngx_connection.h>
-
-typedef struct iovec  ngx_iovec_t;
-#define ngx_iov_base  iov_base
-#define ngx_iov_len   iov_len
-
-ssize_t ngx_sendv(ngx_connection_t *c, ngx_iovec_t *iovec, int n);
-
-
-#endif /* _NGX_SENDV_H_INCLUDED_ */
index a19ca5315d63ba30aef9c7ec1aeae7b91fdbd3fd..0d2888df178f9ae3cb5ae63a0491b1c8ec110b5d 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index ca077df4286f22963638c320517b01e3656687bd..40bf7bfa96f61e8b0017b98f22d9a4ef137ede9a 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_SHARED_H_INCLUDED_
 #define _NGX_SHARED_H_INCLUDED_
 
index da9ccbbd0d75d848fa8c9a56da46ecb7196162fc..859a980a9010e8637b27ca3ff9a6c0d672d4b25e 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
@@ -6,7 +11,7 @@
 /*
  * ioctl(FIONBIO) sets a blocking mode with the single syscall
  * while fcntl(F_SETFL, ~O_NONBLOCK) needs to learn before
- * a previous state using fcntl(F_GETFL).
+ * the previous state using fcntl(F_GETFL).
  *
  * ioctl() and fcntl() are syscalls on at least FreeBSD 2.x, Linux 2.2
  * and Solaris 7.
index 4e2eab441e0303e071d65c398ea1ef3895b72b40..8664fe67c7ff118004ee1efdd32bf385cb98c10a 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_SOCKET_H_INCLUDED_
 #define _NGX_SOCKET_H_INCLUDED_
 
index d66c657334c8ac03a0c9523efff7619c62c88128..7c076d6f24f493e0b42ec94d476a64a5da758748 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_SOLARIS_H_INCLUDED_
 #define _NGX_SOLARIS_H_INCLUDED_
 
index 25ec28bc3680ad645116baec52a41e592fccc2b1..b8867465b603ebc4ae8ff5defeec835858c19d17 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_SOLARIS_CONFIG_H_INCLUDED_
 #define _NGX_SOLARIS_CONFIG_H_INCLUDED_
 
index 25fa14dcca68964b9397b147a26342e0fbb8337b..7186f1fd034a2c7230dea06f0da48bef543d3fd0 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index f6dca9c15e6d868141b4b6e80711370eac6167ff..8b0d3d60b5876fa5f3cee562e4a400e2ad078cc0 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/
+ * Copyright (C) 2002-2004 Igor Sysoev
  */
 
 
index 69d3c348daeef1ff54e8dc8fb0b30a964ab4463e..f78a7c02cb15f32d93fedb5b406920b1a7444866 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_THREAD_H_INCLUDED_
 #define _NGX_THREAD_H_INCLUDED_
 
index 8647e0e6974cb90b97b1313c0ce683b2fe53c9a9..fd667b042085c153c224eccb131dd63db5087aaa 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index 7cf3d01afbffd8fa1c01e342bcc4480ecfb89b60..43c2027de8641e1f5bd7265345c0843008673f0e 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_TIME_H_INCLUDED_
 #define _NGX_TIME_H_INCLUDED_
 
index bdad25dd7a948364110e7eb8ce616cc1289f2fdc..a7e21ace1562c6e24e79ac0f1308e599dbfaffbf 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_TYPES_H_INCLUDED_
 #define _NGX_TYPES_H_INCLUDED_
 
diff --git a/src/os/unix/ngx_unix_init.c b/src/os/unix/ngx_unix_init.c
deleted file mode 100644 (file)
index ab33979..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-
-
-#if 0
-/* STUB */
-ssize_t ngx_unix_recv(ngx_connection_t *c, char *buf, size_t size);
-ngx_chain_t *ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in);
-int ngx_posix_init(ngx_log_t *log);
-int ngx_posix_post_conf_init(ngx_log_t *log);
-/* */
-#endif
-
-
-ngx_os_io_t ngx_os_io = {
-    ngx_unix_recv,
-    ngx_readv_chain,
-    NULL,
-    ngx_writev_chain,
-    NGX_HAVE_ZEROCOPY
-};
-
-
-int ngx_os_init(ngx_log_t *log)
-{
-    return ngx_posix_init(log);
-}
-
-
-int ngx_os_post_conf_init(ngx_log_t *log)
-{
-    return ngx_posix_post_conf_init(log);
-}
index 0aed208cc808b2e2dcda7f952178ae7f02a88822..54f6aaa7d065f5a8d91cb1d7f8123cd459846edf 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_USER_H_INCLUDED_
 #define _NGX_USER_H_INCLUDED_
 
index afe49a947b496a640a903db9a13071e9836616d8..c7b17c23d65e8a1404e1e12e64ea589f54811ca1 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
diff --git a/src/os/unix/ngx_x86_mutex.h b/src/os/unix/ngx_x86_mutex.h
deleted file mode 100644 (file)
index a8ed2ee..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-typedef struct {
-    int  lock;
-} ngx_mutex_t;
-
-
-static inline int ngx_spin_lock(ngx_mutex_t *m, int count)
-{
-    int  lock;
-
-    __asm__ __volatile("
-
-get_lock:
-        mov   $1, %1
-        xchg  %1, %2
-        cmp   $0, %1
-        jne   spin_lock
-
-spin_lock:
-        cmp   $0, %3
-        je    failed
-
-        dec   %3
-        rep   nop
-        cmp   $0, %2
-        jne   spin_lock
-
-    ": "=q" (lock), "m" (m->lock), "q" (count));
-}
index 5abb9f8317fe96ae3c8618d8503ea07ca1146c38..af79ca2b0fdbf743c6fcc98cb74a48420dc21230 100644 (file)
@@ -1,4 +1,10 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
+
 #include <sys/syscall.h>
 #include <machine/asm.h>
 
index 591e61bcbd2e72a7098bab585f675eeefa35907a..8b0cc20b15aa9ba486e5919b52438b9a09692e49 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index d6ea00a2b809bd0ac8a34b364c685b80e62885ab..66798ceb35c85fe106e1b5f7d802c5b2279bbaa5 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_ALLOC_H_INCLUDED_
 #define _NGX_ALLOC_H_INCLUDED_
 
index 9d75fabd5b20c72c4f61395b1d6ed5ca7db177e3..99402613922447e59dceea6d28da69f81e2ade3c 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_ATOMIC_H_INCLUDED_
 #define _NGX_ATOMIC_H_INCLUDED_
 
index 865fbe37bf1ed5bcdab157cb6297c39e076ad6c1..16bb2a5af7620ba5404a7260bdee9e130cdc0107 100644 (file)
@@ -1,9 +1,14 @@
 
 /*
-   TODO:
-     add WSA error messages for NT and 98
-     test for English only messages
-*/
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
+/*
+ * TODO:
+ *   add WSA error messages for NT and 98
+ *   test for English only messages
+ */
 
 #include <ngx_config.h>
 #include <ngx_core.h>
index d55b3956d2ca3ab336e7851da56a4d321e0477d8..7ee9d560b984092a4511387bafed65efdd844112 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_ERRNO_H_INCLUDED_
 #define _NGX_ERRNO_H_INCLUDED_
 
index 6ed4ff00ffba6d25f6b16456ee78d5db43771909..c3be4fb6569b8814a48d3c13e663b6b3b96aa469 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index c59e79d16c410f52211c985a28469fdf00ab26ac..0a01ecc3d387c8482e3e81a82e95dee5598acaf7 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_FILES_H_INCLUDED_
 #define _NGX_FILES_H_INCLUDED_
 
index c04eacaa8f5103dfbd2539b45314db7a2185fe00..3072e3bdd69b61207fd7adb5686c8a8f396716e7 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_OS_H_INCLUDED_
 #define _NGX_OS_H_INCLUDED_
 
diff --git a/src/os/win32/ngx_os_thread.c b/src/os/win32/ngx_os_thread.c
deleted file mode 100644 (file)
index c9d540c..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-#include <ngx_config.h>
-
-#include <ngx_log.h>
-#include <ngx_os_thread.h>
-
-
-int ngx_create_os_thread(ngx_os_tid_t *tid, void *stack,
-                         ngx_thread_start_routine_t func, void *arg,
-                         ngx_log_t log)
-{
-    ngx_os_tid_t  id;
-    int  dummy;       /* needed in Win9X only, in NT can be NULL */
-
-    id = CreateThread(NULL, stack_size, func, arg, 0, &dummy);
-
-    if (id == NULL) {
-        ngx_log_error(NGX_LOG_ERR, log, err, "CreateThread() failed");
-        return NGX_ERROR;
-    }
-
-    *tid = id;
-
-    return NGX_OK;
-}
diff --git a/src/os/win32/ngx_os_thread.h b/src/os/win32/ngx_os_thread.h
deleted file mode 100644 (file)
index 81eb3b9..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _NGX_OS_THREAD_H_INCLUDED_
-#define _NGX_OS_THREAD_H_INCLUDED_
-
-
-#include <ngx_config.h>
-
-
-typedef HANDLE                  ngx_os_tid_t;
-typedef int                     ngx_tid_t;
-
-typedef LPTHREAD_START_ROUTINE  ngx_thread_start_routine_t
-
-
-#endif /* _NGX_OS_THREAD_H_INCLUDED_ */
index 6d78c1c13eaec1e0caf0e857cf935f92f755d796..23b1697380e961ae302e656c27c185a5da56c6ff 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index 767a88d237a3eaadd114fd552387a15cd3e26d46..ba4603c310d6891155fc9cf8e9b00e356666c432 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_PROCESS_H_INCLUDED_
 #define _NGX_PROCESS_H_INCLUDED_
 
index 93a2cdb3b42a4d5fbe95d057fe44a8188c14eb91..b6d2578ca8ce1a4f1eecda48a91e6316bfb02da8 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index 0a91e84f522ea52930afe69e0553bc8b24884bc2..7803686ec1671f47c3e4f260acdfa5aee279c518 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_PROCESS_CYCLE_H_INCLUDED_
 #define _NGX_PROCESS_CYCLE_H_INCLUDED_
 
diff --git a/src/os/win32/ngx_recv.h b/src/os/win32/ngx_recv.h
deleted file mode 100644 (file)
index e92832c..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _NGX_RECV_H_INCLUDED_
-#define _NGX_RECV_H_INCLUDED_
-
-
-#include <errno.h>
-
-#define ngx_recv(fd, buf, size, flags)  recv(fd, buf, size, flags)
-
-
-#endif /* _NGX_RECV_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_sendfile.c b/src/os/win32/ngx_sendfile.c
deleted file mode 100644 (file)
index 2dd779d..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_types.h>
-#include <ngx_files.h>
-#include <ngx_socket.h>
-#include <ngx_errno.h>
-#include <ngx_log.h>
-#include <ngx_connection.h>
-#include <ngx_sendv.h>
-#include <ngx_sendfile.h>
-
-/*
-  TODO:
-       various flags
-       TransmitPackets
-*/
-
-#if (HAVE_WIN32_TRANSMITFILE)
-
-int ngx_sendfile(ngx_connection_t *c,
-                 ngx_iovec_t *headers, int hdr_cnt,
-                 ngx_fd_t fd, off_t offset, size_t nbytes,
-                 ngx_iovec_t *trailers, int trl_cnt,
-                 off_t *sent, u_int flags)
-{
-    int                    tfrc, rc;
-    ngx_err_t              tf_err, err;
-    OVERLAPPED             olp;
-    TRANSMIT_FILE_BUFFERS  tfb, *ptfb;
-
-#if 0
-    ev = c->write;
-
-    if (ev->timedout) {
-        ngx_set_socket_errno(NGX_ETIMEDOUT);
-        ngx_log_error(NGX_LOG_ERR, ev->log, 0, "TransmitFile() timed out");
-
-        return NGX_ERROR;
-    }
-
-    if (ev->ready) {
-        ev->ready = 0;
-
-#if (HAVE_IOCP) /* iocp */
-
-        if (ngx_event_flags & NGX_HAVE_IOCP_EVENT) {
-            if (ev->ovlp.error) {
-                ngx_log_error(NGX_LOG_ERR, ev->log, 0, "TransmitFile() failed");
-                return NGX_ERROR;
-            }
-
-            return ev->available;
-            }
-        }
-
-#endif
-
-        /* TODO: WSAGetOverlappedResult stuff */
-
-    }
-
-#endif
-
-
-    tf_err = 0;
-    err = 0;
-
-    olp.Internal = 0;
-    olp.InternalHigh = 0;
-    olp.Offset = (DWORD) offset;
-    olp.OffsetHigh = (DWORD) (offset >> 32);
-    olp.hEvent = NULL;
-
-    if (headers || trailers) {
-        tfb.Head = headers->ngx_iov_base;
-        tfb.HeadLength = headers->ngx_iov_len;
-        tfb.Tail = trailers->ngx_iov_base;
-        tfb.TailLength = trailers->ngx_iov_len;
-        ptfb = &tfb;
-
-    } else {
-        ptfb = NULL;
-    }
-
-#if 1
-    flags = TF_DISCONNECT|TF_REUSE_SOCKET;
-    tfrc = transmitfile(c->fd, NULL, 0, 0, &olp, NULL, flags);
-#else
-    tfrc = TransmitFile(c->fd, fd, nbytes, 0, &olp, ptfb, flags);
-#endif
-
-#if 0
-#if 1
-    tfrc = TransmitFile(c->fd, fd, nbytes, 0, &olp, ptfb, 0);
-#else
-    tfrc = TransmitFile(c->fd, fd, nbytes, 0, NULL, ptfb, 0);
-#endif
-#endif
-
-    if (tfrc == 0) {
-        tf_err = ngx_socket_errno;
-        ngx_log_error(NGX_LOG_NOTICE, c->log, tf_err,
-                      "ngx_sendfile: TransmitFile failed");
-        if (tf_err == WSA_IO_PENDING) {
-            return NGX_AGAIN;
-        }
-    }
-
-    /* set sent */
-#if 0
-    rc = WSAGetOverlappedResult(c->fd, &olp, (unsigned long *) sent, 0, NULL);
-#else
-    *sent = olp.InternalHigh;
-    rc = 1;
-#endif
-
-    ngx_log_debug(c->log, "TransmitFile: %d, @%I64d %I64d:%d" _
-                  tfrc _ offset _ *sent _ nbytes);
-
-    if (rc == 0) {
-        err = ngx_socket_errno;
-        ngx_log_error(NGX_LOG_ERR, c->log, err,
-                     "ngx_sendfile: WSAGetOverlappedResult failed");
-    }
-
-    if (tfrc == 0) {
-        if (tf_err != NGX_EAGAIN) {
-            ngx_log_error(NGX_LOG_ERR, c->log, tf_err,
-                          "ngx_sendfile: TransmitFile failed");
-            return NGX_ERROR;
-        }
-
-        ngx_log_error(NGX_LOG_INFO, c->log, tf_err,
-                      "ngx_sendfile: TransmitFile sent only %I64d bytes",
-                      *sent);
-    }
-
-    if (rc == 0)
-        return NGX_ERROR;
-
-    return NGX_OK;
-}
-
-#endif
diff --git a/src/os/win32/ngx_sendv.c b/src/os/win32/ngx_sendv.c
deleted file mode 100644 (file)
index b043629..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-
-#include <ngx_config.h>
-
-#include <ngx_core.h>
-#include <ngx_types.h>
-#include <ngx_errno.h>
-#include <ngx_connection.h>
-#include <ngx_log.h>
-#include <ngx_sendv.h>
-
-#include <ngx_string.h>
-
-ssize_t ngx_sendv(ngx_connection_t *c, ngx_iovec_t *iovec, int n)
-{
-    int         rc;
-    size_t      sent;
-    ngx_err_t   err;
-
-#if 0
-    /* STUB: WSABUF must be 4-byte aligned. Undocumented WSAEINVAL error */
-    ngx_iovec_t iov[10];
-    ngx_memcpy(iov, iovec, n * sizeof(ngx_iovec_t));
-#endif
-
-    sent = 0;
-
-    ngx_log_debug(c->log, "WSASend: %d, %d, %08x" _ c->fd _ n _ iovec);
-
-    rc = WSASend(c->fd, iovec, n, &sent, 0, NULL, NULL);
-
-    ngx_log_debug(c->log, "WSASend() done");
-
-    if (rc == SOCKET_ERROR) {
-        err = ngx_socket_errno;
-
-        if (err == NGX_EAGAIN) {
-            ngx_log_error(NGX_LOG_INFO, c->log, err, "WSASend() eagain");
-            return NGX_AGAIN;
-        }
-
-        ngx_log_error(NGX_LOG_ERR, c->log, err, "WSASend() failed");
-        return NGX_ERROR;
-    }
-
-    return sent;
-}
diff --git a/src/os/win32/ngx_sendv.h b/src/os/win32/ngx_sendv.h
deleted file mode 100644 (file)
index 0d20310..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _NGX_SENDV_H_INCLUDED_
-#define _NGX_SENDV_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_connection.h>
-
-typedef WSABUF        ngx_iovec_t;
-#define ngx_iov_base  buf
-#define ngx_iov_len   len
-
-ssize_t ngx_sendv(ngx_connection_t *c, ngx_iovec_t *iovec, int n);
-
-
-#endif /* _NGX_SENDV_H_INCLUDED_ */
index 64a54ee634d9fc25fccda723264ac088bc7ce68b..d9c9ad587f517c77d03c254022bafae6642b3205 100644 (file)
@@ -1,4 +1,10 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
+
 #define NGX_SERVICE_CONTROL_SHUTDOWN   128
 #define NGX_SERVICE_CONTROL_REOPEN     129
 
index ca077df4286f22963638c320517b01e3656687bd..40bf7bfa96f61e8b0017b98f22d9a4ef137ede9a 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_SHARED_H_INCLUDED_
 #define _NGX_SHARED_H_INCLUDED_
 
index e3f6f5c9687aee752bee2c2f404370ba2d71b472..c397f7b22f12c860f5210ab7a7c91ce79520fd45 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index 4401c3de23f848891bc8a28b5b24f7fc6eccdbc8..f1459bc422b0d614f79bfd0f5a2b84abcba149e8 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_SOCKET_H_INCLUDED_
 #define _NGX_SOCKET_H_INCLUDED_
 
index 786bc7f386cf0ab18e0d510bc9e7660a7e35d8dd..ee63c0c944e6e2882fececaf2b658bf6d225f9fe 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index cb282fbc0f9ffcb65fe6dc7b620aef8cb85c8af2..be07db62092aa623ca7e04e3d0c5104522b3b27d 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_THREAD_H_INCLUDED_
 #define _NGX_THREAD_H_INCLUDED_
 
index 85d1a3b6d60b762b43246163add8a34a9e6906bd..a4412fc0bf076a0823b71a2609595e8f62cbd1a4 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
@@ -13,7 +18,7 @@ void ngx_gettimeofday(struct timeval *tp)
     /*
      * A file time is a 64-bit value that represents the number
      * of 100-nanosecond intervals that have elapsed since
-     * 12:00 A.M. January 1, 1601 (UTC).
+     * January 1, 1601 12:00 A.M. UTC.
      *
      * Between January 1, 1970 (Epoch) and January 1, 1601 there were
      * 134744 days,
index a51c4f99ee1c749ff9452793e29eab40092e420b..fcd494fda5c4cbb62b7e474a10fb507a025775c8 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_TIME_H_INCLUDED_
 #define _NGX_TIME_H_INCLUDED_
 
index 760342968ad87d96dd40c0197635245283f5f46f..0e12d376b13de0d8781c8ffaa89378fd721fc7d3 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_TYPES_H_INCLUDED_
 #define _NGX_TYPES_H_INCLUDED_
 
index 480a2588526331725f5847b46e95ab5b23bf0cba..561041b947935ee637c058c2900657699b6d1710 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_USER_H_INCLUDED_
 #define _NGX_USER_H_INCLUDED_
 
index 6bbe66bcf4679defd8b0b2e8dcc506bcd9937ab7..7c66dbc70099839c80021a986c619879881a2819 100644 (file)
@@ -1,3 +1,9 @@
+
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #ifndef _NGX_WIN32_CONFIG_H_INCLUDED_
 #define _NGX_WIN32_CONFIG_H_INCLUDED_
 
@@ -8,8 +14,8 @@
 #define WIN32_LEAN_AND_MEAN
 
 /*
- * we need to include windows.h explicity before winsock2.h because
- * the warning 4201 is enabled in windows.h
+ * we need to include <windows.h> explicity before <winsock2.h> because
+ * the warning 4201 is enabled in <windows.h>
  */
 #include <windows.h>
 
index 7d9d433e56882a9f6103b884b01bc8451c86d031..61de9639b143b10bb4c286a919094915a39aa3f1 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 
index 1598c6b206750be0433e4849548d56c83b5cdaa0..2eb04ed0993d121baedae119a8aca7d552f25101 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index e417cfff61118436b74eddae8a8553547b0f751b..5b0f18ba88a5c142fb3fab7f3e91f0c57fbdb714 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
index eda422ed2edd93168fe4dd70a909badea1ef6887..406d5950d68edd4e276acc79fd609329cd79b540 100644 (file)
@@ -1,4 +1,9 @@
 
+/*
+ * Copyright (C) 2002-2004 Igor Sysoev
+ */
+
+
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>