Stanislav Malyshev
4b0b032676
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:09:31 -07:00
Stanislav Malyshev
62857998c5
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:09:09 -07:00
Matteo Beccati
8cfdf20ccf
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
...
DOMDocument::substituteEntities needs to be set to true in order for
external entities to be parsed.
2014-06-09 07:08:04 +02:00
Matteo Beccati
106b6faa7a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
2014-06-09 07:07:28 +02:00
Matteo Beccati
6eaadc0228
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
2014-06-09 07:07:17 +02:00
Matteo Beccati
af5057bea7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
2014-06-09 07:07:07 +02:00
Matteo Beccati
5c8c57aa6c
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
...
DOMDocument::substituteEntities needs to be set to true in order for
external entities to be parsed.
2014-06-09 07:05:23 +02:00
Stanislav Malyshev
d3eac6399b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update news
add news
Bug 49898 __getCookies() method implementation
2014-06-08 19:47:59 -07:00
Stanislav Malyshev
df03bcf135
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add news
Bug 49898 __getCookies() method implementation
2014-06-08 19:47:38 -07:00
Stanislav Malyshev
1b8d4695e2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add news
Bug 49898 __getCookies() method implementation
2014-06-08 19:46:12 -07:00
Boro Sitnikovski
aebb23e4db
Bug 49898
...
__getCookies() method implementation
2014-06-08 19:36:18 -07:00
Stanislav Malyshev
94b4748175
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Removed another cvsclean file
Removed cvsclean and svnclean tools
2014-06-08 19:29:26 -07:00
Sobak
00c362c1f6
Removed another cvsclean file
2014-06-08 19:28:06 -07:00
Stanislav Malyshev
9fceb05fcf
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Bug 64744 Show the type of the non-object for more descriptive errors
2014-06-08 19:18:09 -07:00
Boro Sitnikovski
cfccdc6362
Bug 64744
...
Show the type of the non-object for more descriptive errors
2014-06-08 19:14:58 -07:00
Stanislav Malyshev
f0462db11a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added support for parsing ssl certificates using GeneralizedTime format.
2014-06-08 14:20:07 -07:00
Stanislav Malyshev
3d9f922c03
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added support for parsing ssl certificates using GeneralizedTime format.
2014-06-08 14:19:50 -07:00
Stanislav Malyshev
4946dc1ab9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Added support for parsing ssl certificates using GeneralizedTime format.
2014-06-08 14:19:16 -07:00
Paul Oehler
76a7fd893b
Added support for parsing ssl certificates using GeneralizedTime format.
...
fix bug #65698
fix bug #66636
2014-06-08 14:17:58 -07:00
Stanislav Malyshev
f22f665b47
Merge remote-tracking branch 'github/pr/677'
...
* github/pr/677:
Test
Fix grammar #2683
2014-06-08 14:02:20 -07:00
Stanislav Malyshev
fce97414bc
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Remove superfluous echos.
2014-06-08 13:53:27 -07:00
Stanislav Malyshev
e35945490f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Remove superfluous echos.
2014-06-08 13:53:01 -07:00
Stanislav Malyshev
da6abc8db4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove superfluous echos.
2014-06-08 13:50:41 -07:00
Jeff Welch
5fd7c2b01d
Remove superfluous echos.
2014-06-08 13:50:22 -07:00
Ferenc Kovacs
2b36a2747d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
use ./tokenizer_data_gen.sh to for adding T_POW & T_POW_EQUAL
2014-06-08 00:18:33 +02:00
Ferenc Kovacs
1e2a4a67dd
use ./tokenizer_data_gen.sh to for adding T_POW & T_POW_EQUAL
2014-06-08 00:01:01 +02:00
Ferenc Kovacs
caf34bf189
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #67392 : token_name() does not return name for T_POW and T_POW_EQUAL token
2014-06-07 15:29:29 +02:00
Ferenc Kovacs
016b1f089e
Fix bug #67392 : token_name() does not return name for T_POW and T_POW_EQUAL token
2014-06-07 15:27:54 +02:00
Dmitry Stogov
dd0e96cca3
Bundle pcre-8.35 with sljit support
2014-06-06 18:46:19 +04:00
Dmitry Stogov
1593d942e7
Fixed compilation warnings
2014-06-05 20:58:21 +04:00
Dmitry Stogov
717839735f
Merge branch 'master' into phpng
...
* master: (29 commits)
drop exec perm on doc files
fix test for 5.4/5.5
restore correct behavior of DateTime
fix test use invalid code
add test for previous fix
NEWS
NEWS
NEWS
Fix regression introduce in fix for bug #67118
update news
update NEWS
Fix tests
Fix possible segfault depending on memory location...
Fixed startup segfault in non-debug builds Fixes issue #87
PHP 5.4/5.5 compability in phpdbg_watch.c
fix gcov data with some locales (again)
fix gcov data with some locales (again)
fix gcov data with some locales (again)
Update NEWS
Fixed startup segfault in non-debug builds Fixes issue #87
...
2014-06-05 20:54:50 +04:00
Remi Collet
b16950b5d3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test for 5.4/5.5
2014-06-05 17:34:32 +02:00
Remi Collet
67f1a58ac9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test for 5.4/5.5
2014-06-05 17:34:09 +02:00
Remi Collet
127651e9ae
fix test for 5.4/5.5
2014-06-05 17:33:40 +02:00
Remi Collet
f11f7f5601
restore correct behavior of DateTime
2014-06-05 14:04:44 +02:00
Dmitry Stogov
c1965f58d4
Use reference counting instead of zval duplication
2014-06-05 16:04:11 +04:00
Remi Collet
f1ef7018f0
fix test use invalid code
2014-06-05 14:01:20 +02:00
Remi Collet
aafbf93841
Merge branch 'PHP-5.6'
...
* PHP-5.6:
add test for previous fix
2014-06-05 14:00:40 +02:00
Remi Collet
218df7e058
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add test for previous fix
2014-06-05 14:00:29 +02:00
Remi Collet
ab848ea400
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add test for previous fix
2014-06-05 14:00:15 +02:00
Remi Collet
15d8c80ead
add test for previous fix
2014-06-05 14:00:00 +02:00
Remi Collet
2890284096
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
NEWS
NEWS
Fix regression introduce in fix for bug #67118
2014-06-05 13:47:14 +02:00
Remi Collet
2b3f4cc29e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
Fix regression introduce in fix for bug #67118
2014-06-05 13:46:41 +02:00
Remi Collet
9ea9064779
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fix regression introduce in fix for bug #67118
2014-06-05 13:45:57 +02:00
Remi Collet
1fe9f1e4f5
Fix regression introduce in fix for bug #67118
...
The fix was correct but break some code (at least in Horde)
This is a temporary workaround to fix regressioni in 5.4, 5.5 and 5.6
This make php_date_initialize more consistent
- on success return 1 + time initiliazed
- on failure return 0 + time = zero
which is check by DATE_CHECK_INITIALIZED by later method call
Will restore consistency with other date classes in master.
2014-06-05 13:39:46 +02:00
Dmitry Stogov
6e7338700e
Avoid useless merge
2014-06-04 02:11:26 +04:00
Anatol Belski
e2710310a0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed regression introduced by patch for bug #67072
2014-06-03 20:51:18 +02:00
Anatol Belski
20568e5028
Fixed regression introduced by patch for bug #67072
...
This applies to 5.4 and 5.5 only as a legacy fix.
2014-06-03 20:43:58 +02:00
Anatol Belski
2cdcf3e877
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files
2014-06-03 11:38:19 +02:00
Anatol Belski
f3f22ff5c6
Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files
2014-06-03 11:37:20 +02:00
Dmitry Stogov
3f6f0d5a70
Simplified and optimized ZEND_HANDLE_NUMERIC()
2014-06-03 13:10:42 +04:00
Remi Collet
7a00e8890b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
NEWS
NEWS
Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check
2014-06-03 11:10:08 +02:00
Remi Collet
e61f7727d4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check
2014-06-03 11:09:29 +02:00
Remi Collet
2d59b87527
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check
2014-06-03 11:09:04 +02:00
Remi Collet
4fcb9a9d1b
Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check
...
Upstream fix 6d209c1c48
.patch
Only revelant part applied
2014-06-03 11:05:00 +02:00
Dmitry Stogov
30c05577f7
Optimized conditions order
2014-06-03 03:54:03 +04:00
Dmitry Stogov
0427ae08fb
cleanup
2014-06-03 00:36:31 +04:00
Xinchen Hui
717b5661e7
Fixed merge
2014-06-01 23:14:31 +08:00
Xinchen Hui
91b2ddc816
Merge branch 'master' into phpng
...
Conflicts:
ext/spl/spl_array.c
ext/spl/spl_directory.c
ext/standard/formatted_print.c
2014-06-01 22:43:06 +08:00
Xinchen Hui
d196ac6a48
Merge branch 'PHP-5.6'
2014-06-01 19:42:53 +08:00
Xinchen Hui
c4e7c7d50e
Merge branch 'PHP-5.5' into PHP-5.6
2014-06-01 19:42:20 +08:00
Xinchen Hui
9bb5867fad
Merge branch 'PHP-5.4' into PHP-5.5
2014-06-01 19:41:35 +08:00
Xinchen Hui
38be99b739
Fixed bug #67359 (Segfault in recursiveDirectoryIterator)
2014-06-01 19:41:01 +08:00
Dmitry Stogov
45d7ab1a4c
Avoid in-place modification
2014-05-30 11:12:03 +04:00
Adam Harvey
f4a235c541
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Check for zero-length keys in spl_array_skip_protected and don't skip them.
added CVEs in NEWS
2014-05-29 17:57:54 +00:00
Adam Harvey
b8042acdde
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Check for zero-length keys in spl_array_skip_protected and don't skip them.
added CVEs in NEWS
2014-05-29 17:56:32 +00:00
Adam Harvey
43e3a83d51
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Check for zero-length keys in spl_array_skip_protected and don't skip them.
2014-05-29 17:53:28 +00:00
Adam Harvey
b5d9983ff4
Check for zero-length keys in spl_array_skip_protected and don't skip them.
...
Fixes bug #67360 (Missing element after ArrayObject::getIterator).
2014-05-29 17:49:32 +00:00
Dmitry Stogov
b3b616cf7e
Introduced immutable arrays. They don't need to be copyed and may be used directly from SHM.
2014-05-29 18:21:56 +04:00
Nikita Popov
bfff679d90
Fix length reset in JSON parser
2014-05-29 12:53:32 +02:00
Nikita Popov
ccd9dab4c6
Fix $http_response_header creation
2014-05-29 12:51:03 +02:00
Dmitry Stogov
8334f38615
Fixed conversion to phpng mistakes
2014-05-28 23:04:50 +04:00
Nikita Popov
9e2bc83fdb
Use zend_long_to_str in wddx
2014-05-28 18:55:51 +02:00
Nikita Popov
3831b39302
Use zval_get_string in implode
...
Also get rid of separate case for IS_OBJECT - this is already
handled by the default branch.
2014-05-28 18:45:00 +02:00
Nikita Popov
bf5a59d281
Use smart_str_append_long in implode
2014-05-28 18:39:41 +02:00
Nikita Popov
3f27d707d2
Use zend_long_to_str in curl
...
Also use STR_ADDREF instead of maintaining a numeric_key flag.
2014-05-28 18:34:35 +02:00
Nikita Popov
0987d19712
Use zend_long_to_str in pcntl
2014-05-28 18:26:11 +02:00
Dmitry Stogov
3419dc8c60
Use new zend_hash API
2014-05-28 18:12:52 +04:00
Dmitry Stogov
2af311bea3
Use new zend_hash API
2014-05-28 17:49:31 +04:00
Dmitry Stogov
4affab237d
Use new zend_hash API
2014-05-28 17:43:11 +04:00
Dmitry Stogov
b675492054
Use new zend_hash API
2014-05-28 17:30:05 +04:00
Dmitry Stogov
20f6dec6b6
Use new zend_hash API
2014-05-28 16:56:41 +04:00
Dmitry Stogov
aca34b127a
Use new zend_hash API
2014-05-28 14:09:42 +04:00
Dmitry Stogov
a1177760b4
Use extended iteration API to avoid in-place modification
2014-05-28 13:00:33 +04:00
Dmitry Stogov
2625f145c8
Use extended iteration API to avoid in-place modification
2014-05-28 12:39:27 +04:00
Dmitry Stogov
c9062917eb
Use new zend_hash API
2014-05-28 12:34:08 +04:00
Dmitry Stogov
a004c4fa80
Avoid in-place modification
2014-05-28 12:15:36 +04:00
Dmitry Stogov
e598aab273
Use new zend_hash API
2014-05-28 12:15:16 +04:00
Dmitry Stogov
066ea2204e
Avoid in-place modification
2014-05-28 10:15:15 +04:00
Dmitry Stogov
cf603fb960
Reference counter in phpng may have a bit different meaning and must not be the same
2014-05-28 02:16:21 +04:00
Dmitry Stogov
6c4b30eb07
Use new zend_hash API
2014-05-28 02:13:45 +04:00
Dmitry Stogov
2dce4cb06c
Avoid in-place conversion
2014-05-28 01:29:37 +04:00
Dmitry Stogov
864aa7746f
Fixed refcounting
2014-05-28 01:28:38 +04:00
Anatol Belski
412feff4be
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated libmagic.patch for 5.6+
updated libmagic.patch for 5.4+
2014-05-27 22:40:17 +02:00
Anatol Belski
fb991bd7fd
updated libmagic.patch for 5.6+
2014-05-27 22:39:54 +02:00
Anatol Belski
546797f329
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch for 5.4+
Conflicts:
ext/fileinfo/libmagic.patch
2014-05-27 22:38:02 +02:00
Anatol Belski
d2765e4b8c
updated libmagic.patch for 5.4+
2014-05-27 22:36:12 +02:00
Stanislav Malyshev
cca9f376f4
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update NEWS
Fix bug #67249 : printf out-of-bounds read
5.5.13 release date
2014-05-27 12:12:22 -07:00
Stanislav Malyshev
13a3826687
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
Fix bug #67249 : printf out-of-bounds read
5.5.13 release date
2014-05-27 12:11:59 -07:00
Stanislav Malyshev
a2f8c9c1ae
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
Fix bug #67249 : printf out-of-bounds read
2014-05-27 12:10:41 -07:00