MFH: Bug #20433

diff --git a/ext/standard/file.h b/ext/standard/file.h
index fd2835d4a6583ae1cacdae5dc12572a7d1a18657..41a189cf095586abb133d13e5e8b5d6fdc37bb5e 100644 (file)
--- a/ext/standard/file.h
+++ b/ext/standard/file.h
@@ -112,8 +112,8 @@ php_meta_tags_token php_next_meta_token(php_meta_tags_data * TSRMLS_DC);
 typedef struct {
        int pclose_ret;
        size_t def_chunk_size;
-       int auto_detect_line_endings;
-       int default_socket_timeout;
+       long auto_detect_line_endings;
+       long default_socket_timeout;
        char *user_agent;
        char *user_stream_current_filename; /* for simple recursion protection */
 } php_file_globals;

diff --git a/main/php_globals.h b/main/php_globals.h
index bc34330a92b114d20aed8687b85eb37041533e20..d793dcb312dbe01ce9aaec00d930509bb3e7fbd2 100644 (file)
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -77,7 +77,7 @@ struct _php_core_globals {
        zend_bool display_errors;
        zend_bool display_startup_errors;
        zend_bool log_errors;
-       int       log_errors_max_len;
+       long      log_errors_max_len;
        zend_bool ignore_repeated_errors;
        zend_bool ignore_repeated_source;
        zend_bool report_memleaks;