diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-11-29 01:45:54 +0000 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-11-29 01:45:54 +0000 |
| commit | 01554bf3e417f13baf7af874e449c265c0309279 (patch) | |
| tree | 8aca46ab27a54cea34c14001af774942f0502e39 /ext/pgsql/pgsql.c | |
| parent | 65c8edd525108f6598a8bb25fb3c5d6c80233322 (diff) | |
| parent | 719083bd943e6c287c2dcb47918cf51f89a4ac08 (diff) | |
| download | php-git-01554bf3e417f13baf7af874e449c265c0309279.tar.gz | |
Merge branch 'master' into zppFailOnOverflow
Diffstat (limited to 'ext/pgsql/pgsql.c')
| -rw-r--r-- | ext/pgsql/pgsql.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 4b1cc31cc8..119a47f24c 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -1373,7 +1373,7 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /* ensure that the link did not die */ if (PGG(auto_reset_persistent) & 1) { /* need to send & get something from backend to - make sure we catch CONNECTION_BAD everytime */ + make sure we catch CONNECTION_BAD every time */ PGresult *pg_result; pg_result = PQexec(le->ptr, "select 1"); PQclear(pg_result); @@ -1478,7 +1478,7 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) } PGG(num_links)++; } - /* set notice processer */ + /* set notice processor */ if (! PGG(ignore_notices) && Z_TYPE_P(return_value) == IS_RESOURCE) { PQsetNoticeProcessor(pgsql, _php_pgsql_notice_handler, (void*)Z_RES_HANDLE_P(return_value)); } @@ -4344,7 +4344,7 @@ PHP_FUNCTION(pg_escape_bytea) #endif to = (char *)PQescapeBytea((unsigned char*)from, from_len, &to_len); - RETVAL_STRINGL(to, to_len-1); /* to_len includes addtional '\0' */ + RETVAL_STRINGL(to, to_len-1); /* to_len includes additional '\0' */ } /* }}} */ |