From c580d9b69caffbf2c75ff18c08c99cc9b78d96f1 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Wed, 2 Jul 2014 12:30:06 -0700 Subject: [PATCH] Fix ext/pgsql builds against libpq 7.3. Fixes bug #67555 (Cannot build against libpq 7.3). --- NEWS | 3 +++ ext/pgsql/pgsql.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/NEWS b/NEWS index bf4bf60048..1fefe0eea4 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,9 @@ PHP NEWS . Fixed buf #67497 (eval with parse error causes segmentation fault in generator). (Nikita) +- pgsql: + . Fix bug #67555 (Cannot build against libpq 7.3). (Adam) + 03 Jul 2014, PHP 5.6.0 Release Candidate 2 diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index be351297d0..6a433af0f3 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -1127,7 +1127,9 @@ PHP_MINIT_FUNCTION(pgsql) REGISTER_LONG_CONSTANT("PGSQL_CONNECTION_MADE", CONNECTION_MADE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("PGSQL_CONNECTION_AWAITING_RESPONSE", CONNECTION_AWAITING_RESPONSE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("PGSQL_CONNECTION_AUTH_OK", CONNECTION_AUTH_OK, CONST_CS | CONST_PERSISTENT); +#ifdef CONNECTION_SSL_STARTUP REGISTER_LONG_CONSTANT("PGSQL_CONNECTION_SSL_STARTUP", CONNECTION_SSL_STARTUP, CONST_CS | CONST_PERSISTENT); +#endif REGISTER_LONG_CONSTANT("PGSQL_CONNECTION_SETENV", CONNECTION_SETENV, CONST_CS | CONST_PERSISTENT); /* For pg_connect_poll() */ REGISTER_LONG_CONSTANT("PGSQL_POLLING_FAILED", PGRES_POLLING_FAILED, CONST_CS | CONST_PERSISTENT); -- 2.40.0