Bring back unrelated changes that were reverted in last commit.

PiotrSikora · PiotrSikora · commit e89eb5fc8e64 · 2010-12-23T00:19:53.000Z
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ postgres_pass
 -------------
 * **syntax**: `postgres_pass upstream`
 * **default**: `none`
-* **context**: `location`
+* **context**: `location`, `if location`
 
 Set name of an upstream block that will be used for the database connections
 (it can include variables).
@@ -56,7 +56,7 @@ postgres_query
 --------------
 * **syntax**: `postgres_query [methods] query`
 * **default**: `none`
-* **context**: `http`, `server`, `location`
+* **context**: `http`, `server`, `location`, `if location`
 
 Set query string (it can include variables). When methods are specified then
 query is used only for them, otherwise it's used for all methods.
@@ -68,7 +68,7 @@ postgres_rewrite
 ----------------
 * **syntax**: `postgres_rewrite [methods] condition [=]status_code`
 * **default**: `none`
-* **context**: `http`, `server`, `location`
+* **context**: `http`, `server`, `location`, `if location`
 
 Rewrite response `status_code` when given condition is met (first one wins!):
 
@@ -90,7 +90,7 @@ postgres_output
 ---------------
 * **syntax**: `postgres_output none|value|row|rds [row] [column]`
 * **default**: `rds`
-* **context**: `http`, `server`, `location`
+* **context**: `http`, `server`, `location`, `if location`
 
 Set output format:
 
diff --git a/src/ngx_postgres_processor.c b/src/ngx_postgres_processor.c
@@ -165,7 +165,7 @@ ngx_postgres_upstream_connect(ngx_http_request_t *r, ngx_connection_t *pgxc,
               * This cannot happen, PQconnectPoll would return
               * PGRES_POLLING_FAILED in that case.
               */
-             dd("connecting (unknown state: %d)", (int) PQstatus(pgdt->pgconn));
+             dd("connecting (unknown state:%d)", (int) PQstatus(pgdt->pgconn));
 
              dd("returning NGX_ERROR");
              return NGX_ERROR;
diff --git a/t/loc-if.t b/t/loc-if.t
@@ -80,7 +80,7 @@ Content-Type: application/x-resty-dbd-stream
 
 
 
-=== TEST 1: postgres_pass and postgres_query work in location if blocks
+=== TEST 2: postgres_pass and postgres_query work in location if blocks
 --- http_config
     upstream database {
         postgres_server     127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT dbname=ngx_test
