From: Remi Collet <remi@php.net>
Date: Wed, 20 May 2015 06:14:02 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~42^2~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ad4a21c44fa2256c7c26beca9d94edd89162649;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS 5.6
  NEWS 5.5
  Fixed Bug #69667 segfault in php_pgsql_meta_data
  fix test output (32bits)

Conflicts:
	ext/pgsql/pgsql.c
---

8ad4a21c44fa2256c7c26beca9d94edd89162649
diff --cc ext/pgsql/pgsql.c
index 6a86b8941b,a6263680af..a65b7a0aa9
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@@ -6498,11 -6497,11 +6502,12 @@@ static int do_exec(smart_str *querystr
  
  	return -1;
  }
 +/* }}} */
  
 -static inline void build_tablename(smart_str *querystr, PGconn *pg_link, const char *table)
 +static inline void build_tablename(smart_str *querystr, PGconn *pg_link, const char *table) /* {{{ */
  {
- 	char *table_copy, *escaped, *token, *tmp;
+ 	char *table_copy, *escaped, *tmp;
+ 	const char *token;
  	size_t len;
  
  	/* schame.table should be "schame"."table" */