diff options
| -rw-r--r-- | ext/mysql/php_mysql.c | 2 | ||||
| -rw-r--r-- | ext/wddx/wddx.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 916e7898f2..c15f0f392a 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -1257,7 +1257,7 @@ PHP_FUNCTION(mysql_result) return_value->value.str.val = (char *) safe_estrndup(sql_row[field_offset],return_value->value.str.len); } } else { - return_value->type = IS_UNSET; + return_value->type = IS_NULL; } } /* }}} */ diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index c255b8a6d5..0b500c6bb4 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -442,7 +442,7 @@ void php_wddx_serialize_var(wddx_packet *packet, zval *var, char *name) php_wddx_serialize_boolean(packet, var); break; - case IS_UNSET: + case IS_NULL: php_wddx_serialize_unset(packet); break; @@ -548,7 +548,7 @@ static void php_wddx_push_element(void *user_data, const char *name, const char ALLOC_ZVAL(ent.data); INIT_PZVAL(ent.data); - ent.data->type = IS_UNSET; + ZVAL_NULL(ent.data); wddx_stack_push((wddx_stack *)stack, &ent, sizeof(st_entry)); } else if (!strcmp(name, EL_ARRAY)) { |