--- active-2.11/ext/mysqli/php_mysqli.h 2009-12-02 15:06:42.000000000 +0100 +++ php-5.2.11/ext/mysqli/php_mysqli.h 2009-09-14 18:51:11.000000000 +0200 @@ -148,7 +148,7 @@ extern mysqli_property_entry mysqli_driver_property_entries[]; extern mysqli_property_entry mysqli_warning_property_entries[]; -extern void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flag, int into_object, short typed); +extern void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flag, int into_object); extern void php_clear_stmt_bind(MY_STMT *stmt); extern void php_clear_mysql(MY_MYSQL *); extern MYSQLI_WARNING *php_get_warnings(MYSQL *mysql); @@ -448,7 +448,6 @@ HashTable *report_ht; unsigned int multi_query; unsigned int embedded; - unsigned short typed; ZEND_END_MODULE_GLOBALS(mysqli) --- active-2.11/ext/mysqli/mysqli.c 2009-12-02 15:07:16.000000000 +0100 +++ php-5.2.11/ext/mysqli/mysqli.c 2009-02-17 11:40:18.000000000 +0100 @@ -62,42 +62,6 @@ mysqli_write_t write_func; } mysqli_prop_handler; -/* {{{ mysqli_cast */ -static int mysqli_cast(zval **data, MYSQL_FIELD *mysql_field, char *value TSRMLS_DC) { - - switch(mysql_field->type) { - case MYSQL_TYPE_DECIMAL: - case MYSQL_TYPE_TINY: - case MYSQL_TYPE_SHORT: - case MYSQL_TYPE_LONG: - case MYSQL_TYPE_TIMESTAMP: - case MYSQL_TYPE_LONGLONG: - case MYSQL_TYPE_INT24: - case MYSQL_TYPE_YEAR: - Z_TYPE_PP(data) = IS_LONG; - ZVAL_LONG(*data, atol(value)); - break; - -#if MYSQL_VERSION_ID >= 50000 - case MYSQL_TYPE_NEWDECIMAL: -#endif - case MYSQL_TYPE_FLOAT: - case MYSQL_TYPE_DOUBLE: - Z_TYPE_PP(data) = IS_DOUBLE; - ZVAL_DOUBLE(*data, zend_strtod(value, NULL)); - break; - - case MYSQL_TYPE_NULL: - Z_TYPE_PP(data) = IS_NULL; - break; - - default: - return 0; - } - return 1; -} -/* }}} */ - /* {{{ php_free_stmt_bind_buffer */ void php_free_stmt_bind_buffer(BIND_BUFFER bbuf, int type) { @@ -488,7 +452,6 @@ STD_PHP_INI_ENTRY("mysqli.default_port", "3306", PHP_INI_ALL, OnUpdateLong, default_port, zend_mysqli_globals, mysqli_globals) STD_PHP_INI_ENTRY("mysqli.default_socket", NULL, PHP_INI_ALL, OnUpdateStringUnempty, default_socket, zend_mysqli_globals, mysqli_globals) STD_PHP_INI_BOOLEAN("mysqli.reconnect", "0", PHP_INI_SYSTEM, OnUpdateLong, reconnect, zend_mysqli_globals, mysqli_globals) - STD_PHP_INI_BOOLEAN("mysqli.typed", "1", PHP_INI_SYSTEM, OnUpdateLong, typed, zend_mysqli_globals, mysqli_globals) PHP_INI_END() /* }}} */ @@ -873,7 +836,7 @@ /* {{{ php_mysqli_fetch_into_hash */ -void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags, int into_object, short typed) +void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags, int into_object) { MYSQL_RES *result; zval *mysql_result; @@ -943,7 +906,7 @@ if (PG(magic_quotes_runtime)) { Z_TYPE_P(res) = IS_STRING; Z_STRVAL_P(res) = php_addslashes(row[i], field_len[i], &Z_STRLEN_P(res), 0 TSRMLS_CC); - } else if(!typed || !mysqli_cast(&res, fields + i, row[i] TSRMLS_CC)) { + } else { ZVAL_STRINGL(res, row[i], field_len[i], 1); } --- active-2.11/ext/mysqli/mysqli_api.c 2009-12-02 14:53:56.000000000 +0100 +++ php-5.2.11/ext/mysqli/mysqli_api.c 2009-09-14 18:51:11.000000000 +0200 @@ -919,7 +919,7 @@ Get a result row as an enumerated array */ PHP_FUNCTION(mysqli_fetch_row) { - php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_NUM, 0, MyG(typed)); + php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_NUM, 0); } /* }}} */ --- active-2.11/ext/mysqli/mysqli_nonapi.c 2009-12-02 14:55:02.000000000 +0100 +++ php-5.2.11/ext/mysqli/mysqli_nonapi.c 2008-12-31 12:17:49.000000000 +0100 @@ -169,7 +169,7 @@ Fetch a result row as an associative array, a numeric array, or both */ PHP_FUNCTION(mysqli_fetch_array) { - php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 0, MyG(typed)); + php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 0); } /* }}} */ @@ -177,7 +177,7 @@ Fetch a result row as an associative array */ PHP_FUNCTION(mysqli_fetch_assoc) { - php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_ASSOC, 0, MyG(typed)); + php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_ASSOC, 0); } /* }}} */ @@ -185,7 +185,7 @@ Fetch a result row as an object */ PHP_FUNCTION(mysqli_fetch_object) { - php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_ASSOC, 1, MyG(typed)); + php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_ASSOC, 1); } /* }}} */ --- active-2.11/ext/session/session.c 2009-12-02 14:00:38.000000000 +0100 +++ php-5.2.11/ext/session/session.c 2009-07-28 10:54:23.000000000 +0200 @@ -1062,7 +1062,7 @@ ADD_HEADER("Expires: Thu, 19 Nov 1981 08:52:00 GMT"); /* For HTTP/1.1 conforming clients and the rest (MSIE 5) */ - ADD_HEADER("Cache-Control: private, no-store, no-cache, must-revalidate, post-check=0, pre-check=0"); + ADD_HEADER("Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0"); /* For HTTP/1.0 conforming clients */ ADD_HEADER("Pragma: no-cache"); --- active-2.11/ext/standard/html.c 2009-12-02 12:43:02.000000000 +0100 +++ php-5.2.11/ext/standard/html.c 2008-12-31 12:17:49.000000000 +0100 @@ -13,7 +13,7 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Authors: Rasmus Lerdorf | - | Jaakko Hyv?tti | + | Jaakko Hyvätti | | Wez Furlong | +----------------------------------------------------------------------+ */ @@ -714,13 +714,13 @@ static enum entity_charset determine_charset(char *charset_hint TSRMLS_DC) { int i; - enum entity_charset charset = cs_utf_8; + enum entity_charset charset = cs_8859_1; int len = 0; zval *uf_result = NULL; /* Guarantee default behaviour for backwards compatibility */ if (charset_hint == NULL) - return cs_utf_8; + return cs_8859_1; if ((len = strlen(charset_hint)) != 0) { goto det_charset; @@ -1269,7 +1269,7 @@ char *str, *hint_charset = NULL; int str_len, hint_charset_len = 0; int len; - long quote_style = ENT_QUOTES; + long quote_style = ENT_COMPAT; char *replaced; zend_bool double_encode = 1; @@ -1311,7 +1311,7 @@ { char *str, *new_str, *e, *p; int len, j, i, new_len; - long quote_style = ENT_QUOTES; + long quote_style = ENT_COMPAT; struct basic_entities_dec basic_entities_dec[8]; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &str, &len, "e_style) == FAILURE) { @@ -1377,7 +1377,7 @@ { char *str, *hint_charset = NULL; int str_len, hint_charset_len, len; - long quote_style = ENT_QUOTES; + long quote_style = ENT_COMPAT; char *replaced; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ls", &str, &str_len, @@ -1406,7 +1406,7 @@ Returns the internal translation table used by htmlspecialchars and htmlentities */ PHP_FUNCTION(get_html_translation_table) { - long which = HTML_SPECIALCHARS, quote_style = ENT_QUOTES; + long which = HTML_SPECIALCHARS, quote_style = ENT_COMPAT; int i, j; char ind[2]; enum entity_charset charset = determine_charset(NULL TSRMLS_CC); --- active-2.11/ext/standard/microtime.c 2009-12-23 06:36:57.000000000 +0100 +++ php-5.2.11/ext/standard/microtime.c 2009-05-21 16:21:53.000000000 +0200 @@ -52,7 +52,7 @@ #ifdef HAVE_GETTIMEOFDAY static void _php_gettimeofday(INTERNAL_FUNCTION_PARAMETERS, int mode) { - zend_bool get_as_float = 1; + zend_bool get_as_float = 0; struct timeval tp = {0}; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &get_as_float) == FAILURE) {