nginx-0.0.1-2003-11-04-20:09:19 import

3 files changed, 29 insertions, 1 deletions

diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index 7214e1f14..d2484bb39 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -811,7 +811,7 @@ char *ngx_conf_check_num_bounds(ngx_conf_t *cf, void *post, void *data)
         }
 
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "value must be more than %d", bounds->low);
+                           "value must be equal or more than %d", bounds->low);
 
         return NGX_CONF_ERROR;
     }
diff --git a/src/http/ngx_http_busy_lock.h b/src/http/ngx_http_busy_lock.h
new file mode 100644
index 000000000..551b301ae
--- /dev/null
+++ b/src/http/ngx_http_busy_lock.h
@@ -0,0 +1,27 @@
+#ifndef _NGX_HTTP_BUSY_LOCK_H_INCLUDED_
+#define _NGX_HTTP_BUSY_LOCK_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+
+
+typedef struct {
+    char  *busy;
+    int    busy_n;
+
+    int    waiting_n;
+    int    max_waiting;
+
+    int    conn_n;
+    int    max_conn;
+
+    int    timeout;
+
+ /* ngx_mutex_t  mutex; */
+
+} ngx_http_busy_lock_t;
+
+
+#endif /* _NGX_HTTP_BUSY_LOCK_H_INCLUDED_ */
diff --git a/src/http/ngx_http_cache.h b/src/http/ngx_http_cache.h
index f10dc992f..f9bf66196 100644
--- a/src/http/ngx_http_cache.h
+++ b/src/http/ngx_http_cache.h
@@ -4,6 +4,7 @@
 
 #include <ngx_config.h>
 #include <ngx_core.h>
+#include <ngx_http.h>
 
 
 typedef struct {