diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/fopen_wrappers.c | 1 | ||||
| -rw-r--r-- | main/main.c | 2 | ||||
| -rw-r--r-- | main/output.c | 33 | ||||
| -rw-r--r-- | main/php_logos.c | 2 | ||||
| -rw-r--r-- | main/php_output.h | 2 | ||||
| -rw-r--r-- | main/php_variables.c | 16 | ||||
| -rw-r--r-- | main/php_variables.h | 2 | ||||
| -rw-r--r-- | main/rfc1867.c | 10 | ||||
| -rw-r--r-- | main/spprintf.c | 3 | ||||
| -rw-r--r-- | main/streams/plain_wrapper.c | 1 |
10 files changed, 38 insertions, 34 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index 5f99096a92..4b2c0e8b24 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -312,7 +312,6 @@ PHPAPI FILE *php_fopen_with_path(char *filename, char *mode, char *path, char ** char *pathbuf, *ptr, *end; char *exec_fname; char trypath[MAXPATHLEN]; - struct stat sb; FILE *fp; int path_length; int filename_length; diff --git a/main/main.c b/main/main.c index e640ceb19e..1ae58af442 100644 --- a/main/main.c +++ b/main/main.c @@ -1926,7 +1926,7 @@ PHPAPI int php_handle_auth_data(const char *auth TSRMLS_DC) char *pass; char *user; - user = php_base64_decode(auth + 6, strlen(auth) - 6, NULL); + user = (char*)php_base64_decode((unsigned char*)auth + 6, strlen(auth) - 6, NULL); if (user) { pass = strchr(user, ':'); if (pass) { diff --git a/main/output.c b/main/output.c index 840eef42b7..1ca6c1b4d8 100644 --- a/main/output.c +++ b/main/output.c @@ -211,7 +211,7 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush TSRMLS { FILE *fp; fp = fopen("/tmp/ob_log", "a"); - fprintf(fp, "NestLevel: %d ObStatus: %d HandlerName: %s\n", OG(ob_nesting_level), status, OG(active_ob_buffer).handler_name); + fprintf(fp, "NestLevel: %d ObStatus: %d HandlerName: %s\n", OG(ob_nesting_level), status, OG(active_ob_buffer).handler_name.s); fclose(fp); } #endif @@ -270,7 +270,8 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush TSRMLS } to_be_destroyed_buffer = OG(active_ob_buffer).buffer; - to_be_destroyed_handler_name = OG(active_ob_buffer).handler_name; + /* FIXME: unicode support??? */ + to_be_destroyed_handler_name = OG(active_ob_buffer).handler_name.s; if (OG(active_ob_buffer).internal_output_handler && (final_buffer != OG(active_ob_buffer).internal_output_handler_buffer) && (final_buffer != OG(active_ob_buffer).buffer)) { @@ -361,17 +362,18 @@ PHPAPI void php_end_implicit_flush(TSRMLS_D) */ PHPAPI void php_ob_set_internal_handler(php_output_handler_func_t internal_output_handler, uint buffer_size, char *handler_name, zend_bool erase TSRMLS_DC) { - if (OG(ob_nesting_level)==0 || OG(active_ob_buffer).internal_output_handler || strcmp(OG(active_ob_buffer).handler_name, OB_DEFAULT_HANDLER_NAME)) { + /* FIXME: Unicode support??? */ + if (OG(ob_nesting_level)==0 || OG(active_ob_buffer).internal_output_handler || strcmp(OG(active_ob_buffer).handler_name.s, OB_DEFAULT_HANDLER_NAME)) { php_start_ob_buffer(NULL, buffer_size, erase TSRMLS_CC); } OG(active_ob_buffer).internal_output_handler = internal_output_handler; OG(active_ob_buffer).internal_output_handler_buffer = (char *) emalloc(buffer_size); OG(active_ob_buffer).internal_output_handler_buffer_size = buffer_size; - if (OG(active_ob_buffer).handler_name) { - efree(OG(active_ob_buffer).handler_name); + if (OG(active_ob_buffer).handler_name.s) { + efree(OG(active_ob_buffer).handler_name.s); } - OG(active_ob_buffer).handler_name = estrdup(handler_name); + OG(active_ob_buffer).handler_name.s = estrdup(handler_name); OG(active_ob_buffer).erase = erase; } /* }}} */ @@ -450,9 +452,9 @@ static int php_ob_init_named(uint initial_size, uint block_size, zend_uchar type OG(active_ob_buffer).internal_output_handler = NULL; if (type == IS_UNICODE) { /* FIXME: Unicode support??? */ - OG(active_ob_buffer).handler_name = eustrdup((handler_name.u && handler_name.u[0])?handler_name.u:(UChar*)OB_DEFAULT_HANDLER_NAME); + OG(active_ob_buffer).handler_name.u = eustrdup((handler_name.u && handler_name.u[0])?handler_name.u:(UChar*)OB_DEFAULT_HANDLER_NAME); } else { - OG(active_ob_buffer).handler_name = estrdup((handler_name.s && handler_name.s[0])?handler_name.s:OB_DEFAULT_HANDLER_NAME); + OG(active_ob_buffer).handler_name.s = estrdup((handler_name.s && handler_name.s[0])?handler_name.s:OB_DEFAULT_HANDLER_NAME); } OG(active_ob_buffer).erase = erase; OG(php_body_write) = php_b_body_write; @@ -595,7 +597,9 @@ static int php_ob_init(uint initial_size, uint block_size, zval *output_handler, */ static int php_ob_list_each(php_ob_buffer *ob_buffer, zval *ob_handler_array) { - add_next_index_string(ob_handler_array, ob_buffer->handler_name, 1); + TSRMLS_FETCH(); + + add_next_index_text(ob_handler_array, ob_buffer->handler_name, 1); return 0; } /* }}} */ @@ -625,7 +629,8 @@ PHP_FUNCTION(ob_list_handlers) */ static int php_ob_handler_used_each(php_ob_buffer *ob_buffer, char **handler_name) { - if (!strcmp(ob_buffer->handler_name, *handler_name)) { + /* FIXME: Unicode support??? */ + if (!strcmp(ob_buffer->handler_name.s, *handler_name)) { *handler_name = NULL; return 1; } @@ -638,10 +643,11 @@ static int php_ob_handler_used_each(php_ob_buffer *ob_buffer, char **handler_nam */ PHPAPI int php_ob_handler_used(char *handler_name TSRMLS_DC) { + /* FIXME: Unicode support??? */ char *tmp = handler_name; if (OG(ob_nesting_level)) { - if (!strcmp(OG(active_ob_buffer).handler_name, handler_name)) { + if (!strcmp(OG(active_ob_buffer).handler_name.s, handler_name)) { return 1; } if (OG(ob_nesting_level)>1) { @@ -995,6 +1001,7 @@ PHP_FUNCTION(ob_get_length) static int php_ob_buffer_status(php_ob_buffer *ob_buffer, zval *result) { zval *elem; + TSRMLS_FETCH(); MAKE_STD_ZVAL(elem); array_init(elem); @@ -1012,7 +1019,7 @@ static int php_ob_buffer_status(php_ob_buffer *ob_buffer, zval *result) add_assoc_long(elem, "type", PHP_OUTPUT_HANDLER_USER); } add_assoc_long(elem, "status", ob_buffer->status); - add_assoc_string(elem, "name", ob_buffer->handler_name, 1); + add_assoc_text(elem, "name", ob_buffer->handler_name, 1); add_assoc_bool(elem, "del", ob_buffer->erase); add_next_index_zval(result, elem); @@ -1048,7 +1055,7 @@ PHP_FUNCTION(ob_get_status) add_assoc_long(return_value, "type", PHP_OUTPUT_HANDLER_USER); } add_assoc_long(return_value, "status", OG(active_ob_buffer).status); - add_assoc_string(return_value, "name", OG(active_ob_buffer).handler_name, 1); + add_assoc_text(return_value, "name", OG(active_ob_buffer).handler_name, 1); add_assoc_bool(return_value, "del", OG(active_ob_buffer).erase); } } diff --git a/main/php_logos.c b/main/php_logos.c index bae3125635..ff7f425e4b 100644 --- a/main/php_logos.c +++ b/main/php_logos.c @@ -86,7 +86,7 @@ int php_info_logos(const char *logo_string TSRMLS_DC) sapi_add_header(content_header, len, 1); free(content_header); - PHPWRITE(logo_image->data, logo_image->size); + PHPWRITE((char*)logo_image->data, logo_image->size); return 1; } diff --git a/main/php_output.h b/main/php_output.h index 9c5e604391..579cae503c 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -75,7 +75,7 @@ typedef struct _php_ob_buffer { php_output_handler_func_t internal_output_handler; char *internal_output_handler_buffer; uint internal_output_handler_buffer_size; - char *handler_name; + zstr handler_name; zend_bool erase; } php_ob_buffer; diff --git a/main/php_variables.c b/main/php_variables.c index 0d61ebc0b4..c955787cae 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -57,7 +57,7 @@ PHPAPI void php_register_variable_safe(char *var, char *strval, int str_len, zva php_register_variable_ex(var, &new_entry, track_vars_array TSRMLS_CC); } -PHPAPI void php_u_register_variable_safe(UChar *var, UChar *strval, int32_t str_len, zval *track_vars_array TSRMLS_DC) +PHPAPI void php_u_register_variable_safe(UChar *var, UChar *strval, int str_len, zval *track_vars_array TSRMLS_DC) { zval new_entry; assert(strval != NULL); @@ -244,7 +244,7 @@ PHPAPI void php_u_register_variable_ex(UChar *var, zval *val, zval *track_vars_a UChar *p = NULL; UChar *ip; /* index pointer */ UChar *index; - int32_t var_len, index_len; + int var_len, index_len; zval *gpc_element, **gpc_element_p; zend_bool is_array; HashTable *symtable1=NULL; @@ -298,7 +298,7 @@ PHPAPI void php_u_register_variable_ex(UChar *var, zval *val, zval *track_vars_a if (is_array) { zstr escaped_index = NULL_ZSTR; UChar *index_s; - int32_t new_idx_len = 0; + int new_idx_len = 0; ip++; index_s = ip; @@ -402,9 +402,9 @@ SAPI_API SAPI_POST_HANDLER_FUNC(php_std_post_handler) if (val) { /* have a value */ if (UG(unicode)) { UChar *u_var, *u_val; - int32_t u_var_len, u_val_len; - int32_t var_len; - int32_t val_len; + int u_var_len, u_val_len; + int var_len; + int val_len; UErrorCode status1 = U_ZERO_ERROR, status2 = U_ZERO_ERROR; *val++ = '\0'; @@ -534,7 +534,7 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) var = php_strtok_r(res, separator, &strtok_buf); while (var) { - int32_t var_len; + int var_len; val = strchr(var, '='); if (val) { @@ -545,7 +545,7 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) if (UG(unicode)) { UChar *u_var, *u_val; - int32_t u_var_len, u_val_len; + int u_var_len, u_val_len; UErrorCode status = U_ZERO_ERROR; zend_convert_to_unicode(input_conv, &u_var, &u_var_len, var, var_len, &status); diff --git a/main/php_variables.h b/main/php_variables.h index ea45aaebbf..dc183d91f7 100644 --- a/main/php_variables.h +++ b/main/php_variables.h @@ -38,7 +38,7 @@ PHPAPI void php_register_variable(char *var, char *val, zval *track_vars_array T /* binary-safe version */ PHPAPI void php_register_variable_safe(char *var, char *val, int val_len, zval *track_vars_array TSRMLS_DC); PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_array TSRMLS_DC); -PHPAPI void php_u_register_variable_safe(UChar *var, UChar *strval, int32_t str_len, zval *track_vars_array TSRMLS_DC); +PHPAPI void php_u_register_variable_safe(UChar *var, UChar *strval, int str_len, zval *track_vars_array TSRMLS_DC); PHPAPI void php_u_register_variable_ex(UChar *var, zval *val, zval *track_vars_array TSRMLS_DC); int php_hash_environment(TSRMLS_D); diff --git a/main/rfc1867.c b/main/rfc1867.c index 1cea3b173f..abdcbd58f6 100644 --- a/main/rfc1867.c +++ b/main/rfc1867.c @@ -298,7 +298,7 @@ static void safe_php_register_variable_ex(char *var, zval *val, zval *track_vars } -static void safe_u_php_register_variable(UChar *var, UChar *str_val, int32_t str_len, zval *track_vars_array, zend_bool override_protection TSRMLS_DC) +static void safe_u_php_register_variable(UChar *var, UChar *str_val, int str_len, zval *track_vars_array, zend_bool override_protection TSRMLS_DC) { if (override_protection || !is_u_protected_variable(var TSRMLS_CC)) { php_u_register_variable_safe(var, str_val, str_len, track_vars_array TSRMLS_CC); @@ -324,7 +324,7 @@ static void register_http_post_files_variable(char *strvar, char *val, zval *htt } -static void register_u_http_post_files_variable(UChar *strvar, UChar *val, int32_t val_len, zval *http_post_files, zend_bool override_protection TSRMLS_DC) +static void register_u_http_post_files_variable(UChar *strvar, UChar *val, int val_len, zval *http_post_files, zend_bool override_protection TSRMLS_DC) { int register_globals = PG(register_globals); @@ -373,7 +373,7 @@ static inline UChar *php_ap_to_unicode(char *in, int32_t in_len, int32_t *out_le { UErrorCode status = U_ZERO_ERROR; UChar *buf; - int32_t buf_len = 0; + int buf_len = 0; UConverter *input_conv = UG(http_input_encoding_conv); if (!input_conv) { @@ -752,11 +752,11 @@ static char *php_ap_getword(char **line, char stop) } -static UChar *substring_u_conf(UChar *start, int32_t len, UChar quote TSRMLS_DC) +static UChar *substring_u_conf(UChar *start, int len, UChar quote TSRMLS_DC) { UChar *result = eumalloc(len + 2); UChar *resp = result; - int32_t i; + int i; for (i = 0; i < len; ++i) { if (start[i] == '\\' && (start[i + 1] == '\\' || (quote && start[i + 1] == quote))) { diff --git a/main/spprintf.c b/main/spprintf.c index bb357caca3..501c435875 100644 --- a/main/spprintf.c +++ b/main/spprintf.c @@ -208,8 +208,7 @@ static void xbuf_format_converter(int unicode, smart_str *xbuf, const char *fmt, register char *s = NULL; register UChar *u = NULL; char *q; - int s_len, s_unicode; - int32_t u_len; + int s_len, s_unicode, u_len; register int min_width = 0; int precision = 0; diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 4c685c4202..a8593c04bf 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -1160,7 +1160,6 @@ PHPAPI php_stream *_php_stream_fopen_with_path(char *filename, char *mode, char char *pathbuf, *ptr, *end; char *exec_fname; char trypath[MAXPATHLEN]; - struct stat sb; php_stream *stream; int path_length; int filename_length; |