Changes - j0ke.net Open Build Service

Changes of Revision 34

[-] [+]	Changed	_service
@@ -2,6 +2,6 @@ <service name="download_url"> <param name="host">nginx.org</param> <param name="protocol">http</param> - <param name="path">/download/nginx-1.13.7.tar.gz</param> + <param name="path">/download/nginx-1.13.5.tar.gz</param> </service> -<service name="download_url"><param name="host">nginx.org</param><param name="protocol">http</param><param name="path">/download/nginx-1.13.7.tar.gz</param></service><service name="download_url"><param name="host">www.openssl.org</param><param name="protocol">https</param><param name="path">/source/openssl-1.1.0f.tar.gz</param></service></services> \ No newline at end of file +<service name="download_url"><param name="host">nginx.org</param><param name="protocol">http</param><param name="path">/download/nginx-1.13.5.tar.gz</param></service><service name="download_url"><param name="host">www.openssl.org</param><param name="protocol">https</param><param name="path">/source/openssl-1.1.0f.tar.gz</param></service></services> \ No newline at end of file
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/CHANGES ^
@@ -1,64 +1,4 @@ -Changes with nginx 1.13.7 21 Nov 2017 - - ) Bugfix: in the $upstream_status variable. - - ) Bugfix: a segmentation fault might occur in a worker process if a - backend returned a "101 Switching Protocols" response to a - subrequest. - - ) Bugfix: a segmentation fault occurred in a master process if a shared - memory zone size was changed during a reconfiguration and the - reconfiguration failed. - - ) Bugfix: in the ngx_http_fastcgi_module. - - ) Bugfix: nginx returned the 500 error if parameters without variables - were specified in the "xslt_stylesheet" directive. - - ) Workaround: "gzip filter failed to use preallocated memory" alerts - appeared in logs when using a zlib library variant from Intel. - - ) Bugfix: the "worker_shutdown_timeout" directive did not work when - using mail proxy and when proxying WebSocket connections. - - -Changes with nginx 1.13.6 10 Oct 2017 - - ) Bugfix: switching to the next upstream server in the stream module - did not work when using the "ssl_preread" directive. - - ) Bugfix: in the ngx_http_v2_module. - Thanks to Piotr Sikora. - - ) Bugfix: nginx did not support dates after the year 2038 on 32-bit - platforms with 64-bit time_t. - - ) Bugfix: in handling of dates prior to the year 1970 and after the - year 10000. - - ) Bugfix: in the stream module timeouts waiting for UDP datagrams from - upstream servers were not logged or logged at the "info" level - instead of "error". - - ) Bugfix: when using HTTP/2 nginx might return the 400 response without - logging the reason. - - ) Bugfix: in processing of corrupted cache files. - - ) Bugfix: cache control headers were ignored when caching errors - intercepted by error_page. - - ) Bugfix: when using HTTP/2 client request body might be corrupted. - - ) Bugfix: in handling of client addresses when using unix domain - sockets. - - ) Bugfix: nginx hogged CPU when using the "hash ... consistent" - directive in the upstream block if large weights were used and all or - most of the servers were unavailable. - - Changes with nginx 1.13.5 05 Sep 2017 *) Feature: the $ssl_client_escaped_cert variable.
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/CHANGES.ru ^
@@ -1,64 +1,4 @@ -Изменения в nginx 1.13.7 21.11.2017 - - ) Исправление: в переменной $upstream_status. - - ) Исправление: в рабочем процессе мог произойти segmentation fault, - если бэкенд возвращал ответ "101 Switching Protocols" на подзапрос. - - ) Исправление: если при переконфигурации изменялся размер зоны - разделяемой памяти и переконфигурация завершалась неудачно, то в - главном процессе происходил segmentation fault. - - ) Исправление: в модуле ngx_http_fastcgi_module. - - ) Исправление: nginx возвращал ошибку 500, если в директиве - xslt_stylesheet были заданы параметры без использования переменных. - - ) Изменение: при использовании варианта библиотеки zlib от Intel в лог - писались сообщения "gzip filter failed to use preallocated memory". - - ) Исправление: директива worker_shutdown_timeout не работала при - использовании почтового прокси-сервера и при проксировании - WebSocket-соединений. - - -Изменения в nginx 1.13.6 10.10.2017 - - ) Исправление: при использовании директивы ssl_preread в модуле stream - не работало переключение на следующий бэкенд. - - ) Исправление: в модуле ngx_http_v2_module. - Спасибо Piotr Sikora. - - ) Исправление: nginx не поддерживал даты после 2038 года на 32-битных - платформах с 64-битным time_t. - - ) Исправление: в обработке дат до 1970 года и после 10000 года. - - ) Исправление: в модуле stream таймауты ожидания UDP-пакетов от - бэкендов не логгировались или логгировались на уровне info вместо - error. - - ) Исправление: при использовании HTTP/2 nginx мог вернуть ошибку 400, - не указав в логе причину. - - ) Исправление: в обработке повреждённых файлов кэша. - - ) Исправление: при кэшировании ошибок, перехваченных error_page, не - учитывались заголовки управления кэшированием. - - ) Исправление: при использовании HTTP/2 тело запроса могло быть - повреждено. - - ) Исправление: в обработке адресов клиентов при использовании unix - domain сокетов. - - ) Исправление: при использовании директивы "hash ... consistent" в - блоке upstream nginx нагружал процессор, если использовались большие - веса и все или почти все бэкенды были недоступны. - - Изменения в nginx 1.13.5 05.09.2017 *) Добавление: переменная $ssl_client_escaped_cert.
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/conf/mime.types ^
@@ -1,95 +1,89 @@ types { - text/html html htm shtml; - text/css css; - text/xml xml; - image/gif gif; - image/jpeg jpeg jpg; - application/javascript js; - application/atom+xml atom; - application/rss+xml rss; - - text/mathml mml; - text/plain txt; - text/vnd.sun.j2me.app-descriptor jad; - text/vnd.wap.wml wml; - text/x-component htc; - - image/png png; - image/svg+xml svg svgz; - image/tiff tif tiff; - image/vnd.wap.wbmp wbmp; - image/webp webp; - image/x-icon ico; - image/x-jng jng; - image/x-ms-bmp bmp; - - application/font-woff woff; - application/java-archive jar war ear; - application/json json; - application/mac-binhex40 hqx; - application/msword doc; - application/pdf pdf; - application/postscript ps eps ai; - application/rtf rtf; - application/vnd.apple.mpegurl m3u8; - application/vnd.google-earth.kml+xml kml; - application/vnd.google-earth.kmz kmz; - application/vnd.ms-excel xls; - application/vnd.ms-fontobject eot; - application/vnd.ms-powerpoint ppt; - application/vnd.oasis.opendocument.graphics odg; - application/vnd.oasis.opendocument.presentation odp; - application/vnd.oasis.opendocument.spreadsheet ods; - application/vnd.oasis.opendocument.text odt; - application/vnd.openxmlformats-officedocument.presentationml.presentation - pptx; - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet - xlsx; - application/vnd.openxmlformats-officedocument.wordprocessingml.document - docx; - application/vnd.wap.wmlc wmlc; - application/x-7z-compressed 7z; - application/x-cocoa cco; - application/x-java-archive-diff jardiff; - application/x-java-jnlp-file jnlp; - application/x-makeself run; - application/x-perl pl pm; - application/x-pilot prc pdb; - application/x-rar-compressed rar; - application/x-redhat-package-manager rpm; - application/x-sea sea; - application/x-shockwave-flash swf; - application/x-stuffit sit; - application/x-tcl tcl tk; - application/x-x509-ca-cert der pem crt; - application/x-xpinstall xpi; - application/xhtml+xml xhtml; - application/xspf+xml xspf; - application/zip zip; - - application/octet-stream bin exe dll; - application/octet-stream deb; - application/octet-stream dmg; - application/octet-stream iso img; - application/octet-stream msi msp msm; - - audio/midi mid midi kar; - audio/mpeg mp3; - audio/ogg ogg; - audio/x-m4a m4a; - audio/x-realaudio ra; - - video/3gpp 3gpp 3gp; - video/mp2t ts; - video/mp4 mp4; - video/mpeg mpeg mpg; - video/quicktime mov; - video/webm webm; - video/x-flv flv; - video/x-m4v m4v; - video/x-mng mng; - video/x-ms-asf asx asf; - video/x-ms-wmv wmv; - video/x-msvideo avi; + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/png png; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + image/svg+xml svg svgz; + image/webp webp; + + application/font-woff woff; + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.wap.wmlc wmlc; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + application/vnd.openxmlformats-officedocument.wordprocessingml.document docx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx; + application/vnd.openxmlformats-officedocument.presentationml.presentation pptx; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; }
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/core/nginx.h ^
@@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1013007 -#define NGINX_VERSION "1.13.7" +#define nginx_version 1013005 +#define NGINX_VERSION "1.13.5" #define NGINX_VER "nginx/" NGINX_VERSION #ifdef NGX_BUILD
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/core/ngx_conf_file.h ^
@@ -128,7 +128,7 @@ ngx_uint_t cmd_type; ngx_conf_handler_pt handler; - void handler_conf; + char handler_conf; };
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/core/ngx_connection.c ^
@@ -165,10 +165,6 @@ continue; } - if (ls[i].socklen > (socklen_t) sizeof(ngx_sockaddr_t)) { - ls[i].socklen = sizeof(ngx_sockaddr_t); - } - switch (ls[i].sockaddr->sa_family) { #if (NGX_HAVE_INET6)
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/core/ngx_cycle.c ^
@@ -470,6 +470,8 @@ goto shm_zone_found; } + ngx_shm_free(&oshm_zone[n].shm); + break; } @@ -660,26 +662,14 @@ n = 0; } - if (oshm_zone[i].shm.name.len != shm_zone[n].shm.name.len) { - continue; - } - - if (ngx_strncmp(oshm_zone[i].shm.name.data, - shm_zone[n].shm.name.data, - oshm_zone[i].shm.name.len) - != 0) - { - continue; - } - - if (oshm_zone[i].tag == shm_zone[n].tag - && oshm_zone[i].shm.size == shm_zone[n].shm.size - && !oshm_zone[i].noreuse) + if (oshm_zone[i].shm.name.len == shm_zone[n].shm.name.len + && ngx_strncmp(oshm_zone[i].shm.name.data, + shm_zone[n].shm.name.data, + oshm_zone[i].shm.name.len) + == 0) { goto live_shm_zone; } - - break; } ngx_shm_free(&oshm_zone[i].shm);
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/core/ngx_inet.c ^
@@ -182,11 +182,9 @@ ngx_uint_t port) { u_char p; -#if (NGX_HAVE_INET6 \|\| NGX_HAVE_UNIX_DOMAIN) - size_t n; -#endif struct sockaddr_in sin; #if (NGX_HAVE_INET6) + size_t n; struct sockaddr_in6 sin6; #endif #if (NGX_HAVE_UNIX_DOMAIN) @@ -243,9 +241,7 @@ p = ngx_snprintf(text, len, "unix:%Z"); } else { - n = ngx_strnlen((u_char ) saun->sun_path, - socklen - offsetof(struct sockaddr_un, sun_path)); - p = ngx_snprintf(text, len, "unix:%s%Z", n, saun->sun_path); + p = ngx_snprintf(text, len, "unix:%s%Z", saun->sun_path); } / we do not include trailing zero in address length */
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/core/ngx_inet.h ^
@@ -17,11 +17,10 @@ #define NGX_INET6_ADDRSTRLEN \ (sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255") - 1) #define NGX_UNIX_ADDRSTRLEN \ - (sizeof("unix:") - 1 + \ - sizeof(struct sockaddr_un) - offsetof(struct sockaddr_un, sun_path)) + (sizeof(struct sockaddr_un) - offsetof(struct sockaddr_un, sun_path)) #if (NGX_HAVE_UNIX_DOMAIN) -#define NGX_SOCKADDR_STRLEN NGX_UNIX_ADDRSTRLEN +#define NGX_SOCKADDR_STRLEN (sizeof("unix:") - 1 + NGX_UNIX_ADDRSTRLEN) #elif (NGX_HAVE_INET6) #define NGX_SOCKADDR_STRLEN (NGX_INET6_ADDRSTRLEN + sizeof("[]:65535") - 1) #else
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/core/ngx_parse_time.c ^
@@ -44,15 +44,14 @@ } } - for (p++; p < end; p++) { + for (p++; p < end; p++) if (p != ' ') { break; } - } if (end - p < 18) { return NGX_ERROR; - } + } if (fmt != isoc) { if (p < '0' \|\| p > '9' \|\| (p + 1) < '0' \|\| *(p + 1) > '9') {
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/core/ngx_string.c ^
@@ -29,22 +29,6 @@ } -size_t -ngx_strnlen(u_char p, size_t n) -{ - size_t i; - - for (i = 0; i < n; i++) { - - if (p[i] == '\0') { - return i; - } - } - - return n; -} - - u_char ngx_cpystrn(u_char dst, u_char src, size_t n) {
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/core/ngx_string.h ^
@@ -60,8 +60,6 @@ #define ngx_strstr(s1, s2) strstr((const char ) s1, (const char ) s2) #define ngx_strlen(s) strlen((const char ) s) -size_t ngx_strnlen(u_char p, size_t n); - #define ngx_strchr(s1, c) strchr((const char ) s1, (int) c) static ngx_inline u_char
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/core/ngx_times.c ^
@@ -300,39 +300,27 @@ ngx_gmtime(time_t t, ngx_tm_t tp) { ngx_int_t yday; - ngx_uint_t sec, min, hour, mday, mon, year, wday, days, leap; + ngx_uint_t n, sec, min, hour, mday, mon, year, wday, days, leap; / the calculation is valid for positive time_t only / - if (t < 0) { - t = 0; - } + n = (ngx_uint_t) t; - days = t / 86400; - sec = t % 86400; - - / - * no more than 4 year digits supported, - * truncate to December 31, 9999, 23:59:59 - / - - if (days > 2932896) { - days = 2932896; - sec = 86399; - } + days = n / 86400; / January 1, 1970 was Thursday / wday = (4 + days) % 7; - hour = sec / 3600; - sec %= 3600; - min = sec / 60; - sec %= 60; + n %= 86400; + hour = n / 3600; + n %= 3600; + min = n / 60; + sec = n % 60; / * the algorithm based on Gauss' formula, - * see src/core/ngx_parse_time.c + * see src/http/ngx_http_parse_time.c / / days since March 1, 1 BC */
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/event/ngx_event_accept.c ^
@@ -164,10 +164,6 @@ return; } - if (socklen > (socklen_t) sizeof(ngx_sockaddr_t)) { - socklen = sizeof(ngx_sockaddr_t); - } - c->sockaddr = ngx_palloc(c->pool, socklen); if (c->sockaddr == NULL) { ngx_close_accepted_connection(c); @@ -444,10 +440,6 @@ c->type = SOCK_DGRAM; c->socklen = msg.msg_namelen; - if (c->socklen > (socklen_t) sizeof(ngx_sockaddr_t)) { - c->socklen = sizeof(ngx_sockaddr_t); - } - #if (NGX_STAT_STUB) (void) ngx_atomic_fetch_add(ngx_stat_active, 1); #endif
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/event/ngx_event_openssl.h ^
@@ -22,7 +22,6 @@ #include <openssl/engine.h> #endif #include <openssl/evp.h> -#include <openssl/hmac.h> #ifndef OPENSSL_NO_OCSP #include <openssl/ocsp.h> #endif
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/http/modules/ngx_http_auth_basic_module.c ^
@@ -15,6 +15,11 @@ typedef struct { + ngx_str_t passwd; +} ngx_http_auth_basic_ctx_t; + + +typedef struct { ngx_http_complex_value_t realm; ngx_http_complex_value_t user_file; } ngx_http_auth_basic_loc_conf_t; @@ -22,7 +27,7 @@ static ngx_int_t ngx_http_auth_basic_handler(ngx_http_request_t r); static ngx_int_t ngx_http_auth_basic_crypt_handler(ngx_http_request_t r, - ngx_str_t passwd, ngx_str_t realm); + ngx_http_auth_basic_ctx_t ctx, ngx_str_t passwd, ngx_str_t realm); static ngx_int_t ngx_http_auth_basic_set_realm(ngx_http_request_t r, ngx_str_t realm); static void ngx_http_auth_basic_close(ngx_file_t file); @@ -98,6 +103,7 @@ ngx_str_t pwd, realm, user_file; ngx_uint_t i, level, login, left, passwd; ngx_file_t file; + ngx_http_auth_basic_ctx_t ctx; ngx_http_auth_basic_loc_conf_t alcf; u_char buf[NGX_HTTP_AUTH_BUF_SIZE]; enum { @@ -120,6 +126,13 @@ return NGX_DECLINED; } + ctx = ngx_http_get_module_ctx(r, ngx_http_auth_basic_module); + + if (ctx) { + return ngx_http_auth_basic_crypt_handler(r, ctx, &ctx->passwd, + &realm); + } + rc = ngx_http_auth_basic_user(r); if (rc == NGX_DECLINED) { @@ -224,7 +237,8 @@ pwd.len = i - passwd; pwd.data = &buf[passwd]; - return ngx_http_auth_basic_crypt_handler(r, &pwd, &realm); + return ngx_http_auth_basic_crypt_handler(r, NULL, &pwd, + &realm); } break; @@ -262,7 +276,7 @@ ngx_cpystrn(pwd.data, &buf[passwd], pwd.len + 1); - return ngx_http_auth_basic_crypt_handler(r, &pwd, &realm); + return ngx_http_auth_basic_crypt_handler(r, NULL, &pwd, &realm); } ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, @@ -274,8 +288,8 @@ static ngx_int_t -ngx_http_auth_basic_crypt_handler(ngx_http_request_t r, ngx_str_t passwd, - ngx_str_t realm) +ngx_http_auth_basic_crypt_handler(ngx_http_request_t r, + ngx_http_auth_basic_ctx_t ctx, ngx_str_t passwd, ngx_str_t realm) { ngx_int_t rc; u_char encrypted; @@ -287,22 +301,48 @@ "rc: %i user: \"%V\" salt: \"%s\"", rc, &r->headers_in.user, passwd->data); - if (rc != NGX_OK) { - return NGX_HTTP_INTERNAL_SERVER_ERROR; + if (rc == NGX_OK) { + if (ngx_strcmp(encrypted, passwd->data) == 0) { + return NGX_OK; + } + + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "encrypted: \"%s\"", encrypted); + + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "user \"%V\": password mismatch", + &r->headers_in.user); + + return ngx_http_auth_basic_set_realm(r, realm); } - if (ngx_strcmp(encrypted, passwd->data) == 0) { - return NGX_OK; + if (rc == NGX_ERROR) { + return NGX_HTTP_INTERNAL_SERVER_ERROR; } - ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "encrypted: \"%s\"", encrypted); + / rc == NGX_AGAIN / - ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, - "user \"%V\": password mismatch", - &r->headers_in.user); + if (ctx == NULL) { + ctx = ngx_palloc(r->pool, sizeof(ngx_http_auth_basic_ctx_t)); + if (ctx == NULL) { + return NGX_HTTP_INTERNAL_SERVER_ERROR; + } + + ngx_http_set_ctx(r, ctx, ngx_http_auth_basic_module); + + ctx->passwd.len = passwd->len; + passwd->len++; + + ctx->passwd.data = ngx_pstrdup(r->pool, passwd); + if (ctx->passwd.data == NULL) { + return NGX_HTTP_INTERNAL_SERVER_ERROR; + } + + } + + / TODO: add mutex event */ - return ngx_http_auth_basic_set_realm(r, realm); + return rc; }
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/http/modules/ngx_http_fastcgi_module.c ^
@@ -2646,7 +2646,6 @@ } } - f->pos = p; f->state = state; return NGX_AGAIN;
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/http/modules/ngx_http_gzip_filter_module.c ^
@@ -57,7 +57,6 @@ unsigned nomem:1; unsigned gzheader:1; unsigned buffering:1; - unsigned intel:1; size_t zin; size_t zout; @@ -234,8 +233,6 @@ static ngx_http_output_header_filter_pt ngx_http_next_header_filter; static ngx_http_output_body_filter_pt ngx_http_next_body_filter; -static ngx_uint_t ngx_http_gzip_assume_intel; - static ngx_int_t ngx_http_gzip_header_filter(ngx_http_request_t r) @@ -530,27 +527,7 @@ ) 5920 bytes on amd64 and sparc64 / - if (!ngx_http_gzip_assume_intel) { - ctx->allocated = 8192 + (1 << (wbits + 2)) + (1 << (memlevel + 9)); - - } else { - /* - * A zlib variant from Intel, https://github.com/jtkukunas/zlib. - * It can force window bits to 13 for fast compression level, - * on processors with SSE 4.2 it uses 64K hash instead of scaling - * it from the specified memory level, and also introduces - * 16-byte padding in one out of the two window-sized buffers. - / - - if (conf->level == 1) { - wbits = ngx_max(wbits, 13); - } - - ctx->allocated = 8192 + 16 + (1 << (wbits + 2)) - + (1 << (ngx_max(memlevel, 8) + 8)) - + (1 << (memlevel + 8)); - ctx->intel = 1; - } + ctx->allocated = 8192 + (1 << (wbits + 2)) + (1 << (memlevel + 9)); } @@ -1026,7 +1003,7 @@ alloc = items size; - if (items == 1 && alloc % 512 != 0 && alloc < 8192) { + if (alloc % 512 != 0 && alloc < 8192) { /* * The zlib deflate_state allocation, it takes about 6K, @@ -1048,14 +1025,9 @@ return p; } - if (ctx->intel) { - ngx_log_error(NGX_LOG_ALERT, ctx->request->connection->log, 0, - "gzip filter failed to use preallocated memory: " - "%ud of %ui", items * size, ctx->allocated); - - } else { - ngx_http_gzip_assume_intel = 1; - } + ngx_log_error(NGX_LOG_ALERT, ctx->request->connection->log, 0, + "gzip filter failed to use preallocated memory: %ud of %ui", + items * size, ctx->allocated); p = ngx_palloc(ctx->request->pool, items * size);
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/http/modules/ngx_http_ssi_filter_module.c ^
@@ -1630,7 +1630,8 @@ u_char ch, p, value, data, part_data; size_t size, len, prefix, part_len; ngx_str_t var, val; - ngx_uint_t i, n, bracket, quoted, key; + ngx_int_t key; + ngx_uint_t i, n, bracket, quoted; ngx_array_t lengths, values; ngx_http_variable_value_t vv; @@ -1882,8 +1883,9 @@ int rc, captures; u_char p, errstr[NGX_MAX_CONF_ERRSTR]; size_t size; + ngx_int_t key; ngx_str_t vv, name, value; - ngx_uint_t i, n, key; + ngx_uint_t i, n; ngx_http_ssi_ctx_t ctx; ngx_http_ssi_var_t var; ngx_regex_compile_t rgc; @@ -1986,10 +1988,10 @@ ngx_http_ssi_include(ngx_http_request_t r, ngx_http_ssi_ctx_t ctx, ngx_str_t params) { - ngx_int_t rc; + ngx_int_t rc, key; ngx_str_t uri, file, wait, set, stub, args; ngx_buf_t b; - ngx_uint_t flags, i, key; + ngx_uint_t flags, i; ngx_chain_t cl, tl, ll, out; ngx_http_request_t sr; ngx_http_ssi_var_t var; @@ -2246,9 +2248,9 @@ { u_char p; uintptr_t len; + ngx_int_t key; ngx_buf_t b; ngx_str_t var, value, enc, text; - ngx_uint_t key; ngx_chain_t cl; ngx_http_variable_value_t vv; @@ -2408,9 +2410,8 @@ ngx_http_ssi_set(ngx_http_request_t r, ngx_http_ssi_ctx_t ctx, ngx_str_t params) { - ngx_int_t rc; + ngx_int_t key, rc; ngx_str_t name, value, vv; - ngx_uint_t key; ngx_http_ssi_var_t var; ngx_http_ssi_ctx_t mctx;
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/http/modules/ngx_http_upstream_hash_module.c ^
@@ -503,11 +503,6 @@ ngx_http_upstream_rr_peers_wlock(hp->rrp.peers); - if (hp->tries > 20 \|\| hp->rrp.peers->single) { - ngx_http_upstream_rr_peers_unlock(hp->rrp.peers); - return hp->get_rr_peer(pc, &hp->rrp); - } - pc->cached = 0; pc->connection = NULL; @@ -543,6 +538,13 @@ continue; } + if (peer->server.len != server->len + \|\| ngx_strncmp(peer->server.data, server->data, server->len) + != 0) + { + continue; + } + if (peer->max_fails && peer->fails >= peer->max_fails && now - peer->checked <= peer->fail_timeout) @@ -554,13 +556,6 @@ continue; } - if (peer->server.len != server->len - \|\| ngx_strncmp(peer->server.data, server->data, server->len) - != 0) - { - continue; - } - peer->current_weight += peer->effective_weight; total += peer->effective_weight; @@ -582,9 +577,10 @@ hp->hash++; hp->tries++; - if (hp->tries > 20) { + if (hp->tries >= points->number) { + pc->name = hp->rrp.peers->name; ngx_http_upstream_rr_peers_unlock(hp->rrp.peers); - return hp->get_rr_peer(pc, &hp->rrp); + return NGX_BUSY; } }
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/http/modules/ngx_http_upstream_zone_module.c ^
@@ -281,7 +281,7 @@ dst->server.data = NULL; } - dst->sockaddr = ngx_slab_calloc_locked(pool, sizeof(ngx_sockaddr_t)); + dst->sockaddr = ngx_slab_calloc_locked(pool, NGX_SOCKADDRLEN); if (dst->sockaddr == NULL) { goto failed; }
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/http/modules/ngx_http_xslt_filter_module.c ^
@@ -686,19 +686,8 @@ * specified in xslt_stylesheet directives / - if (param[i].value.lengths) { - p = string.data; - - } else { - p = ngx_pnalloc(r->pool, string.len + 1); - if (p == NULL) { - return NGX_ERROR; - } - - ngx_memcpy(p, string.data, string.len + 1); - } - - last = p + string.len; + p = string.data; + last = string.data + string.len; while (p && p) {
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/http/ngx_http_postpone_filter_module.c ^
@@ -63,10 +63,7 @@ if (r != c->data) { if (in) { - if (ngx_http_postpone_filter_add(r, in) != NGX_OK) { - return NGX_ERROR; - } - + ngx_http_postpone_filter_add(r, in); return NGX_OK; } @@ -89,9 +86,7 @@ } if (in) { - if (ngx_http_postpone_filter_add(r, in) != NGX_OK) { - return NGX_ERROR; - } + ngx_http_postpone_filter_add(r, in); } do {
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/http/ngx_http_request.c ^
@@ -2225,13 +2225,6 @@ ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, "http run request: \"%V?%V\"", &r->uri, &r->args); - if (c->close) { - r->main->count++; - ngx_http_terminate_request(r, 0); - ngx_http_run_posted_requests(c); - return; - } - if (ev->delayed && ev->timedout) { ev->delayed = 0; ev->timedout = 0;
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/http/ngx_http_upstream.c ^
@@ -582,9 +582,6 @@ if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) { rc = NGX_DECLINED; r->cached = 0; - u->buffer.start = NULL; - u->cache_status = NGX_HTTP_CACHE_MISS; - u->request_sent = 1; } if (ngx_http_upstream_cache_background_update(r, u) != NGX_OK) { @@ -1062,16 +1059,8 @@ return NGX_ERROR; } - if (rc == NGX_AGAIN) { - rc = NGX_HTTP_UPSTREAM_INVALID_HEADER; - } - /* rc == NGX_HTTP_UPSTREAM_INVALID_HEADER / - ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0, - "cache file \"%s\" contains invalid header", - c->file.name.data); - / TODO: delete file / return rc; @@ -2404,20 +2393,9 @@ rc = u->reinit_request(r); - if (rc != NGX_OK) { - ngx_http_upstream_finalize_request(r, u, rc); - return NGX_OK; - } - - u->cache_status = NGX_HTTP_CACHE_STALE; - rc = ngx_http_upstream_cache_send(r, u); - - if (rc == NGX_DONE) { - return NGX_OK; - } - - if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) { - rc = NGX_HTTP_INTERNAL_SERVER_ERROR; + if (rc == NGX_OK) { + u->cache_status = NGX_HTTP_CACHE_STALE; + rc = ngx_http_upstream_cache_send(r, u); } ngx_http_upstream_finalize_request(r, u, rc); @@ -2455,14 +2433,6 @@ u->cache_status = NGX_HTTP_CACHE_REVALIDATED; rc = ngx_http_upstream_cache_send(r, u); - if (rc == NGX_DONE) { - return NGX_OK; - } - - if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) { - rc = NGX_HTTP_INTERNAL_SERVER_ERROR; - } - if (valid == 0) { valid = r->cache->valid_sec; updating = r->cache->updating_sec; @@ -2548,23 +2518,13 @@ #if (NGX_HTTP_CACHE) if (r->cache) { + time_t valid; - if (u->cacheable) { - time_t valid; + valid = ngx_http_file_cache_valid(u->conf->cache_valid, status); - valid = r->cache->valid_sec; - - if (valid == 0) { - valid = ngx_http_file_cache_valid(u->conf->cache_valid, - status); - if (valid) { - r->cache->valid_sec = ngx_time() + valid; - } - } - - if (valid) { - r->cache->error = status; - } + if (valid) { + r->cache->valid_sec = ngx_time() + valid; + r->cache->error = status; } ngx_http_file_cache_free(r->cache, u->pipe->temp_file); @@ -3206,13 +3166,6 @@ / TODO: prevent upgrade if not requested or not possible */ - if (r != r->main) { - ngx_log_error(NGX_LOG_ERR, c->log, 0, - "connection upgrade in subrequest"); - ngx_http_upstream_finalize_request(r, u, NGX_ERROR); - return; - } - r->keepalive = 0; c->log->action = "proxying upgraded connection"; @@ -4118,7 +4071,6 @@ switch (ft_type) { case NGX_HTTP_UPSTREAM_FT_TIMEOUT: - case NGX_HTTP_UPSTREAM_FT_HTTP_504: status = NGX_HTTP_GATEWAY_TIME_OUT; break; @@ -4126,10 +4078,6 @@ status = NGX_HTTP_INTERNAL_SERVER_ERROR; break; - case NGX_HTTP_UPSTREAM_FT_HTTP_503: - status = NGX_HTTP_SERVICE_UNAVAILABLE; - break; - case NGX_HTTP_UPSTREAM_FT_HTTP_403: status = NGX_HTTP_FORBIDDEN; break; @@ -4181,20 +4129,9 @@ rc = u->reinit_request(r); - if (rc != NGX_OK) { - ngx_http_upstream_finalize_request(r, u, rc); - return; - } - - u->cache_status = NGX_HTTP_CACHE_STALE; - rc = ngx_http_upstream_cache_send(r, u); - - if (rc == NGX_DONE) { - return; - } - - if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) { - rc = NGX_HTTP_INTERNAL_SERVER_ERROR; + if (rc == NGX_OK) { + u->cache_status = NGX_HTTP_CACHE_STALE; + rc = ngx_http_upstream_cache_send(r, u); } ngx_http_upstream_finalize_request(r, u, rc);
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/http/ngx_http_upstream.h ^
@@ -98,8 +98,8 @@ ngx_uint_t max_fails; time_t fail_timeout; ngx_msec_t slow_start; - ngx_uint_t down; + unsigned down:1; unsigned backup:1; NGX_COMPAT_BEGIN(6)
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/http/ngx_http_variables.c ^
@@ -1240,18 +1240,6 @@ break; #endif -#if (NGX_HAVE_UNIX_DOMAIN) - case AF_UNIX: - - v->len = r->connection->addr_text.len; - v->valid = 1; - v->no_cacheable = 0; - v->not_found = 0; - v->data = r->connection->addr_text.data; - - break; -#endif - default: /* AF_INET / sin = (struct sockaddr_in ) r->connection->sockaddr;
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/http/v2/ngx_http_v2.c ^
@@ -245,8 +245,6 @@ h2c->frame_size = NGX_HTTP_V2_DEFAULT_FRAME_SIZE; - h2c->table_update = 1; - h2scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v2_module); h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log); @@ -748,7 +746,7 @@ type = ngx_http_v2_parse_type(head); ngx_log_debug4(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, - "http2 frame type:%ui f:%Xd l:%uz sid:%ui", + "process http2 frame type:%ui f:%Xd l:%uz sid:%ui", type, h2c->state.flags, h2c->state.length, h2c->state.sid); if (type >= NGX_HTTP_V2_FRAME_STATES) { @@ -1316,7 +1314,7 @@ } ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, - "http2 %s string, len:%i", + "http2 hpack %s string length: %i", huff ? "encoded" : "raw", len); h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx, @@ -1571,7 +1569,7 @@ if (rc == NGX_OK) { ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "http2 header: \":%V: %V\"", + "http2 pseudo-header: \":%V: %V\"", &header->name, &header->value); return ngx_http_v2_state_header_complete(h2c, pos, end); @@ -1647,7 +1645,7 @@ } ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "http2 header: \"%V: %V\"", + "http2 http header: \"%V: %V\"", &header->name, &header->value); return ngx_http_v2_state_header_complete(h2c, pos, end); @@ -3337,19 +3335,6 @@ \|\| r->schema_start == NULL \|\| r->unparsed_uri.len == 0) { - if (r->method_name.len == 0) { - ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, - "client sent no :method header"); - - } else if (r->schema_start == NULL) { - ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, - "client sent no :schema header"); - - } else { - ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, - "client sent no :path header"); - } - ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST); return NGX_ERROR; } @@ -3375,7 +3360,7 @@ ngx_memcpy(p, ending, sizeof(ending)); ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "http2 request line: \"%V\"", &r->request_line); + "http2 http request line: \"%V\"", &r->request_line); return NGX_OK; } @@ -3589,6 +3574,11 @@ rb->buf = ngx_create_temp_buf(r->pool, (size_t) len); } else { + if (stream->preread) { + /* enforce writing preread buffer to file */ + r->request_body_in_file_only = 1; + } + rb->buf = ngx_calloc_buf(r->pool); if (rb->buf != NULL) { @@ -3689,8 +3679,6 @@ buf->pos = buf->start = pos; buf->last = buf->end = pos + size; - r->request_body_in_file_only = 1; - } else { if (size > (size_t) (buf->end - buf->last)) { ngx_log_error(NGX_LOG_INFO, fc->log, 0,
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/http/v2/ngx_http_v2.h ^
@@ -144,7 +144,6 @@ unsigned closed_nodes:8; unsigned settings_ack:1; - unsigned table_update:1; unsigned blocked:1; unsigned goaway:1; };
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/http/v2/ngx_http_v2_filter_module.c ^
@@ -139,7 +139,6 @@ ngx_connection_t fc; ngx_http_cleanup_t cln; ngx_http_v2_out_frame_t frame; - ngx_http_v2_connection_t h2c; ngx_http_core_loc_conf_t clcf; ngx_http_core_srv_conf_t cscf; u_char addr[NGX_SOCKADDR_STRLEN]; @@ -236,11 +235,7 @@ } } - h2c = r->stream->connection; - - len = h2c->table_update ? 1 : 0; - - len += status ? 1 : 1 + ngx_http_v2_literal_size("418"); + len = status ? 1 : 1 + ngx_http_v2_literal_size("418"); clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); @@ -428,13 +423,6 @@ start = pos; - if (h2c->table_update) { - ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0, - "http2 table size update: 0"); - pos++ = (1 << 5) \| 0; - h2c->table_update = 0; - } - ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0, "http2 output header: \":status: %03ui\"", r->headers_out.status); @@ -1269,7 +1257,7 @@ ngx_http_v2_stream_t stream) { ngx_log_debug3(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, - "http2:%ui windows: conn:%uz stream:%z", + "http2:%ui available windows: conn:%uz stream:%z", stream->node->id, h2c->send_window, stream->send_window); if (stream->send_window <= 0) {
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/http/v2/ngx_http_v2_table.c ^
@@ -102,7 +102,7 @@ ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, "http2 get indexed %s: %ui", - name_only ? "name" : "header", index); + name_only ? "header" : "header name", index); index--; @@ -180,7 +180,7 @@ ngx_http_v2_header_t entry, *entries; ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, - "http2 table add: \"%V: %V\"", + "http2 add header to hpack table: \"%V: %V\"", &header->name, &header->value); if (h2c->hpack.entries == NULL) { @@ -293,7 +293,7 @@ size += 32; ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0, - "http2 table account: %uz free:%uz", + "http2 hpack table account: %uz free:%uz", size, h2c->hpack.free); if (size <= h2c->hpack.free) {
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/mail/ngx_mail_proxy_module.c ^
@@ -882,13 +882,10 @@ c = ev->data; s = c->data; - if (ev->timedout \|\| c->close) { + if (ev->timedout) { c->log->action = "proxying"; - if (c->close) { - ngx_log_error(NGX_LOG_INFO, c->log, 0, "shutdown timeout"); - - } else if (c == s->connection) { + if (c == s->connection) { ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out"); c->timedout = 1;
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/os/unix/ngx_user.c ^
@@ -9,6 +9,16 @@ #include <ngx_core.h> +/* + * Solaris has thread-safe crypt() + * Linux has crypt_r(); "struct crypt_data" is more than 128K + * FreeBSD needs the mutex to protect crypt() + * + * TODO: + * ngx_crypt_init() to init mutex + */ + + #if (NGX_CRYPT) #if (NGX_HAVE_GNU_CRYPT_R)
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/stream/ngx_stream_proxy_module.c ^
@@ -1290,12 +1290,6 @@ s = c->data; u = s->upstream; - if (c->close) { - ngx_log_error(NGX_LOG_INFO, c->log, 0, "shutdown timeout"); - ngx_stream_proxy_finalize(s, NGX_STREAM_OK); - return; - } - c = s->connection; pc = u->peer.connection; @@ -1337,17 +1331,13 @@ return; } - ngx_connection_error(pc, NGX_ETIMEDOUT, "upstream timed out"); - if (u->received == 0) { ngx_stream_proxy_next_upstream(s); return; } - - } else { - ngx_connection_error(c, NGX_ETIMEDOUT, "connection timed out"); } + ngx_connection_error(c, NGX_ETIMEDOUT, "connection timed out"); ngx_stream_proxy_finalize(s, NGX_STREAM_OK); return; } @@ -1675,17 +1665,13 @@ u = s->upstream; pc = u->peer.connection; - if (pc && pc->buffered) { + if (u->upstream_out \|\| u->upstream_busy \|\| (pc && pc->buffered)) { ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, - "buffered data on next upstream"); + "pending buffers on next upstream"); ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR); return; } - if (s->connection->type == SOCK_DGRAM) { - u->upstream_out = NULL; - } - if (u->peer.sockaddr) { u->peer.free(&u->peer, u->peer.data, NGX_PEER_FAILED); u->peer.sockaddr = NULL;
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/stream/ngx_stream_upstream.h ^
@@ -58,8 +58,8 @@ ngx_uint_t max_fails; time_t fail_timeout; ngx_msec_t slow_start; - ngx_uint_t down; + unsigned down:1; unsigned backup:1; NGX_COMPAT_BEGIN(4)
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/stream/ngx_stream_upstream_hash_module.c ^
@@ -505,11 +505,6 @@ ngx_stream_upstream_rr_peers_wlock(hp->rrp.peers); - if (hp->tries > 20 \|\| hp->rrp.peers->single) { - ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers); - return hp->get_rr_peer(pc, &hp->rrp); - } - pc->connection = NULL; now = ngx_time(); @@ -544,6 +539,13 @@ continue; } + if (peer->server.len != server->len + \|\| ngx_strncmp(peer->server.data, server->data, server->len) + != 0) + { + continue; + } + if (peer->max_fails && peer->fails >= peer->max_fails && now - peer->checked <= peer->fail_timeout) @@ -555,13 +557,6 @@ continue; } - if (peer->server.len != server->len - \|\| ngx_strncmp(peer->server.data, server->data, server->len) - != 0) - { - continue; - } - peer->current_weight += peer->effective_weight; total += peer->effective_weight; @@ -583,9 +578,10 @@ hp->hash++; hp->tries++; - if (hp->tries > 20) { + if (hp->tries >= points->number) { + pc->name = hp->rrp.peers->name; ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers); - return hp->get_rr_peer(pc, &hp->rrp); + return NGX_BUSY; } }
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/stream/ngx_stream_upstream_zone_module.c ^
@@ -278,7 +278,7 @@ dst->server.data = NULL; } - dst->sockaddr = ngx_slab_calloc_locked(pool, sizeof(ngx_sockaddr_t)); + dst->sockaddr = ngx_slab_calloc_locked(pool, NGX_SOCKADDRLEN); if (dst->sockaddr == NULL) { goto failed; }
[-] [+]	Changed	_service:download_url:nginx-1.13.5.tar.gz/src/stream/ngx_stream_variables.c ^
@@ -460,7 +460,7 @@ static ngx_int_t ngx_stream_variable_binary_remote_addr(ngx_stream_session_t s, ngx_stream_variable_value_t v, uintptr_t data) -{ + { struct sockaddr_in sin; #if (NGX_HAVE_INET6) struct sockaddr_in6 sin6; @@ -480,18 +480,6 @@ break; #endif - -#if (NGX_HAVE_UNIX_DOMAIN) - case AF_UNIX: - - v->len = s->connection->addr_text.len; - v->valid = 1; - v->no_cacheable = 0; - v->not_found = 0; - v->data = s->connection->addr_text.data; - - break; -#endif default: /* AF_INET / sin = (struct sockaddr_in ) s->connection->sockaddr;