Author: mdounin
Date: 2012-07-02 16:51:02 +0000 (Mon, 02 Jul 2012)
New Revision: 4726
URL: http://trac.nginx.org/nginx/changeset/4726/nginx

Log:
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.


Added:
branches/stable-1.2/auto/endianness
Removed:
branches/stable-1.2/auto/endianess
Modified:
branches/stable-1.2/
branches/stable-1.2/auto/lib/google-perftools/conf
branches/stable-1.2/auto/unix
branches/stable-1.2/src/http/modules/ngx_http_geo_module.c
branches/stable-1.2/src/http/ngx_http_header_filter_module.c
branches/stable-1.2/src/os/unix/ngx_errno.c
branches/stable-1.2/src/os/unix/ngx_errno.h
branches/stable-1.2/src/os/win32/ngx_errno.c
branches/stable-1.2/src/os/win32/ngx_errno.h
branches/stable-1.2/src/os/win32/ngx_files.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2 2012-07-02 16:41:13 UTC (rev 4725)
+++ branches/stable-1.2 2012-07-02 16:51:02 UTC (rev 4726)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4684-4685,4692,4695-4696
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4685,4692,4694-4696,4699,4704-4705
\ No newline at end of property
Deleted: branches/stable-1.2/auto/endianess
===================================================================
--- branches/stable-1.2/auto/endianess 2012-07-02 16:41:13 UTC (rev 4725)
+++ branches/stable-1.2/auto/endianess 2012-07-02 16:51:02 UTC (rev 4726)
@@ -1,45 +0,0 @@
-
-# Copyright (C) Igor Sysoev
-# Copyright (C) Nginx, Inc.
-
-
-echo $ngx_n "checking for system endianess ...$ngx_c"
-echo >> $NGX_ERR
-echo "checking for system endianess" >> $NGX_ERR
-
-
-cat << END > $NGX_AUTOTEST.c
-
-int main() {
- int i = 0x11223344;
- char *p;
-
- p = (char *) &i;
- if (*p == 0x44) return 0;
- return 1;
-}
-
-END
-
-ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
- -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
-
-eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
-
-if [ -x $NGX_AUTOTEST ]; then
- if $NGX_AUTOTEST >/dev/null 2>&1; then
- echo " little endianess"
- have=NGX_HAVE_LITTLE_ENDIAN . auto/have
- else
- echo " big endianess"
- fi
-
- rm $NGX_AUTOTEST*
-
-else
- rm $NGX_AUTOTEST*
-
- echo
- echo "$0: error: can not detect system endianess"
- exit 1
-fi

Copied: branches/stable-1.2/auto/endianness (from rev 4682, trunk/auto/endianness)
===================================================================
--- branches/stable-1.2/auto/endianness (rev 0)
+++ branches/stable-1.2/auto/endianness 2012-07-02 16:51:02 UTC (rev 4726)
@@ -0,0 +1,45 @@
+
+# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
+
+
+echo $ngx_n "checking for system byte ordering ...$ngx_c"
+echo >> $NGX_ERR
+echo "checking for system byte ordering" >> $NGX_ERR
+
+
+cat << END > $NGX_AUTOTEST.c
+
+int main() {
+ int i = 0x11223344;
+ char *p;
+
+ p = (char *) &i;
+ if (*p == 0x44) return 0;
+ return 1;
+}
+
+END
+
+ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
+ -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
+
+eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
+
+if [ -x $NGX_AUTOTEST ]; then
+ if $NGX_AUTOTEST >/dev/null 2>&1; then
+ echo " little endian"
+ have=NGX_HAVE_LITTLE_ENDIAN . auto/have
+ else
+ echo " big endian"
+ fi
+
+ rm $NGX_AUTOTEST*
+
+else
+ rm $NGX_AUTOTEST*
+
+ echo
+ echo "$0: error: cannot detect system byte ordering"
+ exit 1
+fi

