Ferenc Kovacs
2109f5bfe3
removing the NEWS entry as we had to revert this fix for now
2014-10-15 19:36:13 +02:00
Ferenc Kovacs
feadaaed56
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
...
This reverts commit 98e67add15 , reversing
changes made to 2cdc1a2b74 .
2014-10-15 19:34:07 +02:00
Ferenc Kovacs
4fb998d42f
Revert "fix TS build"
...
This reverts commit 84a4041ba4 .
2014-10-15 19:33:47 +02:00
Ferenc Kovacs
7b8222aa44
Revert "Merge branch 'PHP-5.4' into PHP-5.5"
...
This reverts commit 30a73658c6 , reversing
changes made to 7fac56e072 .
2014-10-15 19:33:31 +02:00
Ferenc Kovacs
528e4166a6
Revert "Bug #67965 : Fix blocking behavior in non-blocking crypto streams"
...
This reverts commit f86b2193a4 .
2014-10-15 19:32:46 +02:00
Ferenc Kovacs
ff91a48f6e
Revert "Bug #41631 : Fix regression from first attempt ( 6569db8)"
...
This reverts commit 372844918a .
2014-10-15 19:32:14 +02:00
Tjerk Meesters
836a5dfddb
Fixed bug #68234
...
Certificate will now expire in 2034
2014-10-15 21:12:13 +08:00
Ferenc Kovacs
646b4cca85
PHP-5.6.3 is next
2014-10-15 14:08:32 +02:00
Ferenc Kovacs
b85b87fabc
update NEWS, 5.6.2 will be a security-only release
2014-10-15 14:07:40 +02:00
Stanislav Malyshev
47a1447cc8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix return code (merges are hard :( )
2014-10-14 11:43:34 -07:00
Stanislav Malyshev
bb3d43fa05
Fix return code (merges are hard :( )
2014-10-14 11:42:33 -07:00
Stanislav Malyshev
3e4cef131e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #68113 (Heap corruption in exif_thumbnail())
Fix bug #68089 - do not accept options with embedded \0
Fixed bug #68044 : Integer overflow in unserialize() (32-bits only)
Fix bug #68027 - fix date parsing in XMLRPC lib
2014-10-14 10:45:47 -07:00
Stanislav Malyshev
f9ba0a157f
Fix bug #68113 (Heap corruption in exif_thumbnail())
2014-10-14 10:45:36 -07:00
Stanislav Malyshev
71b63fc701
Fix bug #68089 - do not accept options with embedded \0
...
Conflicts:
ext/curl/interface.c
2014-10-14 10:45:35 -07:00
Stanislav Malyshev
88eb7ea47d
Fixed bug #68044 : Integer overflow in unserialize() (32-bits only)
2014-10-14 10:44:57 -07:00
Stanislav Malyshev
2142d78281
Fix bug #68027 - fix date parsing in XMLRPC lib
2014-10-14 10:44:39 -07:00
Stanislav Malyshev
ddb207e7fa
Fix bug #68113 (Heap corruption in exif_thumbnail())
2014-10-14 10:44:00 -07:00
Stanislav Malyshev
d1e030db02
Fix bug #68089 - do not accept options with embedded \0
...
Conflicts:
ext/curl/interface.c
2014-10-14 10:43:59 -07:00
Stanislav Malyshev
9aa9014523
Fixed bug #68044 : Integer overflow in unserialize() (32-bits only)
2014-10-14 10:43:13 -07:00
Stanislav Malyshev
44035de79f
Fix bug #68027 - fix date parsing in XMLRPC lib
2014-10-14 10:43:12 -07:00
Tjerk Meesters
fb35d7c56e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68128
2014-10-14 22:50:07 +08:00
Tjerk Meesters
71ba533640
Fixed bug #68128
...
Three issues are addressed:
- RecursiveRegexIterator::accept() should accept non-empty arrays without
applying any regular expression and RegexIterator::accept() should not accept
an array.
- RegexIterator::accept() should not accept an atom that fails to match
anything, even when PREG_PATTERN_ORDER is used (which would return an array
of empty arrays).
- RecursiveRegexIterator::getChildren() should pass all constructor arguments
to its child iterator instead of just the regular expression.
2014-10-14 22:49:01 +08:00
Stanislav Malyshev
4773c1dfdc
update NEWS and UPGRADING
2014-10-14 00:36:36 -07:00
Stanislav Malyshev
8615e42942
Merge branch 'pull-request/839' into PHP-5.6
...
* pull-request/839:
Upated NEWS
Address issues raised by @nikic
Make sure min < max
Mersenne Twister was added in GMP 4.2
Add test files
Add gmp_random_bits(bits) and gmp_random_range(min, max)
Change GMPs default PRNG to Mersenne Twister
2014-10-14 00:33:16 -07:00
Dmitry Stogov
7acba332fe
We can't eliminate FETCH_CONSTANT opcodes for constants represented by AST.
2014-10-13 14:07:37 +04:00
Anatol Belski
c96a6b4493
DLL export several APIs needed for phpdbg
2014-10-12 19:22:03 +02:00
Tjerk Meesters
37a685ff2b
More fixes for nodelist array access
...
- testing for null property read
- no zval copying if the type is already long
- memory fix for master
2014-10-12 12:47:58 +08:00
Ard Biesheuvel
3e13c6dcb2
update NEWS
...
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org >
2014-10-10 11:45:24 +02:00
Ard Biesheuvel
8aa952410a
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-10 11:44:52 +02:00
Ard Biesheuvel
b73ef0ee4a
update NEWS
...
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org >
2014-10-10 11:44:39 +02:00
Ard Biesheuvel
c2cce33cba
Merge branch 'PHP-5.4' into PHP-5.5
2014-10-10 11:41:10 +02:00
Ard Biesheuvel
82b07b62c0
update NEWS
...
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org >
2014-10-10 11:40:07 +02:00
Tjerk Meesters
a88feb139c
Added note to UPGRADING regarding 64-bit support in pack()/unpack()
2014-10-10 07:33:06 +08:00
Tjerk Meesters
30f8a9baff
RFC: 64 bit format codes for pack() and unpack()
2014-10-10 07:00:38 +08:00
Leigh
63fd969300
Add 64 bit formats to pack() and unpack()
2014-10-09 21:02:42 +01:00
Tjerk Meesters
59f39dea66
Refactored DOMNodeList array dereferencing implementation
2014-10-09 23:07:12 +08:00
Tjerk Meesters
72bd28a5da
Updated NEWS for #67949
2014-10-09 16:18:14 +08:00
Tjerk Meesters
8a3b41cd39
Merge branch 'pr/846' into PHP-5.6
...
* pr/846:
DOMNodeList elements are accessible through array notation
2014-10-09 15:55:10 +08:00
Tjerk Meesters
cac55bad1a
Updated NEWS for #68129
2014-10-09 08:24:30 +08:00
Tjerk Meesters
f92c9b3ced
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS for #68129
Fixed bug #68129
2014-10-09 08:24:05 +08:00
Tjerk Meesters
061cb9b807
Updated NEWS for #68129
2014-10-09 08:23:42 +08:00
Tjerk Meesters
d0e51f5ce9
Fixed bug #68129
...
Empty usernames and passwords are now treated differently from no username or password
For example, empty password:
ftp://user:@example.org
Empty username:
ftp://:password@example.org
Empty username and empty password
ftp://:@example.org
2014-10-09 08:21:30 +08:00
Dmitry Stogov
aec519199b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added info about ext/opcache
2014-10-08 21:49:53 +04:00
Dmitry Stogov
09f9403a6e
Added info about ext/opcache
2014-10-08 21:48:44 +04:00
Keyur Govande
3bd8ac6710
Add to NEWS
2014-10-07 21:22:54 +00:00
Keyur Govande
92f108801e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add to NEWS
Fix for bug #68087 (ODBC not reading DATE columns correctly)
2014-10-07 21:22:07 +00:00
Keyur Govande
d319a0c1d8
Add to NEWS
2014-10-07 21:21:23 +00:00
Keyur Govande
df9078ea55
Fix for bug #68087 (ODBC not reading DATE columns correctly)
...
Temporary variable indicating column field type ID should be
reset to default for loop iteration (i.e. every column in the
record set. The old buggy code made it persist across all columns
leading to invalid reads from the buffer, if for example a DATE
column was preceded by a VARCHAR column.
2014-10-07 21:17:36 +00:00
Keyur Govande
6f634ebb8c
Add to NEWS
2014-10-07 21:09:47 +00:00
Keyur Govande
bcda6c9392
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add to NEWS
Fix for bug #68114 (Build fails on OS X due to undefined symbols)
2014-10-07 21:08:18 +00:00