com php-src: Fix ext/pgsql builds against libpq 7.3.: NEWS ext/pgsql/pgsql.c

Commit: c580d9b69caffbf2c75ff18c08c99cc9b78d96f1 Author: Adam Harvey <aharvey@php.net> Wed, 2 Jul 2014 12:30:06 -0700 Parents: 1ea4b17af2e3fe23cd8cea0ffaf74a2a863580e1 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c580d9b69caffbf2c75ff18c08c99cc9b78d96f1 Log: Fix ext/pgsql builds against libpq 7.3. Fixes bug #67555 (Cannot build against libpq 7.3). Bugs: https://bugs.php.net/67555 Changed paths: M NEWS M ext/pgsql/pgsql.c Diff: diff --git a/NEWS b/NEWS index bf4bf60..1fefe0e 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 be35129..6a433af 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);