ports/www/nginx-devel/files/extra-patch-ngx_inet_slab.c
Sergey A. Osokin e01ee5095b Upgrade from 1.10.0 to 1.11.0.
<ChangeLog>

*) Feature: the "transparent" parameter of the "proxy_bind",
   "fastcgi_bind", "memcached_bind", "scgi_bind", and "uwsgi_bind"
   directives.

*) Feature: the $request_id variable.

*) Feature: the "map" directive supports combinations of multiple
   variables as resulting values.

*) Feature: now nginx checks if EPOLLRDHUP events are supported by
   kernel, and optimizes connection handling accordingly if the "epoll"
   method is used.

*) Feature: the "ssl_certificate" and "ssl_certificate_key" directives
   can be specified multiple times to load certificates of different
   types (for example, RSA and ECDSA).

*) Feature: the "ssl_ecdh_curve" directive now allows specifying a list
   of curves when using OpenSSL 1.0.2 or newer; by default a list built
   into OpenSSL is used.

*) Change: to use DHE ciphers it is now required to specify parameters
   using the "ssl_dhparam" directive.

*) Feature: the $proxy_protocol_port variable.

*) Feature: the $realip_remote_port variable in the
   ngx_http_realip_module.

*) Feature: the ngx_http_realip_module is now able to set the client
   port in addition to the address.

*) Change: the "421 Misdirected Request" response now used when
   rejecting requests to a virtual server different from one negotiated
   during an SSL handshake; this improves interoperability with some
   HTTP/2 clients when using client certificates.

*) Change: HTTP/2 clients can now start sending request body
   immediately; the "http2_body_preread_size" directive controls size of
   the buffer used before nginx will start reading client request body.

*) Bugfix: cached error responses were not updated when using the
   "proxy_cache_bypass" directive.

</ChangeLog>
2016-05-25 23:43:23 +00:00

29 lines
1.1 KiB
C

--- ../ngx_dynamic_upstream-0.1.3/src/ngx_inet_slab.c.orig 2016-05-25 19:27:27.204200000 -0400
+++ ../ngx_dynamic_upstream-0.1.3/src/ngx_inet_slab.c 2016-05-25 19:28:07.177622000 -0400
@@ -250,7 +250,7 @@
return NGX_ERROR;
}
- ngx_memcpy(sin, u->sockaddr, sizeof(struct sockaddr_in));
+ ngx_memcpy(sin, &u->sockaddr, sizeof(struct sockaddr_in));
u->addrs[0].sockaddr = (struct sockaddr *) sin;
u->addrs[0].socklen = sizeof(struct sockaddr_in);
@@ -277,7 +277,7 @@
u->family = u->addrs[0].sockaddr->sa_family;
u->socklen = u->addrs[0].socklen;
- ngx_memcpy(u->sockaddr, u->addrs[0].sockaddr, u->addrs[0].socklen);
+ ngx_memcpy(&u->sockaddr, u->addrs[0].sockaddr, u->addrs[0].socklen);
switch (u->family) {
@@ -405,7 +405,7 @@
return NGX_ERROR;
}
- ngx_memcpy(sin6, u->sockaddr, sizeof(struct sockaddr_in6));
+ ngx_memcpy(sin6, &u->sockaddr, sizeof(struct sockaddr_in6));
u->addrs[0].sockaddr = (struct sockaddr *) sin6;
u->addrs[0].socklen = sizeof(struct sockaddr_in6);