3c166c4758
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/gmp/gmp.c
2013-08-14 20:47:00 -07:00
39612afc72
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/dba/libinifile/inifile.c
2013-08-14 20:43:25 -07:00
9ad97cd489
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
2013-08-14 20:36:50 -07:00
14caf174ff
unify stdint type usage
...
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
1b06e0be96
typo fixes
2013-07-15 00:19:49 -07:00
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
bde0f1318a
Added warning for hex2bin() when input is invalid string
2013-07-08 19:14:45 +09:00
b29a9fa75d
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-21 11:14:36 +08:00
0fd3572f4e
Fixed bug #64432 (more empty delimiter warning in strX methods)
2013-03-21 11:14:10 +08:00
18e160411e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed build
NEWS for bug #63893
Conflicts:
NEWS
2013-01-15 22:39:49 +01:00
9498cf6194
fixed build
2013-01-15 22:36:29 +01:00
88b82ae54d
Merge branch 'strtr_wu94_54' into strtr_wu94_55
2013-01-15 17:26:24 +01:00
930ef9ddd6
Fixed inconsequential bug in strtr()
2013-01-15 17:25:59 +01:00
22390d3393
Add zend_qsort_r & use it in strtr
2013-01-14 17:24:16 +01:00
1ce5a22589
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-01-14 17:19:23 +01:00
d7bac4f5ba
Remove _GNU_SOURCE, add local heap sort
2013-01-14 17:06:52 +01:00
e5029ac40b
The compiler can figure this out
2013-01-14 12:22:42 +01:00
93d1171c47
Remove unused block
2013-01-14 12:22:42 +01:00
cddbb98ada
strtr() with 2nd param array - optimization
...
About a 1.25x speedup in my test script by writing the result string
only when a match is found and at the end instead of on each iteration.
2013-01-14 12:22:42 +01:00
2111ee3df5
Refactoring, bugs & leaks
2013-01-14 12:22:41 +01:00
ccf15cf2dc
Optimize strtr w/ 2nd arg array
...
Fixes bug #63893 : poor efficiency of strtr() using array with keys of
very different length.
The implementation is basically all new, which carries some risk with
it.
The algorithm is described in "A Fast Algorithm For Multi-Pattern
Searching" (1994) by Sun Wu and Udi Manber.
2013-01-14 12:22:41 +01:00
6deb8361f3
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-09 10:57:47 +08:00
15aaa9c660
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-09 10:54:23 +08:00
c05ee74e7f
Fixed bug #63943 (Bad warning text from strpos() on empty needle)
2013-01-09 10:53:20 +08:00
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
a2045ff332
Happy New Year~
2013-01-01 16:02:16 +08:00
01c3e0e62c
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Value stored to var is never used
2012-08-19 14:34:46 -03:00
9d8d84ebdf
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never used
2012-08-19 14:34:42 -03:00
50ab6c63a7
- Value stored to var is never used
2012-08-19 14:34:38 -03:00
3b0573363a
fix comment
2012-07-14 14:50:50 -07:00
582514d4c7
fix for bug#18556 - use simple tolower() function for internal things
2012-07-14 14:50:50 -07:00
5cf2f87fa7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix potential integer overflow in nl2br
Fix potential integer overflow in bin2hex
Conflicts:
ext/standard/string.c
2012-07-05 20:59:18 +02:00
157ddd9577
Fix potential integer overflow in nl2br
...
The buffer size was calculated manually, thus creating integer overflows
for very large inputs, e.g. nl2br(str_repeat("\n", 613566757)).
The code now uses safe_emalloc, thus making the code throw an error
instead of crashing.
2012-07-05 20:41:54 +02:00
88f46b162b
Fix potential integer overflow in bin2hex
...
The code was already using safe_emalloc but did the multiplication in
the first argument, thus making the use of safe_emalloc pretty useless.
The *2 is now moved to the second argument.
2012-07-05 20:14:49 +02:00
7ae93a2c4c
Fix bug #61660 : bin2hex(hex2bin($data)) != $data
...
If the input data has an odd length a warning is thrown and false is returned.
2012-04-08 22:38:21 +02:00
03f3d03ce0
MFH: Fix bug #60801 (strpbrk() mishandles NUL byte). (Trunk commit: r322934).
2012-03-02 03:39:04 +00:00
4fc6861030
MFH: Fix bug #60801 (strpbrk() mishandles NUL byte). (Trunk commit: r322934).
2012-03-02 03:39:04 +00:00
d102030b00
Fixed memory leak in substr_replace
2012-03-01 15:10:29 +00:00
cbcddcb02e
fix bug #55871 - Interruption in substr_replace()
2012-01-02 00:47:57 +00:00
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
4a25a7740d
Fixed ZE specific compile warnings (Bug #55629 )
2011-09-13 13:29:35 +00:00
a6a08dc322
Fixed bug #55366 : keys lost when using substr_replace an array
2011-08-29 21:35:28 +00:00
0e3b5b137c
Fixed bug #55366 : keys lost when using substr_replace an array
2011-08-29 20:38:52 +00:00
b52256c5be
add support for SORT_NATURAL and SORT_FLAG_CASE in array sort functions
2011-08-29 20:23:34 +00:00
9805e1674a
- remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ
2011-07-22 11:25:30 +00:00
76cbcc7f66
Added fabled hex2bin() function
2011-06-03 00:12:22 +00:00
a5eeecb13f
Suppress a dozen unused return value warnings in places where the return
...
value is really not useful to us.
2011-05-16 17:22:41 +00:00
Christopher Jones