diff options
Diffstat (limited to 'sapi/caudium/caudium.c')
| -rw-r--r-- | sapi/caudium/caudium.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sapi/caudium/caudium.c b/sapi/caudium/caudium.c index 6f6659508f..962b9acc92 100644 --- a/sapi/caudium/caudium.c +++ b/sapi/caudium/caudium.c @@ -165,7 +165,7 @@ INLINE static struct svalue *lookup_header(char *headername) sind = make_shared_string("env"); headers = low_mapping_string_lookup(REQUEST_DATA, sind); free_string(sind); - if(!headers || Z_TYPE_P(headers) != PIKE_T_MAPPING) return NULL; + if(!headers || headers->type != PIKE_T_MAPPING) return NULL; sind = make_shared_string(headername); value = low_mapping_string_lookup(headers->u.mapping, sind); free_string(sind); @@ -180,7 +180,7 @@ INLINE static char *lookup_string_header(char *headername, char *default_value) { struct svalue *head = NULL; THREAD_SAFE_RUN(head = lookup_header(headername), "header lookup"); - if(!head || Z_TYPE_P(head) != PIKE_T_STRING) + if(!head || head->type != PIKE_T_STRING) return default_value; return head->u.string->str; } @@ -192,7 +192,7 @@ INLINE static int lookup_integer_header(char *headername, int default_value) { struct svalue *head = NULL; THREAD_SAFE_RUN(head = lookup_header(headername), "header lookup"); - if(!head || Z_TYPE_P(head) != PIKE_T_INT) + if(!head || head->type != PIKE_T_INT) return default_value; return head->u.integer; } @@ -288,10 +288,10 @@ php_caudium_set_header(char *header_name, char *value, char *p) (int)(p - header_name)); s_headermap = low_mapping_string_lookup(REQUEST_DATA, ind); - if(!s_headermap || Z_TYPE_P(s_headermap) != PIKE_T_MAPPING) + if(!s_headermap || s_headermap->type != PIKE_T_MAPPING) { struct svalue mappie; - Z_TYPE(mappie) = PIKE_T_MAPPING; + mappie.type = PIKE_T_MAPPING; headermap = allocate_mapping(1); mappie.u.mapping = headermap; mapping_string_insert(REQUEST_DATA, ind, &mappie); @@ -302,7 +302,7 @@ php_caudium_set_header(char *header_name, char *value, char *p) soldval = low_mapping_string_lookup(headermap, hind); vallen = strlen(value); if(soldval != NULL && - Z_TYPE_P(soldval) == PIKE_T_STRING && + soldval->type == PIKE_T_STRING && soldval->u.string->size_shift == 0) { /* Existing, valid header. Prepend.*/ hval = begin_shared_string(soldval->u.string->len + 1 + vallen); @@ -314,7 +314,7 @@ php_caudium_set_header(char *header_name, char *value, char *p) hval = make_shared_string(value); } } - Z_TYPE(hsval) = PIKE_T_STRING; + hsval.type = PIKE_T_STRING; hsval.u.string = hval; mapping_string_insert(headermap, hind, &hsval); @@ -367,7 +367,7 @@ php_caudium_low_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) free_string(ind); push_int(SG(sapi_headers).http_response_code); - if(s_headermap && Z_TYPE_P(s_headermap) == PIKE_T_MAPPING) + if(s_headermap && s_headermap->type == PIKE_T_MAPPING) ref_push_mapping(s_headermap->u.mapping); else push_int(0); @@ -566,21 +566,21 @@ static void php_caudium_hash_environment(TSRMLS_D) sind = make_shared_string("env"); headers = low_mapping_string_lookup(REQUEST_DATA, sind); free_string(sind); - if(headers && Z_TYPE_P(headers) == PIKE_T_MAPPING) { + if(headers && headers->type == PIKE_T_MAPPING) { indices = mapping_indices(headers->u.mapping); for(i = 0; i < indices->size; i++) { ind = &indices->item[i]; val = low_mapping_lookup(headers->u.mapping, ind); - if(ind && Z_TYPE_P(ind) == PIKE_T_STRING && - val && Z_TYPE_P(val) == PIKE_T_STRING) { + if(ind && ind->type == PIKE_T_STRING && + val && val->type == PIKE_T_STRING) { int buf_len; buf_len = MIN(511, ind->u.string->len); strncpy(buf, ind->u.string->str, buf_len); buf[buf_len] = '\0'; /* Terminate correctly */ MAKE_STD_ZVAL(pval); - Z_TYPE_P(pval) = IS_STRING; - Z_STRLEN_P(pval) = val->u.string->len; - Z_STRVAL_P(pval) = estrndup(val->u.string->str, Z_STRLEN_P(pval)); + pval->type = IS_STRING; + pval->value.str.len = val->u.string->len; + pval->value.str.val = estrndup(val->u.string->str, pval->value.str.len); zend_hash_update(&EG(symbol_table), buf, buf_len + 1, &pval, sizeof(zval *), NULL); } @@ -590,8 +590,8 @@ static void php_caudium_hash_environment(TSRMLS_D) /* MAKE_STD_ZVAL(pval); - Z_TYPE_P(pval) = IS_LONG; - Z_LVAL_P(pval) = Ns_InfoBootTime(); + pval->type = IS_LONG; + pval->value.lval = Ns_InfoBootTime(); zend_hash_update(&EG(symbol_table), "SERVER_BOOTTIME", sizeof("SERVER_BOOTTIME"), &pval, sizeof(zval *), NULL); */ } @@ -688,7 +688,7 @@ static void php_caudium_module_main(php_caudium_request *ureq) VCWD_CHDIR_FILE(THIS->filename->str); #endif - Z_TYPE(file_handle) = ZEND_HANDLE_FILENAME; + file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = THIS->filename->str; file_handle.opened_path = NULL; file_handle.free_filename = 0; @@ -759,7 +759,7 @@ void f_php_caudium_request_handler(INT32 args) get_all_args("PHP4.Interpreter->run", args, "%S%m%O%*", &script, &request_data, &my_fd_obj, &done_callback); - if(Z_TYPE_P(done_callback) != PIKE_T_FUNCTION) + if(done_callback->type != PIKE_T_FUNCTION) Pike_error("PHP4.Interpreter->run: Bad argument 4, expected function.\n"); add_ref(request_data); add_ref(my_fd_obj); @@ -772,7 +772,7 @@ void f_php_caudium_request_handler(INT32 args) ind = make_shared_binary_string("my_fd", 5); raw_fd = low_mapping_string_lookup(THIS->request_data, ind); - if(raw_fd && Z_TYPE_P(raw_fd) == PIKE_T_OBJECT) + if(raw_fd && raw_fd->type == PIKE_T_OBJECT) { int fd = fd_from_object(raw_fd->u.object); if(fd == -1) |