4e0134c661
Fix bounds check in strip_tags()
2016-02-13 17:47:30 +01:00
6b0b29edd6
Fix #70720
2016-02-02 18:09:54 +01:00
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
ff7ed9021c
Fix #70720
2015-12-22 16:25:51 +01:00
bdb9c0da86
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add missing second argument for ucfirst to the proto
2015-07-07 15:49:44 +02:00
b6f5cb11a4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add missing second argument for ucfirst to the proto
2015-07-07 15:49:16 +02:00
29533ae528
add missing second argument for ucfirst to the proto
2015-07-07 15:48:55 +02:00
587ddf6ddc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list
Conflicts:
ext/standard/pack.c
2015-05-12 14:26:06 -07:00
c08f9c2c78
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list
Conflicts:
ext/pcntl/pcntl.c
ext/standard/basic_functions.c
ext/standard/pack.c
ext/standard/tests/dir/opendir_variation1-win32.phpt
2015-05-12 14:24:15 -07:00
c591f022f8
Fix bug #69403 and other int overflows
2015-05-10 02:20:08 -07:00
41bdd6e7cc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add mitigation for CVE-2015-0235 (bug #68925 )
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:12:20 -08:00
882a375dba
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:10:52 -08:00
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
0e09e5e6fa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65769 localeconv() broken in TS builds
2014-12-05 11:08:55 +01:00
7943f944c2
Fixed bug #65769 localeconv() broken in TS builds
2014-12-05 11:06:06 +01:00
18feaf9416
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-12 11:10:15 +08:00
8757e2cab8
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-12 11:08:50 +08:00
4fc0d46ae7
Fix for bug #34407 - ucwords and title case
...
Added support for ranges like trim() has
2014-07-12 10:44:11 +08:00
4827806b9e
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-02 22:35:00 +02:00
8c4156ed28
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-02 22:34:32 +02:00
3cc6bd10ac
Fix bug #67151 : strtr with empty array crashes
2014-07-02 22:33:20 +02:00
2aba2494f5
Merge branch 'PHP-5.5' into PHP-5.6
2014-04-09 07:34:49 +08:00
032921d80c
Fixed bug 67043
2014-04-09 07:33:55 +08:00
e424049840
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
substr_compare(): Allow zero length comparison
2014-02-28 23:48:34 +08:00
2e459be237
substr_compare(): Allow zero length comparison
...
Treat zero length comparison as always equal.
2014-02-28 23:45:04 +08:00
e5dd5d0ad4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
improved the fix for bug #66395
updated NEWS
Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
2014-01-05 19:13:15 +01:00
3bde9cfd8d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
improved the fix for bug #66395
2014-01-05 19:12:52 +01:00
3f7f72adb2
improved the fix for bug #66395
...
- fixed the traverse vulnerability in case like c:d:file.txt
- ensure paths containing NTFS streams are still worky
2014-01-05 19:05:04 +01:00
f0100261e1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:38:47 +01:00
d3a053d9f4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:32:39 +01:00
46f60fae22
Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:25:58 +01:00
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
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
Nikita Popov