Rasmus Lerdorf
dc61ac998d
Finishing porting ext/imap to PHP7
...
All tests pass now
2015-01-20 15:43:08 -08:00
Derick Rethans
a3a529411e
Merge branch 'PHP-5.6'
2015-01-20 21:44:36 +00:00
Derick Rethans
1d09926e33
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-20 21:44:25 +00:00
Derick Rethans
8e19705a93
Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)
2015-01-20 21:44:19 +00:00
Stanislav Malyshev
73a5958e67
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix year
2015-01-20 13:27:51 -08:00
Stanislav Malyshev
cca3c8a985
fix year
2015-01-20 13:27:38 -08:00
Stanislav Malyshev
b2a254fe2d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
format
add CVE
2015-01-20 11:59:35 -08:00
Stanislav Malyshev
53b3db43ca
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
format
2015-01-20 11:57:50 -08:00
Stanislav Malyshev
04dcc705de
update NEWS
2015-01-20 11:57:39 -08:00
Stanislav Malyshev
b3b155ffe2
format
2015-01-20 11:57:17 -08:00
Stanislav Malyshev
295b42b76e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add CVE
2015-01-20 11:55:04 -08:00
Stanislav Malyshev
547f62ed2a
add CVE
2015-01-20 11:54:45 -08:00
Anatol Belski
fecbb0e7c2
don't error x86 compiler
2015-01-20 20:52:45 +01:00
Anatol Belski
44cbba100a
fix leaking of locale_string in TS build
...
actually more like an attempt as i see the leaks on travis,
but don't repro on my boxes
2015-01-20 20:52:44 +01:00
Stanislav Malyshev
65aba8bd71
Merge branch 'PHP-5.6'
...
* PHP-5.6:
add protection against nulls
Conflicts:
main/spprintf.c
2015-01-20 11:47:46 -08:00
Stanislav Malyshev
c9162147f2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add protection against nulls
2015-01-20 11:47:06 -08:00
Stanislav Malyshev
a3cb69d63e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add protection against nulls
2015-01-20 11:46:39 -08:00
Stanislav Malyshev
ef4896d956
add protection against nulls
2015-01-20 11:46:10 -08:00
Stanislav Malyshev
b16fdebcf8
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.4.38 next
Updated NEWS
Updated NEWS
Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
Fix bug #68799 : Free called on unitialized pointer
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
Conflicts:
ext/exif/exif.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
2015-01-20 10:41:59 -08:00
Stanislav Malyshev
e18ec95687
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.4.38 next
Fix bug #68799 : Free called on unitialized pointer
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
Conflicts:
ext/standard/var_unserializer.c
2015-01-20 10:40:39 -08:00
Stanislav Malyshev
e2744c51b6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.38 next
Fix bug #68799 : Free called on unitialized pointer
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
Conflicts:
configure.in
main/php_version.h
2015-01-20 10:40:11 -08:00
Stanislav Malyshev
8825311ce1
5.4.38 next
2015-01-20 10:38:33 -08:00
Anatol Belski
ea8415114a
fix premature freeing of BG(locale_string)
...
the returned string has to be refcounted
2015-01-20 16:54:04 +01:00
Julien Pauli
57162a97bc
Updated NEWS
2015-01-20 15:11:25 +01:00
Joshua Rogers
c9b25859f0
Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
2015-01-20 15:11:25 +01:00
Julien Pauli
b5e2661fb6
Updated NEWS
2015-01-20 15:09:59 +01:00
Julien Pauli
157508d87d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
2015-01-20 15:09:34 +01:00
Julien Pauli
a40e004553
Updated NEWS
2015-01-20 15:09:13 +01:00
Xinchen Hui
afa666f650
Optimized range
2015-01-20 22:02:11 +08:00
Joshua Rogers
df67c4e8bd
Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
2015-01-20 14:54:48 +01:00
Anatol Belski
8fb29d3f63
fix declaration
2015-01-20 11:30:03 +01:00
Stanislav Malyshev
e63f7b47e1
Merge branch 'bug68710' into PHP-5.4
...
* bug68710:
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
2015-01-20 01:02:26 -08:00
Stanislav Malyshev
fc6aa939f5
Merge branch 'bug68799' into PHP-5.4
...
* bug68799:
Fix bug #68799 : Free called on unitialized pointer
2015-01-20 01:00:11 -08:00
Xinchen Hui
47b7d90703
NUM_KEY is useless here
2015-01-20 16:51:20 +08:00
Dmitry Stogov
d975f63f73
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Update remaining octal 32-bit tests
2015-01-20 08:56:09 +03:00
Dmitry Stogov
8dc3c283b8
cleanup
2015-01-20 08:55:36 +03:00
Andrea Faulds
5c88d11243
Update remaining octal 32-bit tests
2015-01-20 05:54:13 +00:00
Xinchen Hui
6f67d5ad6e
Unused parse_arg_object_to_string
2015-01-20 12:02:54 +08:00
Xinchen Hui
8d60d37001
Unused var
2015-01-20 11:58:40 +08:00
Xinchen Hui
c369a03407
Use zend_string in case we will optimize them
2015-01-20 10:59:28 +08:00
Xinchen Hui
020610ee40
Remove addslashes_str
2015-01-20 10:11:48 +08:00
Derick Rethans
1ee7845f57
Merge branch 'PHP-5.6'
2015-01-19 22:59:41 +00:00
Derick Rethans
6f2f2ce5cf
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-19 22:59:31 +00:00
Derick Rethans
b0159431e3
Fixed bug #45081 (strtotime incorrectly interprets SGT time zone).
2015-01-19 22:59:24 +00:00
Sara Golemon
1010b0ea4f
Provide compiler hook for altering the AST pre-compilation.
2015-01-19 10:43:57 -08:00
Stanislav Malyshev
1fdd558e39
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #50224 where float without decimals were converted to integer
Updated NEWS for #68371
2015-01-19 10:05:57 -08:00
Xinchen Hui
1b53a99fbf
Remove dead codes
2015-01-19 10:46:59 -05:00
Xinchen Hui
da7d8f45b2
Optimized php_addslashes
2015-01-19 10:46:39 -05:00
Xinchen Hui
137a251a52
Merge branch 'master' of https://git.php.net/repository/php-src
2015-01-19 09:12:44 -05:00
Nikita Popov
5f0248304e
Revert "Remove static calls from incompatible $this context"
...
This reverts commit dc9991b167
2015-01-19 15:12:51 +01:00
