X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_env_response.c;h=3dba5b9b116533c99a8e61ce5981370089d209d7;hp=6717fe543b9e573e5a060c56307c4c9c30198da7;hb=refs%2Fheads%2Fmaster;hpb=fd7a7d76453ead2dfe292fb2f6cb0228ec360a67 diff --git a/src/php_http_env_response.c b/src/php_http_env_response.c index 6717fe5..3dba5b9 100644 --- a/src/php_http_env_response.c +++ b/src/php_http_env_response.c @@ -18,21 +18,21 @@ static void set_option(zval *options, const char *name_str, size_t name_len, int if (EXPECTED(value_ptr)) { switch (type) { case IS_DOUBLE: - zend_update_property_double(Z_OBJCE_P(options), options, name_str, name_len, *(double *)value_ptr); + zend_update_property_double(Z_OBJCE_P(options), Z_OBJ_P(options), name_str, name_len, *(double *)value_ptr); break; case IS_LONG: - zend_update_property_long(Z_OBJCE_P(options), options, name_str, name_len, *(zend_long *)value_ptr); + zend_update_property_long(Z_OBJCE_P(options), Z_OBJ_P(options), name_str, name_len, *(zend_long *)value_ptr); break; case IS_STRING: - zend_update_property_stringl(Z_OBJCE_P(options), options, name_str, name_len, value_ptr, value_len); + zend_update_property_stringl(Z_OBJCE_P(options), Z_OBJ_P(options), name_str, name_len, value_ptr, value_len); break; case IS_ARRAY: case IS_OBJECT: - zend_update_property(Z_OBJCE_P(options), options, name_str, name_len, value_ptr); + zend_update_property(Z_OBJCE_P(options), Z_OBJ_P(options), name_str, name_len, value_ptr); break; } } else { - zend_update_property_null(Z_OBJCE_P(options), options, name_str, name_len); + zend_update_property_null(Z_OBJCE_P(options), Z_OBJ_P(options), name_str, name_len); } } else { convert_to_array(options); @@ -65,7 +65,7 @@ static zval *get_option(zval *options, const char *name_str, size_t name_len, zv zval *val = NULL; if (EXPECTED(Z_TYPE_P(options) == IS_OBJECT)) { - val = zend_read_property(Z_OBJCE_P(options), options, name_str, name_len, 0, tmp); + val = zend_read_property(Z_OBJCE_P(options), Z_OBJ_P(options), name_str, name_len, 0, tmp); } else if (EXPECTED(Z_TYPE_P(options) == IS_ARRAY)) { val = zend_symtable_str_find(Z_ARRVAL_P(options), name_str, name_len); } else { @@ -1205,7 +1205,7 @@ static PHP_METHOD(HttpEnvResponse, setContentDisposition) php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "a", &zdisposition), invalid_arg, return); - zend_update_property(Z_OBJCE_P(getThis()), getThis(), ZEND_STRL("contentDisposition"), zdisposition); + zend_update_property(Z_OBJCE_P(ZEND_THIS), Z_OBJ_P(ZEND_THIS), ZEND_STRL("contentDisposition"), zdisposition); RETVAL_ZVAL(getThis(), 1, 0); }