[BACK]Return to user_filters.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / ext / standard

Diff for /embedaddon/php/ext/standard/user_filters.c between versions 1.1 and 1.1.1.4

version 1.1, 2012/02/21 23:48:02 version 1.1.1.4, 2014/06/15 20:03:57
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | PHP Version 5                                                        |     | PHP Version 5                                                        |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1997-2012 The PHP Group                                |   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |     | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |     | that is bundled with this package in the file LICENSE, and is        |
Line 180  php_stream_filter_status_t userfilter_filter( Line 180  php_stream_filter_status_t userfilter_filter(
         zval zpropname;          zval zpropname;
         int call_result;          int call_result;
   
           /* the userfilter object probably doesn't exist anymore */
           if (CG(unclean_shutdown)) {
                   return ret;
           }
   
         if (FAILURE == zend_hash_find(Z_OBJPROP_P(obj), "stream", sizeof("stream"), (void**)&zstream)) {          if (FAILURE == zend_hash_find(Z_OBJPROP_P(obj), "stream", sizeof("stream"), (void**)&zstream)) {
                 /* Give the userfilter class a hook back to the stream */                  /* Give the userfilter class a hook back to the stream */
                 ALLOC_INIT_ZVAL(zstream);                  ALLOC_INIT_ZVAL(zstream);
Line 259  php_stream_filter_status_t userfilter_filter( Line 264  php_stream_filter_status_t userfilter_filter(
          * from being destroyed properly */           * from being destroyed properly */
         INIT_ZVAL(zpropname);          INIT_ZVAL(zpropname);
         ZVAL_STRINGL(&zpropname, "stream", sizeof("stream")-1, 0);          ZVAL_STRINGL(&zpropname, "stream", sizeof("stream")-1, 0);
        Z_OBJ_HANDLER_P(obj, unset_property)(obj, &zpropname TSRMLS_CC);        Z_OBJ_HANDLER_P(obj, unset_property)(obj, &zpropname, 0 TSRMLS_CC);
   
         zval_ptr_dtor(&zclosing);          zval_ptr_dtor(&zclosing);
         zval_ptr_dtor(&zconsumed);          zval_ptr_dtor(&zconsumed);
Line 474  static void php_stream_bucket_attach(int append, INTER Line 479  static void php_stream_bucket_attach(int append, INTER
         } else {          } else {
                 php_stream_bucket_prepend(brigade, bucket TSRMLS_CC);                  php_stream_bucket_prepend(brigade, bucket TSRMLS_CC);
         }          }
        /* This is a hack necessary to accomodate situations where bucket is appended to the stream        /* This is a hack necessary to accommodate situations where bucket is appended to the stream
          * multiple times. See bug35916.phpt for reference.           * multiple times. See bug35916.phpt for reference.
          */           */
         if (bucket->refcount == 1) {          if (bucket->refcount == 1) {
Line 544  PHP_FUNCTION(stream_bucket_new) Line 549  PHP_FUNCTION(stream_bucket_new)
 PHP_FUNCTION(stream_get_filters)  PHP_FUNCTION(stream_get_filters)
 {  {
         char *filter_name;          char *filter_name;
        int key_flags, filter_name_len = 0;        int key_flags;
         uint filter_name_len = 0;
         HashTable *filters_hash;          HashTable *filters_hash;
         ulong num_key;          ulong num_key;
   
Removed from v.1.1  
changed lines
  Added in v.1.1.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>