← Back to branch summary

~hexmode/ubuntu/lucid/php5/php5.fix-php-bug-33210

« back to all changes in this revision

Viewing changes to ext/pdo_dblib/dblib_driver.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-11-06 01:44:25 UTC
  • mfrom: (1.1.15 upstream) (0.3.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091106014425-5dsqjhbg303h3kfn
Tags: 5.2.11.dfsg.1-1ubuntu1
https://launchpad.net/bugs/323731
* Merge from debian testing, remaining changes:
  - debian/control, debian/rules: Disable a few build dependencies and
    accompanying, binary packages which we do not want to support in main:
    + firebird2-dev/php5-interbase (we have a seperate php-interbase source)
    + libc-client/php5-imap (we have a seperate php-imap source)
    + libmcrypt-dev/php5-mcrypt (seperate php-mycrpt source)
    + readline support again, now that the libedit issue is fixed.
  - debian/control: Add build dependency: libdedit-dev (>= 2.9.cvs.20050518-1)
    CLI readline support.
  - debian/rules:
    + Correctly mangle PHP5_* macros for lpia
  - debian/control:
    + Use libdb-4.6-dev.
    + Rename Vcs-Browser & Vcs-Git to XS-Original-Vcs-Browser & XS-Original-Vcs-Git (LP: #323731).
  - Dropped patches:
    - debian/patches/119-sybase-alias.patch: Use Debian's patch.
    - debian/patches/fix-autoconf-ftbfs.patch: Use Debian's patch
    - debian/patches/fix-zlib-decompression: Already in upstream
  - Use the default pear/install-pear-nozlib.phar in php 5.2.11
  - debian/control: Move php5-suhoshin to Suggests.
  - debian/rules: Fix broken symlink for pear.
  - Dropped dependency on autoconf2.13.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/pdo_dblib/dblib_driver.c
17
17
  +----------------------------------------------------------------------+
18
18
*/
19
19
 
20
 
/* $Id: dblib_driver.c,v 1.9.2.2.2.5 2009/03/20 22:14:17 sfox Exp $ */
 
20
/* $Id: dblib_driver.c 288215 2009-09-10 01:20:42Z felipe $ */
21
21
 
22
22
#ifdef HAVE_CONFIG_H
23
23
# include "config.h"
230
230
                goto cleanup;
231
231
        }
232
232
 
233
 
        if (DBSETOPT(H->link, DBTEXTLIMIT, "2147483647") == FAIL) {
234
 
                goto cleanup;
235
 
        }
 
233
        /* dblib do not return more than this length from text/image */
 
234
        DBSETOPT(H->link, DBTEXTLIMIT, "2147483647");
 
235
        
 
236
        /* limit text/image from network */
 
237
        DBSETOPT(H->link, DBTEXTSIZE, "2147483647");
236
238
 
237
239
        if (vars[3].optval && FAIL == dbuse(H->link, vars[3].optval)) {
238
240
                goto cleanup;