Fix build with nginx 1.11.6 #52
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
agentzh
suggested changes
Nov 17, 2016
| @@ -1319,13 +1319,15 @@ ngx_postgres_find_upstream(ngx_http_request_t *r, ngx_url_t *url) | |||
| (int) uscfp[i]->port, (int) url->port); | |||
| continue; | |||
| } | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
Line trailing spaces here?
| @@ -1319,13 +1319,15 @@ ngx_postgres_find_upstream(ngx_http_request_t *r, ngx_url_t *url) | |||
| (int) uscfp[i]->port, (int) url->port); | |||
| continue; | |||
| } | |||
|
|
|||
|
|
|||
| #if (nginx_version < 1011006) | |||
There was a problem hiding this comment.
# should be on the first column of the line.
| if (uscfp[i]->default_port && url->default_port | ||
| && (uscfp[i]->default_port != url->default_port)) | ||
| { | ||
| dd("default_port doesn't match"); | ||
| continue; | ||
| } | ||
| #endif |
agentzh
suggested changes
Nov 18, 2016
| @@ -1319,14 +1319,14 @@ ngx_postgres_find_upstream(ngx_http_request_t *r, ngx_url_t *url) | |||
| (int) uscfp[i]->port, (int) url->port); | |||
| continue; | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
I meant we need this blank line for aesthetic reasons.
| if (uscfp[i]->default_port && url->default_port | ||
| && (uscfp[i]->default_port != url->default_port)) | ||
| { | ||
| dd("default_port doesn't match"); | ||
| continue; | ||
| } | ||
|
|
KangOl
added a commit
to odoo/ngx_postgres
that referenced
this pull request
Jun 22, 2017
n3ur0id
approved these changes
Sep 23, 2017
|
Since I no longer have commit access to this repo, I've committed a slightly modified version of this patch to OpenResty's fork of this repo: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
default_port was removed from ngx_http_upstream_srv_conf_s since nginx 1.16.6