]> git.pld-linux.org Git - packages/php4.git/blame - php4-branch.diff
- tabs in preamble
[packages/php4.git] / php4-branch.diff
CommitLineData
c3ffe1fc
ER
1--- php-4.4.4/NEWS 2006-08-15 15:22:14.000000000 +0300
2+++ php4-STABLE-200608300830/NEWS 2006-08-28 23:32:27.000000000 +0300
3@@ -1,5 +1,15 @@
4 PHP 4 NEWS
5 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
6+?? ??? 2006, Version 4.4.5
7+- Fixed bug #38534 (segfault when calling setlocale() in userspace session
8+ handler). (Tony)
9+- Fixed bug #38450 (constructor is not called for classes used in userspace
10+ stream wrappers). (Tony)
11+- Fixed bug #38378 (wddx_serialize_value() generates no wellformed xml).
12+ (sj at sjaensch dot org, grzegorz dot nosek at netart dot pl, Tony).
13+- Fixed bug #37812 (aggregate_methods_by_list fails to take certain methods).
14+ (Hannes)
15+
16 17 Aug 2006, Version 4.4.4
17 - Fixed memory_limit on 64bit systems. (Stefan E.)
18 - Fixed overflow on 64bit systems in str_repeat() and wordwrap(). (Stefan E.)
c3ffe1fc
ER
19--- php-4.4.4/ext/standard/aggregation.c 2006-01-01 15:46:57.000000000 +0200
20+++ php4-STABLE-200608300830/ext/standard/aggregation.c 2006-08-26 17:33:01.000000000 +0300
21@@ -16,7 +16,7 @@
22 +----------------------------------------------------------------------+
23 */
24
25-/* $Id$ */
26+/* $Id$ */
27
28 #include "php.h"
29 #include "basic_functions.h"
30@@ -146,7 +146,7 @@
31 */
32 zend_hash_internal_pointer_reset(Z_ARRVAL_P(list_hash));
33 while (zend_hash_get_current_key_ex(Z_ARRVAL_P(list_hash), &func_name, &func_name_len, &num_key, 0, NULL) == HASH_KEY_IS_STRING) {
34- if (!strncmp(func_name, from_ce->name, MIN(func_name_len-1, from_ce->name_length)) ||
35+ if (!strncmp(func_name, from_ce->name, MAX(func_name_len-1, from_ce->name_length)) ||
36 func_name[0] == '_' ||
37 zend_hash_find(&from_ce->function_table, func_name, func_name_len, (void**)&function) == FAILURE) {
38 zend_hash_move_forward(Z_ARRVAL_P(list_hash));
c3ffe1fc
ER
39--- php-4.4.4/ext/standard/basic_functions.c 2006-06-29 01:09:09.000000000 +0300
40+++ php4-STABLE-200608300830/ext/standard/basic_functions.c 2006-08-28 23:32:42.000000000 +0300
41@@ -17,7 +17,7 @@
42 +----------------------------------------------------------------------+
43 */
44
45-/* $Id$ */
46+/* $Id$ */
47
48 #include "php.h"
49 #include "php_streams.h"
50@@ -1227,6 +1227,7 @@
51 setlocale(LC_CTYPE, "");
52 }
53 STR_FREE(BG(locale_string));
54+ BG(locale_string) = NULL;
55
56 /*
57 FG(stream_wrappers) are destroyed
c3ffe1fc
ER
58--- php-4.4.4/ext/standard/tests/strings/htmlentities15.phpt 2003-03-24 21:22:18.000000000 +0200
59+++ php4-STABLE-200608300830/ext/standard/tests/strings/htmlentities15.phpt 2006-08-27 19:33:35.000000000 +0300
60@@ -6,14 +6,14 @@
61 mbstring.internal_encoding=none
62 --SKIPIF--
63 <?php
64-$result = (bool)setlocale(LC_CTYPE, "ru_RU.koi8r");
65+$result = (bool)setlocale(LC_CTYPE, "ru_RU.koi8r", "ru_RU.KOI8-R");
66 if (!$result || preg_match('/koi8/i', setlocale(LC_CTYPE, 0)) == 0) {
67 die("skip setlocale() failed\n");
68 }
69 ?>
70 --FILE--
71 <?php
72-setlocale(LC_CTYPE, "ru_RU.koi8r");
73+setlocale(LC_CTYPE, "ru_RU.koi8r", "ru_RU.KOI8-R");
74