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.
This commit is contained in:
parent
ac21ef1276
commit
38f17f5d60
|
@ -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
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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_ */
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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_ */
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue