diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-03-14 20:46:25 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-03-14 20:46:25 +0000 |
| commit | 3646a1669df23e2dcfb7cc8c940abeb822d8f010 (patch) | |
| tree | 3fa72a0986c1bbb70eb393a0073c117bb82dcd54 /src/core | |
| parent | 67f88e9cc678d31b5995518922d3fcb63a129465 (diff) | |
| download | nginx-3646a1669df23e2dcfb7cc8c940abeb822d8f010.tar.gz nginx-3646a1669df23e2dcfb7cc8c940abeb822d8f010.zip | |
nginx-0.0.2-2004-03-14-23:46:25 import
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ngx_connection.c | 4 | ||||
| -rw-r--r-- | src/core/ngx_string.h | 21 |
2 files changed, 14 insertions, 11 deletions
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index 54fd0f9f1..49eade155 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -252,7 +252,9 @@ ngx_int_t ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text) #if !(WIN32) || err == NGX_EPIPE #endif - || err == NGX_ENOTCONN) + || err == NGX_ENOTCONN + || err == NGX_ECONNREFUSED + || err == NGX_EHOSTUNREACH) { switch (c->log_error) { diff --git a/src/core/ngx_string.h b/src/core/ngx_string.h index fb3e35b17..158ad0fa6 100644 --- a/src/core/ngx_string.h +++ b/src/core/ngx_string.h @@ -20,11 +20,6 @@ typedef struct { #define ngx_strncasecmp strnicmp #define ngx_strcasecmp stricmp -#define ngx_strncmp strncmp -#define ngx_strcmp strcmp - -#define ngx_strstr strstr -#define ngx_strlen strlen #define ngx_snprintf _snprintf #define ngx_vsnprintf _vsnprintf @@ -33,20 +28,26 @@ typedef struct { #define ngx_strncasecmp strncasecmp #define ngx_strcasecmp strcasecmp -#define ngx_strncmp strncmp -#define ngx_strcmp strcmp - -#define ngx_strstr strstr -#define ngx_strlen strlen #define ngx_snprintf snprintf #define ngx_vsnprintf vsnprintf #endif + +#define ngx_strncmp strncmp + +/* msvc and icc compile strcmp() to inline loop */ +#define ngx_strcmp strcmp + +#define ngx_strstr strstr +#define ngx_strlen strlen + /* * msvc and icc compile memset() to inline "rep stos" * while ZeroMemory and bzero are calls. + * + * icc can also inline mov's of a zeroed register for small blocks. */ #define ngx_memzero(buf, n) memset(buf, 0, n) |