branch off v1 as R_1_7

[m6w6/ext-http] / missing.c

diff --git a/missing.c b/missing.c
index 7f9fcd8771b71b58eeea9058e8585cef148838d4..65851bef9dd24d6571ffed3c666dec0230de2dae 100644 (file)
--- a/missing.c
+++ b/missing.c
@@ -1,33 +1,28 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
+#ifdef HAVE_CONFIG_H
+#      include "config.h"
+#endif
+
 #include "php.h"
 #include "missing.h"
 
-#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION == 0)
+#ifdef WONKY
 int zend_declare_property_double(zend_class_entry *ce, char *name, int name_length, double value, int access_type TSRMLS_DC)
 {
-       zval *property;
-
-       if (ce->type & ZEND_INTERNAL_CLASS) {
-               property = malloc(sizeof(zval));
-       } else {
-               ALLOC_ZVAL(property);
-       }
+       zval *property = pemalloc(sizeof(zval), ce->type & ZEND_INTERNAL_CLASS);
        INIT_PZVAL(property);
        ZVAL_DOUBLE(property, value);
        return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC);
@@ -35,24 +30,14 @@ int zend_declare_property_double(zend_class_entry *ce, char *name, int name_leng
 
 void zend_update_property_double(zend_class_entry *scope, zval *object, char *name, int name_length, double value TSRMLS_DC)
 {
-       zval *tmp;
-
-       ALLOC_ZVAL(tmp);
-       tmp->is_ref = 0;
-       tmp->refcount = 0;
+       zval *tmp = ecalloc(1, sizeof(zval));
        ZVAL_DOUBLE(tmp, value);
        zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC);
 }
 
 int zend_declare_property_bool(zend_class_entry *ce, char *name, int name_length, long value, int access_type TSRMLS_DC)
 {
-       zval *property;
-
-       if (ce->type & ZEND_INTERNAL_CLASS) {
-               property = malloc(sizeof(zval));
-       } else {
-               ALLOC_ZVAL(property);
-       }
+       zval *property = pemalloc(sizeof(zval), ce->type & ZEND_INTERNAL_CLASS);
        INIT_PZVAL(property);
        ZVAL_BOOL(property, value);
        return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC);
@@ -60,12 +45,19 @@ int zend_declare_property_bool(zend_class_entry *ce, char *name, int name_length
 
 void zend_update_property_bool(zend_class_entry *scope, zval *object, char *name, int name_length, long value TSRMLS_DC)
 {
-       zval *tmp;
+       zval *tmp = ecalloc(1, sizeof(zval));
+       ZVAL_BOOL(tmp, value);
+       zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC);
+}
 
+void zend_update_property_stringl(zend_class_entry *scope, zval *object, char *name, int name_length, char *value, int value_len TSRMLS_DC)
+{
+       zval *tmp;
+       
        ALLOC_ZVAL(tmp);
        tmp->is_ref = 0;
        tmp->refcount = 0;
-       ZVAL_BOOL(tmp, value);
+       ZVAL_STRINGL(tmp, value, value_len, 1);
        zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC);
 }