Dmitry Stogov
ce2f024e9f
Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)
2014-01-13 18:05:21 +04:00
Dmitry Stogov
e141592da6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls)
2014-01-13 16:16:57 +04:00
Dmitry Stogov
9b74dc4a07
Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls)
2014-01-13 16:16:23 +04:00
Dmitry Stogov
f5182741a6
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
move common code into a function
2014-01-13 15:36:37 +04:00
Dmitry Stogov
3458dac342
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #66471 (Keep backward compatibility)
2014-01-13 15:36:06 +04:00
Dmitry Stogov
ca550248f1
Fixed bug #66471 (Keep backward compatibility)
2014-01-13 15:34:25 +04:00
Andrey Hristov
cf9966671c
Merge branch 'master' of git.php.net:php-src
2014-01-13 12:40:59 +02:00
Andrey Hristov
01d5e28057
move common code into a function
2014-01-13 12:40:39 +02:00
Dmitry Stogov
aab2e8eb7e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
2014-01-13 12:08:23 +04:00
Dmitry Stogov
d09d64c15c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
Conflicts:
NEWS
2014-01-13 12:07:50 +04:00
Dmitry Stogov
fcd75690fe
Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
2014-01-13 12:06:19 +04:00
Johannes Schlüter
82dfe1acc8
Merge branch 'PHP-5.6'
2014-01-10 16:04:29 +01:00
Johannes Schlüter
45d46d7edd
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-10 16:02:46 +01:00
Johannes Schlüter
98e06a10d3
fix encoding
2014-01-10 15:57:40 +01:00
Anatol Belski
9aaea81cfe
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed EOL in the test
2014-01-09 15:29:16 +01:00
Anatol Belski
ec89e6bfe2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed EOL in the test
2014-01-09 15:28:47 +01:00
Anatol Belski
4f115c0b7d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed EOL in the test
2014-01-09 15:28:09 +01:00
Anatol Belski
b8774519e2
fixed EOL in the test
2014-01-09 15:27:26 +01:00
Anatol Belski
3572a0482d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
added testcase from bug #65371
2014-01-09 15:25:18 +01:00
Anatol Belski
4fe9a5d611
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added testcase from bug #65371
2014-01-09 15:24:55 +01:00
Anatol Belski
418602adfb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added testcase from bug #65371
2014-01-09 15:24:31 +01:00
Anatol Belski
e927dbd1f6
added testcase from bug #65371
2014-01-09 15:23:49 +01:00
Dmitry Stogov
83b00bbd08
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
2014-01-09 13:50:12 +04:00
Dmitry Stogov
f16a4bc203
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
2014-01-09 13:49:54 +04:00
Dmitry Stogov
b5fbde9c5b
Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
2014-01-09 13:48:08 +04:00
Scott MacVicar
6fe34014f0
Merge branch 'PHP-5.6'
...
* PHP-5.6:
[libxml] Unit test for libxml_disable_entity_loader()
2014-01-06 17:06:33 +00:00
Scott MacVicar
28beaaad9c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
[libxml] Unit test for libxml_disable_entity_loader()
2014-01-06 17:05:34 +00:00
Scott MacVicar
42f084c692
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
[libxml] Unit test for libxml_disable_entity_loader()
2014-01-06 17:05:16 +00:00
Scott MacVicar
24cc7c0be2
[libxml] Unit test for libxml_disable_entity_loader()
...
Summary:
Test to make sure libxml_disable_entity_loader() is behaving.
2014-01-06 17:04:54 +00:00
Anatol Belski
e797e058c5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
one more extension for the basename test
2014-01-05 19:22:11 +01:00
Anatol Belski
61e1f79585
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
one more extension for the basename test
2014-01-05 19:21:49 +01:00
Anatol Belski
748e707bf9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
one more extension for the basename test
2014-01-05 19:21:27 +01:00
Anatol Belski
1c586d4070
one more extension for the basename test
2014-01-05 19:19:54 +01:00
Anatol Belski
ac875f8f7e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
improved the fix for bug #66395
Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
updated NEWS
Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
2014-01-05 19:13:40 +01:00
Anatol Belski
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
Anatol Belski
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
Anatol Belski
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
Anatol Belski
b502c0a3dc
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:39:17 +01:00
Anatol Belski
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
Anatol Belski
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
Anatol Belski
46f60fae22
Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:25:58 +01:00
Xinchen Hui
b209c27302
Merge branch 'PHP-5.6'
2014-01-03 11:37:32 +08:00
Xinchen Hui
4e2ae5f5ca
Here need to be str_efree
...
found by ext/standard/tests/general_functions/phpinfo2.php fails
2014-01-03 11:36:50 +08:00
Xinchen Hui
af6c11c5f0
Bump year
2014-01-03 11:11:57 +08:00
Xinchen Hui
0f53e37494
Merge branch 'PHP-5.6'
2014-01-03 11:09:07 +08:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Derick Rethans
63d390cdf9
Merge branch 'PHP-5.6'
2014-01-02 12:47:52 +00:00
Derick Rethans
110b7dcfb8
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-02 12:47:44 +00:00
Derick Rethans
5137cb5f0c
Fixed (some of) add/sub.
...
This worked in PHP 5.4 already, but with the introduction of DateTimeImmutable
this code was not correctly merged.
2014-01-02 12:45:48 +00:00
Derick Rethans
dee77f237c
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2014-01-02 10:57:46 +00:00
Felipe Pena
57a6209051
Merge branch 'PHP-5.6'
...
* PHP-5.6:
- Fixed bug #66381 (__ss_family was changed on AIX 5.3)
2014-01-01 09:57:03 -02:00
Felipe Pena
37897e258d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Fixed bug #66381 (__ss_family was changed on AIX 5.3)
2014-01-01 09:56:49 -02:00
Felipe Pena
49cdde7326
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
2014-01-01 09:56:31 -02:00
Felipe Pena
5967fb194f
- Fixed bug #66381 (__ss_family was changed on AIX 5.3)
2014-01-01 09:55:14 -02:00
Nikita Popov
73db3cda8b
Merge branch 'PHP-5.6'
2013-12-30 14:41:45 +01:00
Nikita Popov
5408f1e5a6
Throw warning when converting invalid string to GMP
2013-12-30 14:38:09 +01:00
Nikita Popov
056f3441fd
Merge branch 'PHP-5.6'
2013-12-30 13:59:55 +01:00
Nikita Popov
71a36fb6ae
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-30 13:58:29 +01:00
Nikita Popov
c7ee97eea0
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-30 13:54:58 +01:00
Nikita Popov
3b6afb1bd6
Fix leak caused by fix to bug #65667
...
ftp->stream is now closed in the ftp resource dtor.
2013-12-30 13:53:12 +01:00
Remi Collet
a3c7971f94
Merge branch 'PHP-5.6'
...
* PHP-5.6:
missing file from libzip 0.11.2
2013-12-30 10:00:19 +01:00
Remi Collet
33ef788abd
missing file from libzip 0.11.2
2013-12-30 10:00:02 +01:00
Remi Collet
7844fb292c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix compat for PHP ABI changes
2013-12-30 08:47:23 +01:00
Remi Collet
3a492cf686
fix compat for PHP ABI changes
2013-12-30 08:47:16 +01:00
Remi Collet
764190c1d6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Sync with pecl/zip 1.12.4dev
2013-12-30 07:38:45 +01:00
Remi Collet
0a950a0500
Sync with pecl/zip 1.12.4dev
...
- update bunled libzip to 0.11.2
- expose zip_file_set_external_attributes + zip_file_get_external_attributes
with new methods:
ZipArchive::setExternalAttributesName
ZipArchive::setExternalAttributesIndex
ZipArchive::getExternalAttributesName
ZipArchive::getExternalAttributesIndex
2013-12-30 07:35:30 +01:00
Xinchen Hui
6b34343479
Merge branch 'PHP-5.6'
2013-12-30 11:07:42 +08:00
Xinchen Hui
5a756afcf1
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-30 11:07:37 +08:00
Xinchen Hui
ed5be4f7ad
Fix test fail
2013-12-30 11:07:25 +08:00
Xinchen Hui
8b72df0608
Merge branch 'PHP-5.6'
2013-12-30 10:58:56 +08:00
Xinchen Hui
31d4d11432
Fix one more test in dos style eol
2013-12-30 10:58:40 +08:00
Xinchen Hui
f204df9a7f
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-30 10:58:23 +08:00
Xinchen Hui
6699b1f8ea
Fix dos style eol in phpts
2013-12-30 10:58:01 +08:00
Xinchen Hui
408ae9a452
Merge branch 'PHP-5.6'
2013-12-30 10:52:21 +08:00
Xinchen Hui
a88543a106
Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend)
2013-12-30 10:51:47 +08:00
Xinchen Hui
04c8ce259f
Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend)
...
Use git blame -w to ingore the space changes
2013-12-30 10:50:46 +08:00
Remi Collet
bd3e5aab1d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
minor fix on previous
2013-12-28 14:29:38 +01:00
Remi Collet
809eb77689
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
minor fix on previous
2013-12-28 14:29:27 +01:00
Remi Collet
464c219ed4
minor fix on previous
2013-12-28 14:29:14 +01:00
Remi Collet
8785e22bca
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
2013-12-28 14:26:24 +01:00
Remi Collet
46809869a3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
2013-12-28 14:26:06 +01:00
Remi Collet
8f4a5373bb
Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
...
Initial fix was PHP stuff
This one is libgd fix.
- filter invalid crop size
- dont try to copy on invalid position
- fix crop size when out of src image
- fix possible NULL deref
- fix possible integer overfloow
2013-12-28 14:22:13 +01:00
Xinchen Hui
1a4863d560
Merge branch 'PHP-5.6'
2013-12-27 14:07:15 +08:00
Xinchen Hui
04a52443e7
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
main/php_version.h
2013-12-27 14:06:35 +08:00
Xinchen Hui
2938329ce1
Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
...
And also fixed the bug: arguments are altered after some calls
2013-12-27 14:04:59 +08:00
Dmitry Stogov
65fd18fd88
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings).
Conflicts:
NEWS
Zend/zend_extensions.h
Zend/zend_modules.h
2013-12-26 14:51:05 +04:00
Dmitry Stogov
03a37de9b3
Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings).
2013-12-26 14:47:13 +04:00
Anatol Belski
734c28d242
Merge branch 'PHP-5.6'
...
* PHP-5.6:
brought the ext/sybase_ct/config.w32 up to date
2013-12-25 23:31:17 +01:00
Anatol Belski
9f9179cc62
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
brought the ext/sybase_ct/config.w32 up to date
2013-12-25 23:30:59 +01:00
Anatol Belski
5b0620831c
brought the ext/sybase_ct/config.w32 up to date
2013-12-25 23:29:42 +01:00
Xinchen Hui
03e36cd5b8
Merge branch 'PHP-5.6'
2013-12-25 15:35:02 +08:00
Xinchen Hui
d316040857
Fix test
2013-12-25 15:34:39 +08:00
Joe Watkins
ca8ff0725b
update credits
2013-12-24 09:04:32 +00:00
Joe Watkins
e538c1ad3f
update credits headers
2013-12-24 09:03:22 +00:00
Dmitry Stogov
67eccf8617
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable)
2013-12-23 16:54:54 +04:00
Dmitry Stogov
a00e7f22d2
Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable)
2013-12-23 16:53:34 +04:00
Dmitry Stogov
209ec406ca
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry)
2013-12-23 16:05:18 +04:00
Dmitry Stogov
ccb29a6e41
Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry)
2013-12-23 16:04:10 +04:00
Dmitry Stogov
62fa84a031
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added suggestion about opcache.revalidate_freq setting in development environment
2013-12-23 13:11:22 +04:00
Dmitry Stogov
8650d2dda6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added suggestion about opcache.revalidate_freq setting in development environment
2013-12-23 13:10:42 +04:00
Dmitry Stogov
f7b6db7555
Added suggestion about opcache.revalidate_freq setting in development environment
2013-12-23 13:09:45 +04:00
Dmitry Stogov
5bc9e006e8
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed Issue #140 : "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
fix news
opcodes
opcodes
Conflicts:
NEWS
2013-12-23 12:52:27 +04:00
Dmitry Stogov
f5c200fce9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Issue #140 : "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
opcodes
2013-12-23 12:50:42 +04:00
Dmitry Stogov
0dcaf0f445
Fixed Issue #140 : "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
2013-12-23 12:46:30 +04:00
krakjoe
2a1b60569f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
stop warnings from unused opcode map
- BFN
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
Included new .c file in build too
Fixed little typo in zend_vm_gen.php
Moved to new file, killing a lot of warnings
2013-12-22 13:11:20 +00:00
Felipe Pena
e700cbff22
Merge branch 'PHP-5.6'
...
* PHP-5.6:
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
2013-12-22 09:43:29 -02:00
Felipe Pena
9f1075bb29
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
2013-12-22 09:43:10 -02:00
Felipe Pena
8e36d36ee6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
2013-12-22 09:42:58 -02:00
Felipe Pena
a056113586
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
2013-12-22 09:42:45 -02:00
Christopher Jones
794df91c35
Align 'configure --help' columns
2013-12-20 10:02:46 -08:00
Bob Weinand
f500be8838
Merge branch 'PHP-5.6'
2013-12-20 14:35:40 +01:00
Boris Lytochkin
285c0bcec0
Merge branch '5.5' into 5.6
...
* 5.5:
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
2013-12-20 00:39:15 +04:00
Boris Lytochkin
b65bd30e89
Merge branch '5.4' into 5.5
...
* 5.4:
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
2013-12-20 00:26:34 +04:00
Boris Lytochkin
bb51d0e4c0
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
2013-12-20 00:25:16 +04:00
Derick Rethans
d4f4b66d43
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-19 19:01:00 +00:00
Derick Rethans
7a402ca51e
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-19 18:58:45 +00:00
Derick Rethans
e881334e49
- Updated to version 2013.9 (2013i)
2013-12-19 18:58:44 +00:00
Remi Collet
f6ffecbd2d
save a few memory
2013-12-19 10:55:26 +01:00
Remi Collet
99b91f98b1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19 10:54:06 +01:00
Remi Collet
32d1d5fb59
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19 10:53:50 +01:00
Remi Collet
20eb8e4d11
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19 10:53:38 +01:00
Bob Weinand
b11b3d201f
Fixed ZTS build. Needed to bump API version number.
2013-12-18 16:44:20 +01:00
Dmitry Stogov
26096aa73f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.
2013-12-18 19:22:05 +04:00
Dmitry Stogov
436ca2d019
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.
Conflicts:
NEWS
2013-12-18 19:21:21 +04:00
Dmitry Stogov
16e95d9137
Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.
2013-12-18 19:19:53 +04:00
Kalle Sommer Nielsen
aed4b086ac
Eliminate the TSRMLS_FETCH() calls in the ticks functions and hook
2013-12-18 09:32:26 +01:00
Kalle Sommer Nielsen
c83598119b
Kill a TSRMLS_FETCH() in php_stream_context_set() by passing TSRMLS_CC to it
...
# For mysqlnd: Relevant PHP_API_VERSION are put in place for cross version compatibility
2013-12-18 09:19:24 +01:00
Kalle Sommer Nielsen
2eb9bd316d
Merge branch 'master' of https://git.php.net/push/php-src
2013-12-18 07:27:14 +01:00
Kalle Sommer Nielsen
d14670ccdb
Eliminate another TSRMLS_FETCH() in i_zend_is_true()
...
# Affected extensions have all been updated, ext/opcache and ext/zip
# both have macros for cross version compatibility
2013-12-18 07:25:05 +01:00
Anatol Belski
c0f1e6946d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed possibly uninitialized value usage
2013-12-17 08:45:49 +01:00
Anatol Belski
beed28844b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed possibly uninitialized value usage
2013-12-17 08:45:30 +01:00
Anatol Belski
5e5ecaea6e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed possibly uninitialized value usage
2013-12-17 08:45:07 +01:00
Anatol Belski
2303d0ea22
fixed possibly uninitialized value usage
2013-12-17 08:44:22 +01:00
Xinchen Hui
a9c503bc27
Merge branch 'PHP-5.6'
2013-12-17 15:10:56 +08:00
Xinchen Hui
eeb37c40e6
Save one char compare
2013-12-17 15:09:52 +08:00
Xinchen Hui
ac719610f4
Merge branch 'PHP-5.6'
2013-12-17 15:06:36 +08:00
Xinchen Hui
143ae34f29
Fixed test failed after rev 57c1335f
2013-12-17 15:05:31 +08:00
Stanislav Malyshev
5613d70ee8
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #65873 - Integer overflow in exif_read_data()
2013-12-16 11:38:00 -08:00
Stanislav Malyshev
de4a2c3cbd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #65873 - Integer overflow in exif_read_data()
2013-12-16 11:37:29 -08:00
Stanislav Malyshev
57408f9c85
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65873 - Integer overflow in exif_read_data()
2013-12-16 11:36:33 -08:00
Stanislav Malyshev
cbcf6e1880
Fix bug #65873 - Integer overflow in exif_read_data()
2013-12-16 11:34:24 -08:00
Dmitry Stogov
a67c615799
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Fix tests expecting specific resource IDs
fixed parameter order for zend_throw_exception_ex call
Fix doc (svn -> git)
Updated release process
2013-12-16 13:13:29 +04:00
Dmitry Stogov
43f11165b8
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
Fix tests expecting specific resource IDs
fixed parameter order for zend_throw_exception_ex call
Fix doc (svn -> git)
Test pushing
Updated release process
2013-12-16 13:13:18 +04:00
Dmitry Stogov
82d67af60d
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Fix tests expecting specific resource IDs
fixed parameter order for zend_throw_exception_ex call
Fix doc (svn -> git)
Fix tests expecting specific resource IDs
Test pushing
Updated release process
2013-12-16 13:12:55 +04:00
Xinchen Hui
5eb8d9d700
Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6
2013-12-15 16:55:29 +08:00
Xinchen Hui
7cf6f012b1
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
2013-12-15 16:55:11 +08:00
Xinchen Hui
10964b7854
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-15 16:51:32 +08:00
Eric Stenson
330168a247
Fix tests expecting specific resource IDs
...
When Wincache or APC are installed, the resource IDs are not the same.
This is because Wincache takes a few resource objects for itself. As a
result, these tests become false positives.
On Windows boxes, the microtime precision is not granular enough
to reliably register a difference if two calls to uniqid() are made
concurrently. This is a fix to the uniqid() test to avoid the false
positive when run on Windows machines. Also, added a test to exercise
the 'more_entropy' variant of uniqid().
2013-12-15 16:51:21 +08:00
Xinchen Hui
304d97933f
Merge branch 'issue-phpt-resourceid-wincache' of https://github.com/EricSten/php-src
2013-12-15 16:26:11 +08:00
Anatol Belski
fc4761a07c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed parameter order for zend_throw_exception_ex call
Fix doc (svn -> git)
Test pushing
2013-12-14 20:48:44 +01:00
Anatol Belski
904721189f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed parameter order for zend_throw_exception_ex call
Fix doc (svn -> git)
2013-12-14 20:47:37 +01:00
Anatol Belski
509a67d28f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed parameter order for zend_throw_exception_ex call
Fix doc (svn -> git)
2013-12-14 20:46:43 +01:00
Anatol Belski
68a73ce3c4
fixed parameter order for zend_throw_exception_ex call
2013-12-14 20:43:02 +01:00
Eric Stenson
50377b5bf2
Fix tests expecting specific resource IDs
...
When Wincache or APC are installed, the resource IDs are not the same.
This is because Wincache takes a few resource objects for itself. As a
result, these tests become false positives.
On Windows boxes, the microtime precision is not granular enough
to reliably register a difference if two calls to uniqid() are made
concurrently. This is a fix to the uniqid() test to avoid the false
positive when run on Windows machines. Also, added a test to exercise
the 'more_entropy' variant of uniqid().
2013-12-13 10:42:32 -08:00
Dmitry Stogov
af66b20781
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
Use zend_error_noreturn here
OCI8 build change: Fix source variable definition for C89 compatibility
Add Tests for #65784 in 5.5
Disallowed JMP into a finally block.
Update NEWS for 5.5.7 release
Fixed bug #65784 (Segfault with finally).
2013-12-13 11:17:50 +04:00
Dmitry Stogov
9b829c92b5
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Use zend_error_noreturn here
OCI8 build change: Fix source variable definition for C89 compatibility
Kill another TSRMLS_FETCH() in zend_indent()
Eliminate another straight forward TSRMLS_FETCH() in zend_startup_module()
Fix build
Add Tests for #65784 in 5.5
Disallowed JMP into a finally block.
Update NEWS for 5.5.7 release
Fixed bug #65784 (Segfault with finally).
2013-12-13 11:15:38 +04:00
Christopher Jones
bc748ba38c
OCI8 build change: Fix source variable definition for C89 compatibility
2013-12-12 15:22:55 -08:00
Kalle Sommer Nielsen
0fc8e6af0a
Eliminate another straight forward TSRMLS_FETCH() in zend_startup_module()
...
# For THTTPD:
# The code that uses a call to this function is for older versions of PHP anyway so its not covered
# For Zend OpCache:
# Added a new define for 5.6 and wrapped the code around that so its still compatible with older version
2013-12-12 20:30:45 +01:00
Dmitry Stogov
711d8c2c7b
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
fix test
2013-12-12 16:46:49 +04:00
Dmitry Stogov
3bddcc13b5
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
fix test
2013-12-12 16:46:37 +04:00
Dmitry Stogov
fd4a7388d7
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
fix test
2013-12-12 16:46:15 +04:00
Michael Wallner
c0e87e9bb1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix test
2013-12-12 12:10:08 +01:00
Michael Wallner
1dfbe99ce4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2013-12-12 12:09:54 +01:00
Michael Wallner
8ee6fe9856
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test
2013-12-12 12:09:34 +01:00
Michael Wallner
c59f3184a3
fix test
2013-12-12 12:08:50 +01:00
Dmitry Stogov
47f41385e1
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 14:00:03 +04:00
Dmitry Stogov
463dbc3490
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 13:59:51 +04:00
Dmitry Stogov
a23bcba875
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 13:59:37 +04:00
Dmitry Stogov
8738e6d86f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed tests
Fixed ext/soap/tests/bugs/bug54911.phpt
2013-12-12 13:55:42 +04:00
Dmitry Stogov
9850d57fd9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed tests
Fixed ext/soap/tests/bugs/bug54911.phpt
2013-12-12 13:55:23 +04:00
Anatol Belski
58b754ca4a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 10:46:36 +01:00
Anatol Belski
39a2dcdeac
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 10:46:21 +01:00
Dmitry Stogov
0344e6a429
Fixed tests
2013-12-12 13:35:37 +04:00
Anatol Belski
da62fd5ed8
Fixed bug #65486 mysqli_poll() is broken on Win x64
...
While this issue is visible in mysqli_poll() functions, the cause
lays deeper in the stream to socket casting API. On Win x64 the
SOCKET datatype is a 64 or 32 bit unsigned, while on Linux/Unix-like
it's 32 bit signed integer. The game of casting 32 bit var to/from
64 bit pointer back and forth is the best way to break it.
Further more, while socket and file descriptors are always integers
on Linux, those are different things using different APIs on Windows.
Even though using integer instead of SOCKET might work on Windows, this
issue might need to be revamped more carefully later. By this time
this patch is tested well with phpt and apps and shows no regressions,
neither in mysqli_poll() nor in any other parts.
2013-12-12 10:17:01 +01:00
Dmitry Stogov
1886292ec9
Fixed ext/soap/tests/bugs/bug54911.phpt
2013-12-12 13:02:50 +04:00
Adam Harvey
b97156113e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Switch to using freetype-config for freetype detection.
2013-12-07 19:42:00 -08:00
Anatol Belski
fa1802381f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
added missing prototype
2013-12-11 14:16:22 +01:00
Anatol Belski
f0cf312d8c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added missing prototype
2013-12-11 14:16:07 +01:00
Anatol Belski
edf601a41f
added missing prototype
2013-12-11 14:15:40 +01:00
Anatol Belski
2f707bf246
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix dir separator in cve-2013-6420 test
2013-12-11 13:33:59 +01:00
Anatol Belski
e9efc16660
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dir separator in cve-2013-6420 test
2013-12-11 13:33:37 +01:00
Anatol Belski
b6bcae5c10
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix dir separator in cve-2013-6420 test
2013-12-11 13:33:16 +01:00
Anatol Belski
ff89066b3d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix dir separator in cve-2013-6420 test
2013-12-11 13:32:49 +01:00
Anatol Belski
6f739318fd
fix dir separator in cve-2013-6420 test
2013-12-11 13:31:29 +01:00
Stanislav Malyshev
35b8f57906
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
2013-12-10 11:36:33 -08:00
Stanislav Malyshev
293984ac33
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
2013-12-10 11:36:06 -08:00
Stanislav Malyshev
41cd533298
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
2013-12-10 11:35:26 -08:00
Stanislav Malyshev
b1b23abc86
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
Fixed Bug #66218 zend_register_functions breaks reflection
2013-12-10 11:34:45 -08:00
Stanislav Malyshev
71daf3229b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
Conflicts:
configure.in
main/php_version.h
2013-12-10 11:34:35 -08:00
Stanislav Malyshev
c1224573c7
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
2013-12-10 11:03:49 -08:00
Remi Collet
8e29235b6c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
Fixed Bug #66218 zend_register_functions breaks reflection
2013-12-10 16:10:48 +01:00
Remi Collet
45d8802441
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed Bug #66218 zend_register_functions breaks reflection
2013-12-10 16:10:20 +01:00
Remi Collet
9f4d1ee51c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #66218 zend_register_functions breaks reflection
2013-12-10 16:09:41 +01:00
Remi Collet
3e963f8eb4
Fixed Bug #66218 zend_register_functions breaks reflection
...
Functions registered using zend_register_functions instead of zend_module_entry.functions are not seen on reflection.
Ex: additional_functions from api_module_entry.
Ex: in CLI, dl, cli_set_process_title and cli_get_process_title
Note:
- also affects functions overrided in extension
(should be be reported in extension, where overrided, not in original extension)
- also allow extension to call zend_register_functions for various list
(instead of having a single bug list)
2013-12-10 16:07:16 +01:00
Dmitry Stogov
ad4f0c7812
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)
2013-12-10 17:59:20 +04:00
Dmitry Stogov
fe93347ba0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)
Conflicts:
NEWS
2013-12-10 17:58:22 +04:00
Dmitry Stogov
552e8b2b4c
Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)
2013-12-10 17:57:05 +04:00
Dmitry Stogov
d439b3970a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #66251 (Constants get statically bound at compile time when Optimized)
2013-12-10 17:05:23 +04:00
Dmitry Stogov
73f13f439b
Fixed bug #66251 (Constants get statically bound at compile time when Optimized)
2013-12-10 17:04:17 +04:00
Dmitry Stogov
6b6a4e466a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Arguments passed to user function have to be properly allocated on heap
2013-12-10 13:03:24 +04:00
Dmitry Stogov
5ad1117419
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Arguments passed to user function have to be properly allocated on heap
2013-12-10 13:03:09 +04:00
Dmitry Stogov
a6516653b7
Arguments passed to user function have to be properly allocated on heap
2013-12-10 13:00:45 +04:00
Adam Harvey
d40a5a2797
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Switch to using freetype-config for freetype detection.
2013-12-07 19:41:44 -08:00
Adam Harvey
d7a45a67be
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Switch to using freetype-config for freetype detection.
2013-12-07 19:41:23 -08:00
Adam Harvey
a0955f351c
Switch to using freetype-config for freetype detection.
...
This fixes GD compilation against libfreetype 2.5.1 and later after they made
the rather interesting decision to change their include directory layout in a
point release.
The original suggestion in the bug was to use pkg-config, but my inclination is
to use freetype-config instead: we should be able to get the same configuration
information without actually needing pkg-config installed, since pkg-config is
by no means guaranteed to exist on many Unices and distros, whereas
freetype-config should always be present if a libfreetype build environment is
installed. Let's try it out and see what happens.
Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)).
2013-12-07 19:39:40 -08:00
Michael Wallner
01a13bb8c1
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #61645 (fopen and O_NONBLOCK)
fix possibly uninitialized value
Use 'user@example.com' rather than 'user@company.com' in tests
2013-12-06 10:34:11 +01:00
Michael Wallner
9ea2489f5c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #61645 (fopen and O_NONBLOCK)
fix possibly uninitialized value
2013-12-06 10:33:47 +01:00
Michael Wallner
a48d82d238
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #61645 (fopen and O_NONBLOCK)
fix possibly uninitialized value
2013-12-06 10:33:10 +01:00
Michael Wallner
098d2a5d0f
fix possibly uninitialized value
2013-12-06 10:27:33 +01:00
Sara Golemon
9adfcea241
Use 'user@example.com' rather than 'user@company.com' in tests
...
Using some arbitrary 3rd party's domain name is clowny,
even if it never tries to send.
2013-12-04 07:51:43 -08:00
Michael Wallner
44ff944b37
Merge branch 'dba'
...
* dba:
fix bug #62490
more test fixes
fix test
fix php_stream_copy_to_stream_ex usage
add missing clean section
remove test for already removed feature
2013-12-05 11:27:26 +01:00
Michael Wallner
5a420c8680
fix bug #62490
...
inifiles delete handler did not return false if the key was not found
2013-12-05 11:04:25 +01:00
Andrey Hristov
0cb38a3d26
Merge branch 'master' of git.php.net:php-src
...
Conflicts:
NEWS
2013-12-04 18:32:32 +02:00
Sara Golemon
f0248bdce5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Use 'user@example.com' rather than 'user@company.com' in tests
2013-12-04 07:50:45 -08:00
Sara Golemon
32a4cc8353
Use 'user@example.com' rather than 'user@company.com' in tests
...
Using some arbitrary 3rd party's domain name is clowny,
even if it never tries to send.
2013-12-04 07:49:16 -08:00
Andrey Hristov
406d5a5ecc
Merge branch 'PHP-5.6'
...
Conflicts:
NEWS
UPGRADING
2013-12-04 16:20:03 +02:00
Andrey Hristov
97909ef4ef
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-04 12:39:11 +02:00
Andrey Hristov
ceb1b7e20f
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-04 12:07:18 +02:00
Andrey Hristov
86aad97979
Fix loss of precision
2013-12-04 12:06:59 +02:00
Adam Harvey
8f11f7f179
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
2013-12-03 14:54:24 -08:00
Adam Harvey
44697c115b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
2013-12-03 14:52:35 -08:00
Adam Harvey
6f52f566f3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
2013-12-03 14:51:03 -08:00
Adam Harvey
d1314893fd
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
...
These were returned to the general allocation pool by RFC 3330, and hence
shouldn't cause an IP address validation failure due to being reserved. At
least 128.0.0.0/16 is in use on the public Internet today.
Fixes bug #66229 (128.0.0.0/16 isn't reserved any longer).
2013-12-03 14:46:15 -08:00
Michael Wallner
f0c85fab45
more test fixes
2013-12-03 18:18:40 +01:00
Michael Wallner
b0415856fd
fix test
2013-12-03 17:55:26 +01:00
Michael Wallner
9e309a2d10
fix php_stream_copy_to_stream_ex usage
2013-12-03 17:55:18 +01:00
Michael Wallner
a7f0465c0b
add missing clean section
2013-12-03 17:07:40 +01:00
Michael Wallner
f4912e3a96
remove test for already removed feature
2013-12-03 16:57:35 +01:00
Nikita Popov
a87233f98a
Merge branch 'PHP-5.6'
2013-12-02 20:11:34 +01:00
Nikita Popov
00c74ccf69
Support gmp_remroot() on GMP 4.1
2013-12-02 20:11:06 +01:00
Michael Wallner
c23a1f78b4
Merge branch 'PHP-5.6'
...
* PHP-5.6:
BFN
Fix bug #65196
2013-12-02 17:03:30 +01:00
Michael Wallner
f254476f99
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
BFN
Fix bug #65196
2013-12-02 17:02:13 +01:00
Michael Wallner
9c0a70c1de
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65196
2013-12-02 17:01:25 +01:00
Michael Wallner
22fa3fbc5f
Fix bug #65196
...
Passing DOMDocumentFragment to DOMDocument::saveHTML()
produces invalid markup, because a DocumentFragment is just a container
for child nodes and not a real node itself.
2013-12-02 17:00:13 +01:00
Michael Wallner
7cd702640d
Fix Bug #64776 The XSLT extension is not thread safe.
2013-12-02 15:01:24 +01:00
Michael Wallner
df484b0008
Merge branch 'PHP-5.6'
...
* PHP-5.6:
BFN
fix bug #49634x
2013-12-02 12:19:03 +01:00
Michael Wallner
733259c211
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
BFN
fix bug #49634x
2013-12-02 12:15:27 +01:00
Michael Wallner
e4b310d2a9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #49634x
2013-12-02 12:10:59 +01:00
Michael Wallner
6408a1a59e
fix bug #49634x
2013-12-02 12:10:00 +01:00
Dmitry Stogov
f8148a3905
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed tests
2013-12-02 12:05:49 +04:00
Dmitry Stogov
0f39089384
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed tests
2013-12-02 12:05:29 +04:00
Dmitry Stogov
2f5ab04c5f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed tests
2013-12-02 12:04:07 +04:00
Dmitry Stogov
edbefd1d5c
Fixed tests
2013-12-02 11:53:35 +04:00
Felipe Pena
52611a2c7e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
- Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
2013-11-30 11:41:01 -02:00
Felipe Pena
a2f478cd94
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
2013-11-30 11:40:42 -02:00
Felipe Pena
78f69a2b4f
- Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
2013-11-30 11:39:57 -02:00
Nikita Popov
065c8e77e2
Merge branch 'PHP-5.6'
2013-11-29 23:32:14 +01:00
Nikita Popov
66b0d17f04
Merge branch 'PHP-5.5' into PHP-5.6
2013-11-29 23:31:13 +01:00