Use recently standardized error codes in RDS format.

FRiCKLE · Jun 4, 2010 · bbb72fa · bbb72fa
1 parent e27c3a9
commit bbb72fa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,6 @@
+2010-06-04
+    * Use recently standardized error codes in RDS format.
+
 2010-06-03
     * Allow request methods other than GET and HEAD.
       From Yichun Zhang (agentzh) via ngx_drizzle.

diff --git a/src/ngx_postgres_output.c b/src/ngx_postgres_output.c
@@ -234,7 +234,7 @@ ngx_postgres_render_rds_header(ngx_http_request_t *r, ngx_pool_t *pool,
 
     *b->last++ = 0;
 
-    *(uint16_t *) b->last = (uint16_t) PQresultStatus(res);
+    *(uint16_t *) b->last = (uint16_t) 0;
     b->last += sizeof(uint16_t);
 
     *(uint16_t *) b->last = (uint16_t) PQresultStatus(res);

diff --git a/test/t/form.t b/test/t/form.t
@@ -46,7 +46,7 @@ Content-Type: application/x-resty-dbd-stream
 "\x{00}".        # endian
 "\x{03}\x{00}\x{00}\x{00}".  # format version 0.0.3
 "\x{00}".        # result type
-"\x{02}\x{00}".  # std errcode
+"\x{00}\x{00}".  # std errcode
 "\x{02}\x{00}".  # driver errcode
 "\x{00}\x{00}".  # driver errstr len
 "".              # driver errstr data

diff --git a/test/t/sanity.t b/test/t/sanity.t
@@ -42,7 +42,7 @@ Content-Type: application/x-resty-dbd-stream
 "\x{00}".        # endian
 "\x{03}\x{00}\x{00}\x{00}".  # format version 0.0.3
 "\x{00}".        # result type
-"\x{02}\x{00}".  # std errcode
+"\x{00}\x{00}".  # std errcode
 "\x{02}\x{00}".  # driver errcode
 "\x{00}\x{00}".  # driver errstr len
 "".              # driver errstr data
@@ -97,7 +97,7 @@ GET /postgres
 "\x{00}".        # endian
 "\x{03}\x{00}\x{00}\x{00}".  # format version 0.0.3
 "\x{00}".        # result type
-"\x{02}\x{00}".  # std errcode
+"\x{00}\x{00}".  # std errcode
 "\x{02}\x{00}".  # driver errcode
 "\x{00}\x{00}".  # driver errstr len
 "".              # driver errstr data
@@ -152,7 +152,7 @@ GET /postgres
 "\x{00}".        # endian
 "\x{03}\x{00}\x{00}\x{00}".  # format version 0.0.3
 "\x{00}".        # result type
-"\x{01}\x{00}".  # std errcode
+"\x{00}\x{00}".  # std errcode
 "\x{01}\x{00}".  # driver errcode
 "\x{00}\x{00}".  # driver errstr len
 "".              # driver errstr data
@@ -188,7 +188,7 @@ GET /postgres
 "\x{00}".        # endian
 "\x{03}\x{00}\x{00}\x{00}".  # format version 0.0.3
 "\x{00}".        # result type
-"\x{02}\x{00}".  # std errcode
+"\x{00}\x{00}".  # std errcode
 "\x{02}\x{00}".  # driver errcode
 "\x{00}\x{00}".  # driver errstr len
 "".              # driver errstr data
@@ -236,7 +236,7 @@ Content-Type: application/x-resty-dbd-stream
 "\x{00}".        # endian
 "\x{03}\x{00}\x{00}\x{00}".  # format version 0.0.3
 "\x{00}".        # result type
-"\x{01}\x{00}".  # std errcode
+"\x{00}\x{00}".  # std errcode
 "\x{01}\x{00}".  # driver errcode
 "\x{00}\x{00}".  # driver errstr len
 "".              # driver errstr data