Modified: branches/stable-1.2/auto/lib/google-perftools/conf
===================================================================
--- branches/stable-1.2/auto/lib/google-perftools/conf 2012-07-02 16:41:13 UTC (rev 4725)
+++ branches/stable-1.2/auto/lib/google-perftools/conf 2012-07-02 16:51:02 UTC (rev 4726)
@@ -29,6 +29,22 @@
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"


Modified: branches/stable-1.2/auto/unix
===================================================================
--- branches/stable-1.2/auto/unix 2012-07-02 16:41:13 UTC (rev 4725)
+++ branches/stable-1.2/auto/unix 2012-07-02 16:51:02 UTC (rev 4726)
@@ -464,7 +464,7 @@

. 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

Modified: branches/stable-1.2/src/http/modules/ngx_http_geo_module.c
===================================================================
--- branches/stable-1.2/src/http/modules/ngx_http_geo_module.c 2012-07-02 16:41:13 UTC (rev 4725)
+++ branches/stable-1.2/src/http/modules/ngx_http_geo_module.c 2012-07-02 16:51:02 UTC (rev 4726)
@@ -145,7 +145,7 @@
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;


Modified: branches/stable-1.2/src/http/ngx_http_header_filter_module.c
===================================================================
--- branches/stable-1.2/src/http/ngx_http_header_filter_module.c 2012-07-02 16:41:13 UTC (rev 4725)
+++ branches/stable-1.2/src/http/ngx_http_header_filter_module.c 2012-07-02 16:51:02 UTC (rev 4726)
@@ -395,7 +395,7 @@
}

} else {
- len += sizeof("Connection: closed" CRLF) - 1;
+ len += sizeof("Connection: close" CRLF) - 1;
}

#if (NGX_HTTP_GZIP)

Modified: branches/stable-1.2/src/os/unix/ngx_errno.c
===================================================================
--- branches/stable-1.2/src/os/unix/ngx_errno.c 2012-07-02 16:41:13 UTC (rev 4725)
+++ branches/stable-1.2/src/os/unix/ngx_errno.c 2012-07-02 16:51:02 UTC (rev 4726)
@@ -42,7 +42,7 @@
}


-ngx_uint_t
+ngx_int_t
ngx_strerror_init(void)
{
char *msg;

Modified: branches/stable-1.2/src/os/unix/ngx_errno.h
===================================================================
--- branches/stable-1.2/src/os/unix/ngx_errno.h 2012-07-02 16:41:13 UTC (rev 4725)
+++ branches/stable-1.2/src/os/unix/ngx_errno.h 2012-07-02 16:51:02 UTC (rev 4726)
@@ -69,7 +69,7 @@


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_ */

Modified: branches/stable-1.2/src/os/win32/ngx_errno.c
===================================================================
--- branches/stable-1.2/src/os/win32/ngx_errno.c 2012-07-02 16:41:13 UTC (rev 4725)
+++ branches/stable-1.2/src/os/win32/ngx_errno.c 2012-07-02 16:51:02 UTC (rev 4726)
@@ -53,7 +53,7 @@
}


-ngx_uint_t
+ngx_int_t
ngx_strerror_init(void)
{
return NGX_OK;

Modified: branches/stable-1.2/src/os/win32/ngx_errno.h
===================================================================
--- branches/stable-1.2/src/os/win32/ngx_errno.h 2012-07-02 16:41:13 UTC (rev 4725)
+++ branches/stable-1.2/src/os/win32/ngx_errno.h 2012-07-02 16:51:02 UTC (rev 4726)
@@ -59,7 +59,7 @@


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_ */

Modified: branches/stable-1.2/src/os/win32/ngx_files.c
===================================================================
--- branches/stable-1.2/src/os/win32/ngx_files.c 2012-07-02 16:41:13 UTC (rev 4725)
+++ branches/stable-1.2/src/os/win32/ngx_files.c 2012-07-02 16:51:02 UTC (rev 4726)
@@ -722,7 +722,7 @@
if (ch == ':') {
goto invalid;
}
-
+
if (ch == '.' || ch == ' ') {
break;
}

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel