Re: [PATCH] Configure: call make distclean for zlib only if Makefile exists
Hey, Configure: call make distclean for zlib only if Makefile exists. This change allows to build nginx against git checkout of zlib. Actually, it looks that only our amd64-optimized version [1] doesn't ship with Makefile, the original repository [2] has a minimal one with distclean target, so feel free to ignore this patch (although, I still think it's a good practice to check if the Makefile exists before calling make). [1] https://github.com/cloudflare/zlib/commits/gcc.amd64 [2] https://github.com/madler/zlib Best regards, Piotr Sikora ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
[nginx] nginx-1.6.0-RELEASE
details: http://hg.nginx.org/nginx/rev/daa5384fd526 branches: stable-1.6 changeset: 5671:daa5384fd526 user: Maxim Dounin mdou...@mdounin.ru date: Thu Apr 24 16:52:24 2014 +0400 description: nginx-1.6.0-RELEASE diffstat: docs/xml/nginx/changes.xml | 14 ++ 1 files changed, 14 insertions(+), 0 deletions(-) diffs (24 lines): diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml --- a/docs/xml/nginx/changes.xml +++ b/docs/xml/nginx/changes.xml @@ -5,6 +5,20 @@ change_log title=nginx +changes ver=1.6.0 date=24.04.2014 + +change +para lang=ru +Стабильная ветка 1.6.x. +/para +para lang=en +1.6.x stable branch. +/para +/change + +/changes + + changes ver=1.5.13 date=08.04.2014 change type=change ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
[nginx] release-1.6.0 tag
details: http://hg.nginx.org/nginx/rev/622887a470d3 branches: stable-1.6 changeset: 5672:622887a470d3 user: Maxim Dounin mdou...@mdounin.ru date: Thu Apr 24 16:52:24 2014 +0400 description: release-1.6.0 tag diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -369,3 +369,4 @@ b798fc020e3a84ef68e6c9f47865a319c826d33c f995a10d4c7e9a817157a6ce7b753297ad32897e release-1.5.11 97b47d95e4449cbde976657cf8cbbc118351ffe0 release-1.5.12 fd722b890eabc600394349730a093f50dac31639 release-1.5.13 +daa5384fd526a9c18fff4f5135646743628f6bc7 release-1.6.0 ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
[nginx] release-1.7.0 tag
details: http://hg.nginx.org/nginx/rev/1b0c55d38d0b branches: changeset: 5674:1b0c55d38d0b user: Maxim Dounin mdou...@mdounin.ru date: Thu Apr 24 16:54:23 2014 +0400 description: release-1.7.0 tag diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -369,3 +369,4 @@ b798fc020e3a84ef68e6c9f47865a319c826d33c f995a10d4c7e9a817157a6ce7b753297ad32897e release-1.5.11 97b47d95e4449cbde976657cf8cbbc118351ffe0 release-1.5.12 fd722b890eabc600394349730a093f50dac31639 release-1.5.13 +d161d68df8be32e5cbf72b07db1a707714827803 release-1.7.0 ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
[nginx] Version bump.
details: http://hg.nginx.org/nginx/rev/1710bf72243e branches: changeset: 5675:1710bf72243e user: Valentin Bartenev vb...@nginx.com date: Thu Apr 24 20:50:10 2014 +0400 description: Version bump. diffstat: src/core/nginx.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 1b0c55d38d0b -r 1710bf72243e src/core/nginx.h --- a/src/core/nginx.h Thu Apr 24 16:54:23 2014 +0400 +++ b/src/core/nginx.h Thu Apr 24 20:50:10 2014 +0400 @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1007000 -#define NGINX_VERSION 1.7.0 +#define nginx_version 1007001 +#define NGINX_VERSION 1.7.1 #define NGINX_VER nginx/ NGINX_VERSION #define NGINX_VAR NGINX ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
[PATCH 1 of 2] HTTP: Add client source port to any error that is logged
# HG changeset patch
# User Quanah Gibson-Mount qua...@zimbra.com
# Date 1398357557 18000
# Node ID 4b7d2e503c06758330aabcc21ffbbab77f09568e
# Parent 1b0c55d38d0b7ba69dcad79760a3fadc30696a9d
HTTP: Add client source port to any error that is logged
For TRAC ticket 531
diff -r 1b0c55d38d0b -r 4b7d2e503c06 src/http/ngx_http_request.c
--- a/src/http/ngx_http_request.c Thu Apr 24 16:54:23 2014 +0400
+++ b/src/http/ngx_http_request.c Thu Apr 24 11:39:17 2014 -0500
@@ -3548,6 +3548,11 @@
u_char *p;
ngx_http_request_t *r;
ngx_http_log_ctx_t *ctx;
+ngx_uint_t remote_port=0;
+struct sockaddr_in *sin;
+#if (NGX_HAVE_INET6)
+struct sockaddr_in6*sin6;
+#endif
if (log-action) {
p = ngx_snprintf(buf, len, while %s, log-action);
@@ -3557,15 +3562,32 @@
ctx = log-data;
-p = ngx_snprintf(buf, len, , client: %V, ctx-connection-addr_text);
-len -= p - buf;
-
r = ctx-request;
-
if (r) {
+switch (r-connection-sockaddr-sa_family) {
+#if (NGX_HAVE_INET6)
+case AF_INET6:
+sin6 = (struct sockaddr_in6 *) r-connection-sockaddr;
+remote_port = ntohs(sin6-sin6_port);
+break;
+#endif
+
+default: /* AF_INET */
+sin = (struct sockaddr_in *) r-connection-sockaddr;
+remote_port = ntohs(sin-sin_port);
+break;
+}
+
+if (remote_port remote_port 65536) {
+ p = ngx_snprintf(buf, len, , client: %V:%ui,
ctx-connection-addr_text,remote_port);
+} else {
+ p = ngx_snprintf(buf, len, , client: %V,
ctx-connection-addr_text);
+}
+len -= p - buf;
+
return r-log_handler(r, ctx-current_request, p, len);
-
} else {
+p = ngx_snprintf(buf, len, , client: %V,
ctx-connection-addr_text);
p = ngx_snprintf(p, len, , server: %V,
ctx-connection-listening-addr_text);
}
___
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel
[PATCH 0 of 2] TRAC 531 - Add source port logging for HTTP(S) error logging and all proxied email client connections
The following patches ensure that the source port is logged for all client connections. This is to resolve TRAC issue 531. Belgium is mandating that the source port be logged for all client connections for Carrier Grade NAT. This may soon extend to the entire European Union. ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
Re: [PATCH 1 of 2] HTTP: Add client source port to any error that is logged
Hello! On Thu, Apr 24, 2014 at 12:19:46PM -0500, Quanah Gibson-Mount wrote: # HG changeset patch # User Quanah Gibson-Mount qua...@zimbra.com # Date 1398357557 18000 # Node ID 4b7d2e503c06758330aabcc21ffbbab77f09568e # Parent 1b0c55d38d0b7ba69dcad79760a3fadc30696a9d HTTP: Add client source port to any error that is logged For TRAC ticket 531 I tend to say No, thanks. If needed due to local regulations, $remote_port can be added to log_format. -- Maxim Dounin http://nginx.org/ ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
Re: [PATCH 1 of 2] HTTP: Add client source port to any error that is logged
--On April 24, 2014 at 9:37:54 PM +0400 Maxim Dounin mdou...@mdounin.ru wrote: I tend to say No, thanks. If needed due to local regulations, $remote_port can be added to log_format. $remote_port in the log format section only covers errors logged to the access log, it does not cover errors in the error log. The submitted patch handles the error log. --Quanah -- Quanah Gibson-Mount Principal Software Engineer Zimbra, Inc Zimbra :: the leader in open source messaging and collaboration ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
Re: [PATCH 1 of 2] HTTP: Add client source port to any error that is logged
--On April 24, 2014 at 10:41:43 AM -0700 Quanah Gibson-Mount qua...@zimbra.com wrote: --On April 24, 2014 at 9:37:54 PM +0400 Maxim Dounin mdou...@mdounin.ru wrote: I tend to say No, thanks. If needed due to local regulations, $remote_port can be added to log_format. $remote_port in the log format section only covers errors logged to the access log, accesses even.. :P --Quanah -- Quanah Gibson-Mount Principal Software Engineer Zimbra, Inc Zimbra :: the leader in open source messaging and collaboration ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
Re: [PATCH 2 of 2] MAIL: Always log the source port of the client
Hello! On Thu, Apr 24, 2014 at 12:19:47PM -0500, Quanah Gibson-Mount wrote: # HG changeset patch # User Quanah Gibson-Mount qua...@zimbra.com # Date 1398359069 18000 # Node ID 3c908c40acd15c8df020f95309b98d45f2b5e5de # Parent 4b7d2e503c06758330aabcc21ffbbab77f09568e MAIL: Always log the source port of the client For TRAC 531 Much like http-related counterpart, this looks like a hack for me. We may consider adding port to the client connected messages (not sure), but I don't think we have to do anything beyond that. -- Maxim Dounin http://nginx.org/ ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
Re: [PATCH 1 of 2] HTTP: Add client source port to any error that is logged
Hello! On Thu, Apr 24, 2014 at 10:41:43AM -0700, Quanah Gibson-Mount wrote: --On April 24, 2014 at 9:37:54 PM +0400 Maxim Dounin mdou...@mdounin.ru wrote: I tend to say No, thanks. If needed due to local regulations, $remote_port can be added to log_format. $remote_port in the log format section only covers errors logged to the access log, it does not cover errors in the error log. The submitted patch handles the error log. I understand the difference, thank you. The ticket in question only talked about error_log in context of mail module, where is no separate access logging to meet the alleged regulations. -- Maxim Dounin http://nginx.org/ ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
Re: [PATCH 1 of 2] HTTP: Add client source port to any error that is logged
--On April 24, 2014 at 9:56:48 PM +0400 Maxim Dounin mdou...@mdounin.ru wrote: $remote_port in the log format section only covers errors logged to the access log, it does not cover errors in the error log. The submitted patch handles the error log. I understand the difference, thank you. The ticket in question only talked about error_log in context of mail module, where is no separate access logging to meet the alleged regulations. Yes, that is true, but why only implement a partial solution? With CGN, only logging the IP is fairly useless in all cases. To truly get useful information going forward, the IP + PORT of the client should logged in all cases. --Quanah -- Quanah Gibson-Mount Principal Software Engineer Zimbra, Inc Zimbra :: the leader in open source messaging and collaboration ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
Re: [PATCH 1 of 2] HTTP: Add client source port to any error that is logged
Hello! On Thu, Apr 24, 2014 at 11:06:29AM -0700, Quanah Gibson-Mount wrote: --On April 24, 2014 at 9:56:48 PM +0400 Maxim Dounin mdou...@mdounin.ru wrote: $remote_port in the log format section only covers errors logged to the access log, it does not cover errors in the error log. The submitted patch handles the error log. I understand the difference, thank you. The ticket in question only talked about error_log in context of mail module, where is no separate access logging to meet the alleged regulations. Yes, that is true, but why only implement a partial solution? With CGN, only logging the IP is fairly useless in all cases. To truly get useful information going forward, the IP + PORT of the client should logged in all cases. Access log certainly can be configured to provide enough enformation to match any given error log message to a port if needed. There is no need to implement anything, solution is already here. And, by asking about why implement a partical solution you are overlooking the fact that proposed solution is partial as well - it doesn't change c-addr_text to ensure proper logging in all places (this would be a bad idea for other reasons, but it's another question), but rather tries to hack on the http error logging code to introduce remote port logging. This is far from being a complete solution. -- Maxim Dounin http://nginx.org/ ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
Re: [PATCH 1 of 2] HTTP: Add client source port to any error that is logged
--On April 24, 2014 at 10:26:07 PM +0400 Maxim Dounin mdou...@mdounin.ru wrote: Yes, that is true, but why only implement a partial solution? With CGN, only logging the IP is fairly useless in all cases. To truly get useful information going forward, the IP + PORT of the client should logged in all cases. Access log certainly can be configured to provide enough enformation to match any given error log message to a port if needed. There is no need to implement anything, solution is already here. The error log currently only provides the IP. While I'm guessing you could do things like correlate timestamps, it's still going to be a pain. Having the port readily available everywhere makes tracking a specific user much easier to do. And, by asking about why implement a partical solution you are overlooking the fact that proposed solution is partial as well - it doesn't change c-addr_text to ensure proper logging in all places (this would be a bad idea for other reasons, but it's another question), but rather tries to hack on the http error logging code to introduce remote port logging. This is far from being a complete solution. I'm certainly willing to address any deficiencies, but I'd want to make sure it would follow whatever you want in the product before investing more time on it. ;) For now it meets the needs of our customer in Belgium who has to start dealing with the legal requirements of client port logging sooner than later. --Quanah -- Quanah Gibson-Mount Server Architect Zimbra, Inc Zimbra :: the leader in open source messaging and collaboration ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
Re: [PATCH 2 of 2] MAIL: Always log the source port of the client
--On April 24, 2014 at 9:47:39 PM +0400 Maxim Dounin mdou...@mdounin.ru wrote: Hello! Much like http-related counterpart, this looks like a hack for me. We may consider adding port to the client connected messages (not sure), but I don't think we have to do anything beyond that. For our end clients, who have to actually examine particular error messages, it is useful to have the port logged in any of the connection data. If the current solution is hackish, I'm happy to work out something more acceptable if you want to note what that would be. ;) --Quanah -- Quanah Gibson-Mount Server Architect Zimbra, Inc Zimbra :: the leader in open source messaging and collaboration ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
Re: [nginx] Adding Support for Weak ETags
Hi Maxim, Is the draft patch the same as the one that your posted in the previous thread, or has more work been done since then? -Aaron Peschel On Mon, Apr 21, 2014 at 5:26 AM, Maxim Dounin mdou...@mdounin.ru wrote: Hello! On Thu, Apr 17, 2014 at 05:39:40PM -0700, Aaron Peschel wrote: Hello, I am interested in getting support for Weak ETags into the mainline. There was some discussion previously in here previously that developed a quick patch to add support. What additional functionality would be required and what steps should be followed to get weak etag functionality added to nginx? I am willing to do the work, I just need some help with heading in the right direction. I had a quick draft patch sitting in my patchqueue since previous discussion (see [1]) to downgrade strict etags to weak ones. It needs more work though, as I'm not yet happy with the code. I hope I'll be able to find some time and finish it in 1.7.x. [1] http://mailman.nginx.org/pipermail/nginx-devel/2013-November/004523.html -- Maxim Dounin http://nginx.org/ ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
Re: [PATCH] Configure: call make distclean for zlib only if Makefile exists
Slightly off-topic, does cloudflare have a nginx fork publicly available? I only saw lua-nginx-cache-module On Thu, Apr 24, 2014 at 10:16 PM, Piotr Sikora pi...@cloudflare.com wrote: Hey, Configure: call make distclean for zlib only if Makefile exists. This change allows to build nginx against git checkout of zlib. Actually, it looks that only our amd64-optimized version [1] doesn't ship with Makefile, the original repository [2] has a minimal one with distclean target, so feel free to ignore this patch (although, I still think it's a good practice to check if the Makefile exists before calling make). [1] https://github.com/cloudflare/zlib/commits/gcc.amd64 [2] https://github.com/madler/zlib Best regards, Piotr Sikora ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
Re: [PATCH] Configure: call make distclean for zlib only if Makefile exists
Hello! On Thu, Apr 24, 2014 at 7:47 PM, Ryan Brown wrote: Slightly off-topic, does cloudflare have a nginx fork publicly available? No. Actually we've been trying hard not to diverge from the official nginx core too far. That's why we've been working hard on the openresty bundle project: http://openresty.org I only saw lua-nginx-cache-module This module is actually not really ready and we haven't used it yet in CloudFlare's online system. Regards, -agentzh ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
