Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Xinchen Hui
b3f6cc20e0
Merge branch 'PHP-5.4' into PHP-5.5
2013-05-09 15:57:44 +08:00
Xinchen Hui
699dc04c55
Missed SKIPIF
2013-05-09 15:57:25 +08:00
Anatol Belski
4091e94660
Fixed bug #64769 mbstring PHPTs crash on Windows x64
...
The tricky business going there in oniguruma is saving a pointer
in an int variable, passing that variable into a function and making
it a pointer again. On 64bit windows casting a pointer to a 32 bit
int will truncate that pointer. This kind of things won't work on
Windows x64.
[SNIPPET]
unsigned long ul0[2], ul1, *ul2;
ul0[0] = 42uL;
ul0[0] = 24uL;
ul1 = (unsigned long)ul0;
ul2 = (unsigned long *)ul1;
/* now it's broken, accessing ul2[0] will crash. */
[/SNIPPET]
To make it portable, ULONG_PTR should be used in this case.
In oniguruma this behaviour is to see at least in the following
codepath:
ext/mbstring/oniguruma/enc/unicode.c:10938
ext/mbstring/oniguruma/st.c:308
ext/mbstring/oniguruma/enc/unicode.c:10859
2013-05-08 19:22:37 +02:00
Xinchen Hui
69b80a93de
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-16 22:29:14 +08:00
Xinchen Hui
375e3c273b
Fix test failed after 0ea83ff847
2013-02-16 22:28:28 +08:00
Moriyoshi Koizumi
20eb33b321
mb_split() can now handle empty matches like preg_split() does.
2013-02-10 15:05:17 +09:00
Moriyoshi Koizumi
0ea83ff847
mb_split() can now handle empty matches like preg_split() does.
2013-02-10 15:04:23 +09:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Xinchen Hui
b936a815fb
Merge branch 'PHP-5.4'
2012-11-07 17:09:27 +08:00
Xinchen Hui
e222837f6e
Merge branch 'PHP-5.3' into PHP-5.4
2012-11-07 17:08:34 +08:00
Xinchen Hui
7fcbe4d546
Fixed bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On)
2012-11-07 17:05:24 +08:00
Xinchen Hui
610c7fbe7b
Remove executable permission on phpt
2012-10-10 10:27:49 +08:00
Xinchen Hui
6284ef112e
Fixed bug #63236 (Executable permission on various source files)
2012-10-09 13:28:31 +08:00
Xinchen Hui
e081c55fb5
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:31:31 +08:00
Xinchen Hui
e4a8fa6a15
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-09 13:29:51 +08:00
Xinchen Hui
4b152e5470
Merge branch 'PHP-5.4'
2012-10-10 10:32:38 +08:00
Xinchen Hui
75a2c0d715
Merge branch 'PHP-5.4'
2012-10-09 13:30:22 +08:00
Lars Strojny
352a1956b6
Allow null as a default value for length in mb_substr() and mb_strcut()
2012-09-02 15:02:26 +02:00
Lars Strojny
133f610bb1
Allow null as a default value for length in mb_substr() and mb_strcut()
2012-09-02 14:52:05 +02:00
Anatoliy Belsky
1a0c9ecaee
Fixed bug #61631 mbstring mail related tests fail
2012-04-10 12:23:07 +02:00
Anatoliy Belsky
58aa160ee4
Fixed bug #61631 mbstring mail related tests fail
2012-04-10 12:19:39 +02:00
Anatoliy Belsky
2ca49d39a3
Fixed bug #61631 mbstring mail related tests fail
2012-04-10 11:47:18 +02:00
Xinchen Hui
191df5bd06
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix test, and merge the modification from trunk
Conflicts:
ext/mbstring/tests/mb_eregi_replace.phpt
2012-03-22 17:33:23 +08:00
Xinchen Hui
df129ae7ea
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix test, and merge the modification from trunk
2012-03-22 17:31:15 +08:00
Xinchen Hui
523396cb28
Fix test, and merge the modification from trunk
2012-03-22 17:30:16 +08:00
Rui Hirokawa
5d64c94f35
MFH mb_ereg_replace_callback() for security enhancements.
2012-03-02 14:19:05 +00:00
Rasmus Lerdorf
bc8e8b3467
Fix tests that break if filter.default isn't set to unsafe_raw
2012-03-02 05:04:40 +00:00
Rasmus Lerdorf
f564921c15
Fix tests that break if filter.default isn't set to unsafe_raw
2012-03-02 05:04:40 +00:00
Lars Strojny
33a2c339bd
Test for null behavior with ext/mbstring functions
2012-02-01 14:43:52 +00:00
Rui Hirokawa
7ba37f7921
fixed failed tests (backport from PHP_5_4/trunk).
2012-01-14 09:07:10 +00:00
Felipe Pena
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
e92204821a
- Fix the fix (thanks Chris Jones!)
2011-11-22 19:18:34 +00:00
Felipe Pena
c446440235
- Fix the fix (thanks Chris Jones!)
2011-11-22 19:18:34 +00:00
Felipe Pena
16fbcf7188
- Fix the fix (thanks Chris Jones!)
2011-11-22 19:18:34 +00:00
Felipe Pena
f7048d0925
- Fixed possible crash in mb_ereg_search_init() using empty pattern
2011-11-21 19:15:18 +00:00
Felipe Pena
18768584e2
- Fixed possible crash in mb_ereg_search_init() using empty pattern
2011-11-21 19:15:18 +00:00
Felipe Pena
97659d4842
- Fixed possible crash in mb_ereg_search_init() using empty pattern
2011-11-21 19:15:18 +00:00
Xinchen Hui
3781026cb8
Comparison between pointer and integer
2011-11-21 06:07:43 +00:00
Xinchen Hui
034ba714cf
Comparison between pointer and integer
2011-11-21 06:07:43 +00:00
Antony Dovgal
75adcc8db0
backport the line from trunk and fix uninitialized variables
2011-11-19 13:23:16 +00:00
Antony Dovgal
51a4ae6576
backport the line from trunk and fix uninitialized variables
2011-11-19 13:23:16 +00:00
Xinchen Hui
601407aa25
Fixed bug #60306 (Characters lost while converting from cp936 to utf8)
2011-11-18 08:50:29 +00:00
Xinchen Hui
5008390304
Fixed bug #60306 (Characters lost while converting from cp936 to utf8)
2011-11-18 08:50:29 +00:00
Pierrick Charron
89104021b7
Remove unused variables in libmbfl
2011-11-18 06:27:27 +00:00
Pierrick Charron
ced34c975e
Remove unused variables in libmbfl
2011-11-18 06:27:27 +00:00
Xinchen Hui
0ac9b9b0ae
Fix tests
2011-11-08 06:35:07 +00:00