Fixing compilation with nginx>=1.9.1

[msva]

No description provided.

[agentzh]

I suggest merge these two #if into a single one. Also, we don't need the "tp" variable assignment code path for nginx 1.9.1+.

[msva]

So, if I understand you correct, it would, probably, be something like below, yes?

+#if defined(nginx_version) && (nginx_version >= 1009001)
+    if (u->state && u->state->response_time) {
         u->state->response_time = ngx_timeofday()->msec - u->state->response_time; // [!!!] or this line is unneeded entirely?
+#else
     if (u->state && u->state->response_sec) {
         tp = ngx_timeofday();
         u->state->response_sec = tp->sec - u->state->response_sec;
         u->state->response_msec = tp->msec - u->state->response_msec;
+#endif

<...>

[agentzh]

@msva Yes, like that. But you'd better ensure empty lines around your #if, #else, and #endif for aesthetic reasons.

[msva]

here it is ;)

[agentzh]

@msva I think you need to short-circuit the "tv" variable declaration for nginx 1.9.1+ too. It is never used in that code path.

Also, again: you'd better ensure empty lines around your #if, #else, and #endif for aesthetic reasons.

@PiotrSikora ?

[msva]

will it be okay in that way?

[agentzh]

Style: no variable declaration in the middle of the function body.

[agentzh]

@msva No, putting the variable declaration inside the if block also violates the nginx coding style (well, I didn't invent that style).

[msva]

Uhm.. But according to that: http://wiki.nginx.org/CodingStyle (although, there is struct, but not plain variables) it is okay... But ok, I'll think about it ;)

[msva]

Uhm... Did I misunderstood you about what exactly violating style, or do NginX team violates style theyself?
http://hg.nginx.org/nginx/file/6893a1007a7c/src/http/ngx_http_request.c#l204

[agentzh]

@msva Regarding the empty lines around macro directives, either way is fine. That's why I said it was for aesthetic reasons. For example,

http://hg.nginx.org/nginx/file/6893a1007a7c/src/http/ngx_http_request.c#l1833

[msva]

So, is it okay now? :)

[agentzh]

@msva Looking good to me now :)

[msva]

@PiotrSikora ping? :(

[agentzh]

@msva No worries. I'll look into this.

[agentzh]

@msva I'm getting the following compilation error on Linux (Fedora 22, gcc 5.1.1) using your branch:

/home/agentzh/git/postgres-nginx-module/src/ngx_postgres_util.c: In function ‘ngx_postgres_upstream_finalize_request’:
/home/agentzh/git/postgres-nginx-module/src/ngx_postgres_util.c:71:33: error: assignment makes integer from pointer without a cast [-Werror=int-conversion]
         u->state->response_time = ngx_timeofday()->msec - u->state->response_time;
                                 ^
cc1: all warnings being treated as errors

Maybe you should use ngx_current_msec instead of ngx_timeofday()->msec here?

[agentzh]

@msva Never mind, I've committed a slightly modified version of your patch to master. Thanks for your contribution!