diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-03-01 16:27:47 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-03-01 16:27:47 +0000 |
| commit | 6f7619cf6fbfd24af6b90e437d4cde0b7ec33d41 (patch) | |
| tree | dd5a04cfcb5960c19638267d659daa056dcd938e /sapi/apache_hooks/php_apache.c | |
| parent | 9158218d3a76256de1adaffd185f1429631b8b20 (diff) | |
| download | php-git-6f7619cf6fbfd24af6b90e437d4cde0b7ec33d41.tar.gz | |
Unicode support: zstr union
Diffstat (limited to 'sapi/apache_hooks/php_apache.c')
| -rw-r--r-- | sapi/apache_hooks/php_apache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c index dff34bdad7..aaeaa76d6c 100644 --- a/sapi/apache_hooks/php_apache.c +++ b/sapi/apache_hooks/php_apache.c @@ -566,7 +566,7 @@ static void add_header_to_table(table *t, INTERNAL_FUNCTION_PARAMETERS) zval *first = NULL; zval *second = NULL; zval **entry, **value; - char *string_key; + zstr string_key; uint string_key_len; ulong num_key; @@ -584,7 +584,7 @@ static void add_header_to_table(table *t, INTERNAL_FUNCTION_PARAMETERS) while (zend_hash_get_current_data_ex(Z_ARRVAL_P(first), (void **)&entry, &pos) == SUCCESS) { switch(zend_hash_get_current_key_ex(Z_ARRVAL_P(first), &string_key, &string_key_len, &num_key, 0, &pos)) { case HASH_KEY_IS_STRING: - if (zend_hash_find(Z_ARRVAL_P(first), string_key, string_key_len, (void **)&value) == FAILURE) { + if (zend_hash_find(Z_ARRVAL_P(first), string_key.s, string_key_len, (void **)&value) == FAILURE) { zend_hash_move_forward_ex(Z_ARRVAL_P(first), &pos); continue; } @@ -595,9 +595,9 @@ static void add_header_to_table(table *t, INTERNAL_FUNCTION_PARAMETERS) convert_to_string_ex(value); if (replace) - ap_table_set(t, string_key, Z_STRVAL_PP(value)); + ap_table_set(t, string_key.s, Z_STRVAL_PP(value)); else - ap_table_merge(t, string_key, Z_STRVAL_PP(value)); + ap_table_merge(t, string_key.s, Z_STRVAL_PP(value)); break; case HASH_KEY_IS_LONG: |