nginx-0.1.3-RELEASE import
*) Feature: the ngx_http_autoindex_module and the autoindex directive.
*) Feature: the proxy_set_x_url directive.
*) Bugfix: proxy module may get caught in an endless loop when sendfile
is not used.
diff --git a/src/core/nginx.h b/src/core/nginx.h
index bac01fc..04282ef 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -8,7 +8,7 @@
#define _NGINX_H_INCLUDED_
-#define NGINX_VER "nginx/0.1.2"
+#define NGINX_VER "nginx/0.1.3"
#define NGINX_VAR "NGINX"
#define NGX_NEWPID_EXT ".newbin"
diff --git a/src/core/ngx_file.h b/src/core/ngx_file.h
index 9a6fe6e..d05b6d7 100644
--- a/src/core/ngx_file.h
+++ b/src/core/ngx_file.h
@@ -26,7 +26,7 @@
ngx_log_t *log;
- unsigned info_valid:1;
+ ngx_uint_t valid_info:1; /* unsigned valid_info:1; */
};
#define NGX_MAX_PATH_LEVEL 3
diff --git a/src/core/ngx_garbage_collector.c b/src/core/ngx_garbage_collector.c
index d73ca95..73f9cc1 100644
--- a/src/core/ngx_garbage_collector.c
+++ b/src/core/ngx_garbage_collector.c
@@ -153,7 +153,7 @@
ngx_log_debug1(NGX_LOG_DEBUG_CORE, ctx->log, 0,
"gc path: \"%s\"", fname.data);
- if (!dir.info_valid) {
+ if (!dir.valid_info) {
if (ngx_de_info(fname.data, &dir) == NGX_FILE_ERROR) {
ngx_log_error(NGX_LOG_CRIT, ctx->log, ngx_errno,
ngx_de_info_n " \"%s\" failed", fname.data);
diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index 8e4e09a..390ca43 100644
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -41,6 +41,7 @@
* %[0][width]ui ngx_uint_t
* %[0][width]uxi ngx_uint_t in hex
* %s null-terminated string
+ * %c char
* %% %
*
*/
@@ -223,6 +224,13 @@
continue;
+ case 'c':
+ d = va_arg(arg, int);
+ *buf++ = (u_char) (d & 0xff);
+ fmt++;
+
+ continue;
+
case '%':
*buf++ = '%';
fmt++;