Merge of r4682, r4694, r4699, r4704, r4705: minor nits.

*) Fixed spelling of "endianness", and called it "byte ordering" in the
   user visible part.

*) Fixed return type of ngx_strerror_init().

*) Fixed a harmless error in spelling of "Connection: close" when computing
   the response header length.

*) Style.

*) Added code to look up Google perftools in /opt/local/, for MacPorts.

diff --git a/auto/endianess b/auto/endianness
similarity index 72%
rename from auto/endianess
rename to auto/endianness
index 452dd7c1268519be34801fb91f1de831a2fbf141..87311a0f16e2bf08ec0b15f2130e27946d37d34d 100644 (file)
--- a/auto/endianess
+++ b/auto/endianness
@@ -3,9 +3,9 @@
 # Copyright (C) Nginx, Inc.
 
 
-echo $ngx_n "checking for system endianess ...$ngx_c"
+echo $ngx_n "checking for system byte ordering ...$ngx_c"
 echo >> $NGX_ERR
-echo "checking for system endianess" >> $NGX_ERR
+echo "checking for system byte ordering" >> $NGX_ERR
 
 
 cat << END > $NGX_AUTOTEST.c
@@ -28,10 +28,10 @@ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
 
 if [ -x $NGX_AUTOTEST ]; then
     if $NGX_AUTOTEST >/dev/null 2>&1; then
-        echo " little endianess"
+        echo " little endian"
         have=NGX_HAVE_LITTLE_ENDIAN . auto/have
     else
-        echo " big endianess"
+        echo " big endian"
     fi
 
     rm $NGX_AUTOTEST*
@@ -40,6 +40,6 @@ else
     rm $NGX_AUTOTEST*
 
     echo
-    echo "$0: error: can not detect system endianess"
+    echo "$0: error: cannot detect system byte ordering"
     exit 1
 fi

diff --git a/auto/lib/google-perftools/conf b/auto/lib/google-perftools/conf
index 398ddd05e02e78b26d56e4c68fe2ca1db5c0441a..7a9de30020bdcfc3fac7fefa9ad1074ce20f06c7 100644 (file)
--- a/auto/lib/google-perftools/conf
+++ b/auto/lib/google-perftools/conf
@@ -29,6 +29,22 @@ if [ $ngx_found = no ]; then
 fi
 
 
+if [ $ngx_found = no ]; then
+
+    # MacPorts
+
+    ngx_feature="Google perftools in /opt/local/"
+
+    if [ $NGX_RPATH = YES ]; then
+        ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lprofiler"
+    else
+        ngx_feature_libs="-L/opt/local/lib -lprofiler"
+    fi
+
+    . auto/feature
+fi
+
+
 if [ $ngx_found = yes ]; then
     CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
 

diff --git a/auto/unix b/auto/unix
index 783219e2db7231bf8d8026afe83f2792f3f5fc5f..b0a0e4c88956dbe8384d49da235f50ff977c68b2 100755 (executable)
--- a/auto/unix
+++ b/auto/unix
@@ -464,7 +464,7 @@ ngx_type="rlim_t"; ngx_types="int"; . auto/types/typedef
 
 . auto/types/uintptr_t
 
-. auto/endianess
+. auto/endianness
 
 ngx_type="size_t"; . auto/types/sizeof
 ngx_param=NGX_MAX_SIZE_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value

diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c
index e792cdb66554ebf454bc639a50035da870678f25..189d8ed508fb726c69a85231c42597e4c72cf500 100644 (file)
--- a/src/http/modules/ngx_http_geo_module.c
+++ b/src/http/modules/ngx_http_geo_module.c
@@ -145,7 +145,7 @@ typedef struct {
     u_char    GEORNG[6];
     u_char    version;
     u_char    ptr_size;
-    uint32_t  endianess;
+    uint32_t  endianness;
     uint32_t  crc32;
 } ngx_http_geo_header_t;
 

diff --git a/src/http/ngx_http_header_filter_module.c b/src/http/ngx_http_header_filter_module.c
index 19f531b5db1d30ef16e3cb75cc7a3705c3b76d05..1e01c857dc1df2b8fbce3e5c2597c57d03ba9a9c 100644 (file)
--- a/src/http/ngx_http_header_filter_module.c
+++ b/src/http/ngx_http_header_filter_module.c
@@ -395,7 +395,7 @@ ngx_http_header_filter(ngx_http_request_t *r)
         }
 
     } else {
-        len += sizeof("Connection: closed" CRLF) - 1;
+        len += sizeof("Connection: close" CRLF) - 1;
     }
 
 #if (NGX_HTTP_GZIP)

diff --git a/src/os/unix/ngx_errno.c b/src/os/unix/ngx_errno.c
index 75176c49a4734dd33c7ad8380a51ee48864dc454..e787b2377edfe89ba5dbae819b4749697c57b5c5 100644 (file)
--- a/src/os/unix/ngx_errno.c
+++ b/src/os/unix/ngx_errno.c
@@ -42,7 +42,7 @@ ngx_strerror(ngx_err_t err, u_char *errstr, size_t size)
 }
 
 
-ngx_uint_t
+ngx_int_t
 ngx_strerror_init(void)
 {
     char       *msg;

diff --git a/src/os/unix/ngx_errno.h b/src/os/unix/ngx_errno.h
index 2912dea0441f2292561997f2fb0c281440460bec..125087e781d7c12e700477f499bbf7c5b35dac08 100644 (file)
--- a/src/os/unix/ngx_errno.h
+++ b/src/os/unix/ngx_errno.h
@@ -69,7 +69,7 @@ typedef int               ngx_err_t;
 
 
 u_char *ngx_strerror(ngx_err_t err, u_char *errstr, size_t size);
-ngx_uint_t ngx_strerror_init(void);
+ngx_int_t ngx_strerror_init(void);
 
 
 #endif /* _NGX_ERRNO_H_INCLUDED_ */

diff --git a/src/os/win32/ngx_errno.c b/src/os/win32/ngx_errno.c
index f6d947a754fb5e4a02f6d8b59f89f41f749ba338..b732bf4b19dd2d585f4b645fb0782384ebb78c82 100644 (file)
--- a/src/os/win32/ngx_errno.c
+++ b/src/os/win32/ngx_errno.c
@@ -53,7 +53,7 @@ ngx_strerror(ngx_err_t err, u_char *errstr, size_t size)
 }
 
 
-ngx_uint_t
+ngx_int_t
 ngx_strerror_init(void)
 {
     return NGX_OK;

diff --git a/src/os/win32/ngx_errno.h b/src/os/win32/ngx_errno.h
index 5b11a65b0f568b25a45750298072399a54156ed7..090ba1b530efe38806fba59ba074751fe509af3a 100644 (file)
--- a/src/os/win32/ngx_errno.h
+++ b/src/os/win32/ngx_errno.h
@@ -59,7 +59,7 @@ typedef DWORD                      ngx_err_t;
 
 
 u_char *ngx_strerror(ngx_err_t err, u_char *errstr, size_t size);
-ngx_uint_t ngx_strerror_init(void);
+ngx_int_t ngx_strerror_init(void);
 
 
 #endif /* _NGX_ERRNO_H_INCLUDED_ */

diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index 11d9c35acdae81483f9049d6e37cfffcc1fda6ea..ee846cdf3d2f0ce6b90f8a3f568f8af26a6be422 100644 (file)
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -722,7 +722,7 @@ ngx_win32_check_filename(u_char *name, u_short *u, size_t len)
             if (ch == ':') {
                 goto invalid;
             }
-       
+
             if (ch == '.' || ch == ' ') {
                 break;
             }