← Back to branch summary

~clint-fewbar/ubuntu/natty/php5/merge-5.3.3-3

« back to all changes in this revision

Viewing changes to main/streams/memory.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-01-26 14:09:58 UTC
  • mfrom: (1.1.16 upstream) (0.3.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100126140958-sos69zwa00q2nt19
Tags: 5.2.12.dfsg.1-2ubuntu1
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-mcrypt source)
    + readline support again, now that the libedit issue is fixed.
  - debian/control: Add build dependency: libedit-dev (>= 2.9.cvs.20050518-1)
    CLI readline support.
  - debian/rules:
    + Correctly mangle PHP5_* macros for lpia
  - debian/control:
    + Rename Vcs-Browser & Vcs-Git to XS-Original-Vcs-Browser & XS-Original-Vcs-Git (LP: #323731).
  - debian/control: Move php5-suhoshin to Suggests.
  - debian/rules: Fix broken symlink for pear.
  - main/php_version.h: updated with Ubuntu version info
  - debian/patches/series: Re-enable the 033-we_WANT_libtool.patch patch
  - debian/rules, debian/source_php5.py: Install apport hook. 
* Dropped patches: CVE-2009-3557.patch and CVE-2009-3558.patch, no longer needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
main/streams/memory.c
16
16
   +----------------------------------------------------------------------+
17
17
 */
18
18
 
19
 
/* $Id: memory.c 280638 2009-05-16 20:28:02Z lbarnaud $ */
 
19
/* $Id: memory.c 288393 2009-09-17 02:45:25Z srinatar $ */
20
20
 
21
21
#define _GNU_SOURCE
22
22
#include "php.h"
563
563
        stream = php_stream_alloc_rel(&php_stream_temp_ops, self, 0, mode & TEMP_STREAM_READONLY ? "rb" : "w+b");
564
564
        stream->flags |= PHP_STREAM_FLAG_NO_BUFFER;
565
565
        self->innerstream = php_stream_memory_create_rel(mode);
566
 
        php_stream_auto_cleanup(self->innerstream); // do not warn if innerstream is GC'ed before stream
 
566
        php_stream_auto_cleanup(self->innerstream); /* do not warn if innerstream is GC'ed before stream */
567
567
        ((php_stream_memory_data*)self->innerstream->abstract)->owner_ptr = &self->innerstream;
568
568
 
569
569
        return stream;