← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ext/standard/string.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/standard/string.c
18
18
   +----------------------------------------------------------------------+
19
19
 */
20
20
 
21
 
/* $Id: string.c,v 1.445.2.14.2.83 2009/04/01 17:07:46 mattwil Exp $ */
 
21
/* $Id: string.c 287916 2009-08-31 12:28:46Z iliaa $ */
22
22
 
23
23
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
24
24
 
836
836
                laststart = lastspace = 0;
837
837
                for (current = 0; current < textlen; current++) {
838
838
                        if (text[current] == breakchar[0]) {
839
 
                                laststart = lastspace = current;
 
839
                                laststart = lastspace = current + 1;
840
840
                        } else if (text[current] == ' ') {
841
841
                                if (current - laststart >= linelength) {
842
842
                                        newtext[current] = breakchar[0];
2183
2183
        char *result;
2184
2184
        char *end    = "\r\n";
2185
2185
        int endlen   = 2;
2186
 
        int chunklen = 76;
 
2186
        long chunklen = 76;
2187
2187
        int result_len;
2188
2188
        int argc = ZEND_NUM_ARGS();
2189
2189