Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nginx/nginx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2005-05-19 17:25:22 +0400
committerIgor Sysoev <igor@sysoev.ru>2005-05-19 17:25:22 +0400
commite31e90b3e10ca2afafccae9a57910133d93b2d37 (patch)
tree7177a8f48a555733b170bfcad4e9e7072ea8c027 /src/core
parentb1a641cafa2ef042035155f68e5f571303853dfc (diff)
nginx-0.1.32-RELEASE importrelease-0.1.32
*) Bugfix: the arguments were omitted in the redirects, issued by the "rewrite" directive; the bug had appeared in 0.1.29. *) Feature: the "if" directive supports the captures in regular expressions. *) Feature: the "set" directive supports the variables and the captures of regular expressions. *) Feature: the "X-Accel-Redirect" response header line is supported in proxy and FastCGI mode.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/nginx.h2
-rw-r--r--src/core/ngx_inet.c2
-rw-r--r--src/core/ngx_log.h1
-rw-r--r--src/core/ngx_string.h6
4 files changed, 6 insertions, 5 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 44c870bed..d1a5693b6 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.31"
+#define NGINX_VER "nginx/0.1.32"
#define NGINX_VAR "NGINX"
#define NGX_NEWPID_EXT ".newbin"
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index 1ae7829fa..e7bdc410d 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -419,7 +419,7 @@ ngx_inet_parse_host_port(ngx_inet_upstream_t *u)
u->host.data = url->data;
u->host_header = *url;
- for (/* void */; i < url->len; i++) {
+ for ( /* void */ ; i < url->len; i++) {
if (url->data[i] == ':') {
u->port_text.data = &url->data[i] + 1;
diff --git a/src/core/ngx_log.h b/src/core/ngx_log.h
index 5952b5243..df0d52517 100644
--- a/src/core/ngx_log.h
+++ b/src/core/ngx_log.h
@@ -130,6 +130,7 @@ void ngx_cdecl ngx_log_debug_core(ngx_log_t *log, ngx_err_t err,
#define ngx_log_debug7 ngx_log_debug
#define ngx_log_debug8 ngx_log_debug
+
#else /* NO VARIADIC MACROS */
#define ngx_log_debug0(level, log, err, fmt) \
diff --git a/src/core/ngx_string.h b/src/core/ngx_string.h
index 24a237903..c72a776dc 100644
--- a/src/core/ngx_string.h
+++ b/src/core/ngx_string.h
@@ -59,12 +59,12 @@ typedef struct {
* 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)
-#define ngx_memset(buf, c, n) memset(buf, c, n)
+#define ngx_memzero(buf, n) (void) memset(buf, 0, n)
+#define ngx_memset(buf, c, n) (void) memset(buf, c, n)
/* msvc and icc compile memcpy() to the inline "rep movs" */
-#define ngx_memcpy(dst, src, n) memcpy(dst, src, n)
+#define ngx_memcpy(dst, src, n) (void) memcpy(dst, src, n)
#define ngx_cpymem(dst, src, n) ((u_char *) memcpy(dst, src, n)) + (n)