svn commit: r1363069 - in /apr/apr-util/branches/1.5.x: ./ CHANGES dbd/apr_dbd_pgsql.c

[sf...@apache.org]

Author: sf
Date: Wed Jul 18 19:43:59 2012
New Revision: 1363069

URL: http://svn.apache.org/viewvc?rev=1363069&view=rev
Log:
Merge r1327636 (plus CHANGES):

Switch pgsql module from PQescapeString (which pgsql now deprecates)
to PQescapeStringConn


Modified:
    apr/apr-util/branches/1.5.x/   (props changed)
    apr/apr-util/branches/1.5.x/CHANGES
    apr/apr-util/branches/1.5.x/dbd/apr_dbd_pgsql.c

Propchange: apr/apr-util/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1327636

Modified: apr/apr-util/branches/1.5.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CHANGES?rev=1363069&r1=1363068&r2=1363069&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.5.x/CHANGES [utf-8] Wed Jul 18 19:43:59 2012
@@ -1,6 +1,8 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.5.0
 
+  *) dbd_pgsql_escape: Use PQescapeStringConn. [Nick Kew]
+
   *) apr_password_validate: Increase maximum hash string length to allow
      more than 9999 rounds with sha512-crypt. PR 53410. [Stefan Fritsch]
 

Modified: apr/apr-util/branches/1.5.x/dbd/apr_dbd_pgsql.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbd/apr_dbd_pgsql.c?rev=1363069&r1=1363068&r2=1363069&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbd/apr_dbd_pgsql.c (original)
+++ apr/apr-util/branches/1.5.x/dbd/apr_dbd_pgsql.c Wed Jul 18 19:43:59 2012
@@ -470,7 +470,7 @@ static const char *dbd_pgsql_escape(apr_
 {
     size_t len = strlen(arg);
     char *ret = apr_palloc(pool, 2*len + 2);
-    PQescapeString(ret, arg, len);
+    PQescapeStringConn(sql->conn, ret, arg, len, NULL);
     return ret;
 }