clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
85,926 Commits 494 Branches 1,367 Tags 801 MiB
4f3763e202
Commit Graph

36628 Commits

Author SHA1 Message Date
Anatol Belski
88ca46d92b fix datatype mismatches 2014-10-23 11:45:44 +02:00
Anatol Belski
f010efc924 fix datatype mismatches 2014-10-23 11:36:34 +02:00
Anatol Belski
91652cf3c7 fix datatype mismatches 2014-10-23 11:05:47 +02:00
Anatol Belski
451065a434 fix datatype mismatches 2014-10-23 10:30:05 +02:00
Anatol Belski
0413a6e7a3 fix datatype mismatches 2014-10-23 10:30:04 +02:00
Anatol Belski
c448023bd0 fix datatype mismatches 2014-10-23 10:30:03 +02:00
Anatol Belski
a61f6ab737 fix datatype mismatches 2014-10-23 10:30:02 +02:00
Anatol Belski
50cc4abbf7 fix datatype mismatch 2014-10-23 10:30:00 +02:00
Anatol Belski
303973f076 fix datatype mismatches 2014-10-23 10:29:59 +02:00
Anatol Belski
ddaae1a02c fix datatype mismatch 2014-10-23 10:29:58 +02:00
Anatol Belski
e91b669e23 catch up with the latest key length change 2014-10-23 10:29:55 +02:00
Dmitry Stogov
4fd435abab Embed FETCH_CLASS <string> into the following NEW 2014-10-23 11:52:34 +04:00
STANLEY SUFFICOOL
0282546111 Implement Bug #66063 - pdo_dblib enable timeout parameter 2014-10-22 23:14:23 -07:00
Stanley Sufficool
5ba114e0a6 Merge branch 'master' of https://git.php.net/push/php-src 2014-10-22 20:14:58 -07:00
Stanley Sufficool
83144a7281 Fixed bug #64511 - pdo_dblib segfaults or leaks on nextRowset() 2014-10-22 20:13:22 -07:00
Anatol Belski
958c6d1c5d fix datatype mismatch warning 2014-10-22 20:46:35 +02:00
Anatol Belski
afb65adefa fix datatype mismatches 2014-10-22 20:46:34 +02:00
Anatol Belski
0565a29e4d fix datatype mismatches 2014-10-22 20:46:33 +02:00
Anatol Belski
58b8227240 fix assert, zero diff would be valid, too 2014-10-22 20:46:32 +02:00
Anatol Belski
5b4b0f8368 fix datatype mismatch warning 2014-10-22 20:46:31 +02:00
Anatol Belski
1a727e519b fix datatype mismatch warnings 2014-10-22 20:46:30 +02:00
Anatol Belski
b80853d942 fix datatype mismatches 2014-10-22 20:46:29 +02:00
Dmitry Stogov
62e3998dae Removed useless code 2014-10-22 22:32:06 +04:00
Anatol Belski
9a969fdd3b fix datatype 2014-10-22 17:56:31 +02:00
Anatol Belski
a5e4f1f598 fix several datatype mismatches 2014-10-22 17:56:30 +02:00
Anatol Belski
cccd538512 fix dir separator in test 2014-10-22 17:56:29 +02:00
Anatol Belski
f58edcd996 fix datatype warnings 2014-10-22 17:56:28 +02:00
Anatol Belski
09a01a834e this should be uint32 2014-10-22 17:56:26 +02:00
Anatol Belski
36ce467402 fix datatype mismatches 2014-10-22 17:56:25 +02:00
Anatol Belski
1ea5982d07 fixing datatype mismatches 2014-10-22 17:56:23 +02:00
Anatol Belski
80163b4a2b fix datatype mismatch warnings 2014-10-22 17:56:21 +02:00
Anatol Belski
2a7f9dcf5b fix datatype mismatch and warning 2014-10-22 17:56:20 +02:00
Anatol Belski
944d2c65e1 fix datatype mismatches 2014-10-22 17:56:19 +02:00
Anatol Belski
f37b4cdb8f use zend_bool where zend_long isn't needed 
spare at least 24 bytes per globals item on 64 bit
 2014-10-22 17:56:18 +02:00
Remi Collet
1803228597 Fix bug #68283: fileinfo: out-of-bounds read in elf note headers 
Upstream commit
39c7ac1106

CVE -2014-3710
 2014-10-22 15:37:04 +02:00
Remi Collet
d8686473c2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fix bug #68224 buffer-overflow in /ext/fileinfo/libmagic/readcdf.c caught by AddressSanitizer
 2014-10-22 15:27:54 +02:00
Remi Collet
ef2a2fa3a1 Fix bug #68224 buffer-overflow in /ext/fileinfo/libmagic/readcdf.c caught by AddressSanitizer 
Upstream commit
f28fbb947e
 2014-10-22 15:24:59 +02:00
Dmitry Stogov
534d854fb2 Embed FETCH_CLASS <string> into the following INSTANCEOF 2014-10-22 17:23:43 +04:00
Xinchen Hui
f03100cb80 Better convert 2014-10-22 17:25:41 +08:00
Xinchen Hui
d53c8bab83 Better zval copying 2014-10-22 17:18:15 +08:00
Xinchen Hui
b6d5e8d8d7 Fixed zval copying 2014-10-22 17:08:35 +08:00
Xinchen Hui
a58e9c4188 Fixed zval copying 2014-10-22 17:07:44 +08:00
Stanley Sufficool
09cf64678a Fix bug #67134 (PDO_DBLIB Missing null string terminator) 2014-10-20 21:44:47 -07:00
Xinchen Hui
baddb1c73a Extra comma 2014-10-21 11:02:15 +08:00
Anatol Belski
7a1a0f39d0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  initialize lineno before calling compile file file in phar
  News entry for new curl constants
 2014-10-20 15:55:05 +02:00
Anatol Belski
e0b247bc87 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  initialize lineno before calling compile file file in phar
  News entry for new curl constants
 2014-10-20 15:54:33 +02:00
Anatol Belski
37d5a2b18f initialize lineno before calling compile file file in phar 2014-10-20 15:53:32 +02:00
Dmitry Stogov
ab539e177e Removed old irrelevant comment 2014-10-20 13:52:28 +04:00
Dmitry Stogov
fb85d0322d Fixed compilation 2014-10-17 19:25:43 +04:00
Dmitry Stogov
7471c21781 Optimized property access handlers. Removed EG(std_property_info). 2014-10-17 19:10:05 +04:00
Matteo Beccati
9935bf7df7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
  News entry for new curl constants
 2014-10-17 16:48:58 +02:00
Matteo Beccati
8c5e2e66bc Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads) 2014-10-17 16:22:52 +02:00
Dmitry Stogov
35dc0a2e30 array_pop/array_shift optimization 2014-10-17 12:30:27 +04:00
Anatol Belski
1f6bd98143 check for zlib headers as well as lib for mysqlnd 2014-10-17 10:09:40 +02:00
Anatol Belski
35d703d00a a realpath cache key can be int or float, catching this 2014-10-17 10:09:39 +02:00
Rasmus Lerdorf
2a8f7f8824 Merge branch 'PHP-5.6' 
* PHP-5.6:
  TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
 2014-10-16 21:28:49 -07:00
Rasmus Lerdorf
5606466624 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
 2014-10-16 21:28:20 -07:00
Rasmus Lerdorf
2b5bffe6c7 TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247 2014-10-16 21:25:29 -07:00
Nikita Popov
fc6ce7d1c1 Fix array_keys() on $GLOBALS 2014-10-16 14:44:35 +02:00
Nikita Popov
cf5920e8aa Fix procedural finfo calls in methods 
getThis() will return the $this of the calling method.
 2014-10-16 14:24:23 +02:00
Ferenc Kovacs
c03b6e1701 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fixed Bug #65171 imagescale() fails
  Revert "Bug #41631: Observe socket read timeouts in SSL streams"
 2014-10-15 19:43:30 +02:00
Ferenc Kovacs
cfa1028d7e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fixed Bug #65171 imagescale() fails
  Revert "Bug #41631: Observe socket read timeouts in SSL streams"

Conflicts:
	ext/openssl/xp_ssl.c
 2014-10-15 19:42:51 +02:00
Ferenc Kovacs
d2ab6e1d15 Merge branch 'PHP-5.6' 
* PHP-5.6:
  removing the NEWS entry as we had to revert this fix for now
  Revert "Merge branch 'PHP-5.5' into PHP-5.6"
  Revert "fix TS build"
  Revert "Merge branch 'PHP-5.4' into PHP-5.5"
  Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"
  Revert "Bug #41631: Fix regression from first attempt (6569db8)"
 2014-10-15 19:41:27 +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
Remi Collet
2728e6f017 Fixed Bug #65171 imagescale() fails 
Third param (height) is set as optional,
but default value = -1 is incorrect

Compute correct height to preserve ratio.
 2014-10-15 19:13:25 +02:00
Tjerk Meesters
7e116a3baa Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68234
 2014-10-15 21:13:13 +08:00
Tjerk Meesters
836a5dfddb Fixed bug #68234 
Certificate will now expire in 2034
 2014-10-15 21:12:13 +08:00
Julien Pauli
6d9c9f8f04 Revert "Bug #41631: Observe socket read timeouts in SSL streams" 
This reverts commit 6569db8808.

Conflicts:
	ext/openssl/xp_ssl.c
 2014-10-15 14:38:12 +02:00
Dmitry Stogov
52b93004d0 Fixed ext/standard/tests/strings/pack64_32.phpt failure (In PHP7, we must not free array of arguments recieved using "+") 2014-10-15 12:38:04 +04:00
Stanislav Malyshev
01d17228dc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix return code (merges are hard :( )
 2014-10-14 11:45:01 -07: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
d9559d0ecd fix bad merge 2014-10-14 11:17:48 -07:00
Stanislav Malyshev
4a38cc0a3c Fix bug #68113 (Heap corruption in exif_thumbnail()) 2014-10-14 10:51:46 -07:00
Stanislav Malyshev
81b67937e4 Fix bug #68089 - do not accept options with embedded \0 
Conflicts:
	ext/curl/interface.c
 2014-10-14 10:51:46 -07:00
Stanislav Malyshev
3eb679b952 Fixed bug #68044: Integer overflow in unserialize() (32-bits only) 2014-10-14 10:51:24 -07:00
Stanislav Malyshev
2b261789a6 Fix bug #68027 - fix date parsing in XMLRPC lib 2014-10-14 10:49:01 -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
1f4f2ef403 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68128

Conflicts:
	ext/spl/spl_iterators.c
 2014-10-14 23:00:17 +08: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
afdaedaa26 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS and UPGRADING
  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

Conflicts:
	ext/gmp/gmp.c
 2014-10-14 00:43:15 -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
Stanislav Malyshev
287c91c1f0 Fix bug #68113 (Heap corruption in exif_thumbnail()) 2014-10-13 23:17:45 -07:00
Stanislav Malyshev
ab0939e5e5 Fix bug #68089 - do not accept options with embedded \0 
Conflicts:
	ext/curl/interface.c
 2014-10-13 23:16:06 -07:00
Stanislav Malyshev
56754a7f9e Fixed bug #68044: Integer overflow in unserialize() (32-bits only) 2014-10-13 23:14:25 -07:00
Stanislav Malyshev
88412772d2 Fix bug #68027 - fix date parsing in XMLRPC lib 2014-10-13 23:12:11 -07:00
Anatol Belski
946668d037 fix signed/unsigned mismatch warning 2014-10-13 18:43:11 +02:00
Anatol Belski
784c235f40 missing include for strlen proto 2014-10-13 18:43:08 +02:00
Dmitry Stogov
702a2dfb3e Merge branch 'PHP-5.6' 
* PHP-5.6:
  We can't eliminate FETCH_CONSTANT opcodes for constants represented by AST.

Conflicts:
	ext/opcache/Optimizer/pass1_5.c
 2014-10-13 14:10:44 +04:00
Dmitry Stogov
7acba332fe We can't eliminate FETCH_CONSTANT opcodes for constants represented by AST. 2014-10-13 14:07:37 +04:00
Nikita Popov
016a96c7c2 Fix ::jsonSerialize() failure message 2014-10-12 20:55:51 +02:00
Nikita Popov
c4ab08ac9d Fix invalid zend_string_frees in reflection 
zend_lookup_class can share the name
 2014-10-12 20:55:51 +02:00
Nikita Popov
471e71537f Remove retval member in spl_dllist 
Seems pretty useless, unless I'm missing something?
 2014-10-12 20:55:51 +02:00
Tjerk Meesters
ea7604fc9e Merge branch 'PHP-5.6' 
* PHP-5.6:
  More fixes for nodelist array access
  - testing for null property read
  - no zval copying if the type is already long
  - memory fix for master
  - use zend_long for offset

Conflicts:
	ext/dom/php_dom.c
 2014-10-12 12:55:24 +08: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
Anatol Belski
6445c4bd48 use php_socket_t instead of int 2014-10-10 19:00:19 +02:00
Nikita Popov
7c5da4607c Fix casts in GD 
Using convert_to_* after ZVAL_COPY is unsafe.
 2014-10-10 12:23:33 +02:00
Nikita Popov
1577ac146f Drop redundant casting code from ext/filter 2014-10-10 12:14:26 +02:00
Tjerk Meesters
2a765d313e pack(): Use SIZEOF_ZEND_LONG instead of SIZEOF_LONG 2014-10-10 07:20:10 +08:00
Tjerk Meesters
284358b317 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add 64 bit formats to pack() and unpack()
 2014-10-10 07:05:36 +08:00
Leigh
63fd969300 Add 64 bit formats to pack() and unpack() 2014-10-09 21:02:42 +01:00
Nikita Popov
df79b9b27a Update get_class_name semantics 
* get_class_name is now only used for displaying the class name
   in debugging functions like var_dump, print_r, etc. It is no
   longer used in get_class() etc.
 * As it is no longer used in get_parent_class() the parent
   argument is now gone. This also fixes incorrect parent classes
   being reported in COM.
 * get_class_name is now always required (previously some places
   made it optional and some required it) and is also required
   to return a non-NULL value.
 * Remove zend_get_object_classname. This also fixes a number of
   potential leaks due to incorrect usage of this function.
 2014-10-09 20:48:27 +02:00
Dmitry Stogov
0390cde428 Improved VM stack primitives for fast paths. Slow paths are not inlined anymore. 2014-10-09 20:29:02 +04:00
Tjerk Meesters
0a50b250b2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Refactored DOMNodeList array dereferencing implementation

Conflicts:
	ext/dom/nodelist.c
	ext/dom/php_dom.c
 2014-10-09 23:32:19 +08:00
Tjerk Meesters
59f39dea66 Refactored DOMNodeList array dereferencing implementation 2014-10-09 23:07:12 +08:00
Dmitry Stogov
2f099478a3 zval must not be converted in place without duplication 2014-10-09 18:34:19 +04:00
Nikita Popov
b09acffc04 Remove PDORow get_class_entry handler 2014-10-09 15:23:14 +02:00
Nikita Popov
9903f16e5c Remove get_class_entry handlers in COM 2014-10-09 14:42:56 +02:00
Nikita Popov
e5e9d8346f Remove zend_get_class_entry function 2014-10-09 14:17:30 +02:00
Nikita Popov
b3a779de68 Remove get_class_entry object handler 2014-10-09 14:08:10 +02:00
Nikita Popov
ee5b30fa19 Remove support for classes without class entries 
get_class_entry must be non-NULL and return non-NULL.
 2014-10-09 13:58:14 +02:00
Nikita Popov
43f1c94dda Review a few more SEPARATE_ZVAL_IF_NOT_REF usages 2014-10-09 12:51:05 +02:00
Nikita Popov
a3b880364f Directly use zend_string for php_implode/php_explode 
Also drop some unnecessary zval separations and copies
 2014-10-09 12:05:56 +02:00
Dmitry Stogov
9b0b30272f Copy all the arena allocated data from SHM to process memory at once 2014-10-09 14:01:19 +04:00
Tjerk Meesters
49078a6598 Merge branch 'PHP-5.6' 
Conflicts:
	ext/dom/dom_properties.h
	ext/dom/nodelist.c
	ext/dom/php_dom.c
 2014-10-09 16:55:15 +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
78156520ae Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS for #68129
  Updated NEWS for #68129
  Fixed bug #68129
 2014-10-09 08:24:58 +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
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
Keyur Govande
9ca16fd809 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add to NEWS
  Add to NEWS
  Fix for bug #68087 (ODBC not reading DATE columns correctly)
 2014-10-07 21:23:04 +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
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
07e285d880 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add to NEWS
  Fix for bug #68114 (Build fails on OS X due to undefined symbols)
 2014-10-07 21:08:33 +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
Keyur Govande
648673bffe Fix for bug #68114 (Build fails on OS X due to undefined symbols) 
gcc (i686-apple-darwin10-gcc-4.2.1) on OS X cannot link fixed-width
decimals and fails with undefined symbols errors like ___extendsddf.
If configure used gcc for compiling it would notice and mark the
feature HAVE_DECIMAL_FP_SUPPORT as unsupported.
But configure seems to use cc (i686-apple-darwin10-llvm-gcc-4.2)
instead, which doesn't support fixed-width decimals either, but the
code compiles and links just fine. I suspect it may have something
to do with the llvm backend printed in the version.
Lacking the time to debug this further, the patch fixes the issue by
checking the expected output when fixed-width decimal support is
present and correctly implemented.
 2014-10-07 20:58:43 +00:00
Leigh
aa679295e4 Merge branch 'PHP-5.6' of https://github.com/php/php-src into gmp-random 2014-10-07 14:25:44 +01:00
Anatol Belski
8d4ee9fbaa remove successive assignment 2014-10-06 11:45:23 +02:00
Tjerk Meesters
82523c0752 Merge branch 'pr/647' 
* pr/647: (33 commits)
  zend_uint -> uint32_t
  Fix nesting for *non*-compile-time-resolveable functions See a1a4ba9511 (commitcomment-7414223)
  Add tests for calls to nested, *non*-compile-time-resolveable functions See a1a4ba9511 (commitcomment-7414362)
  Make list of opcodes used for nesting calculation consistent   with `zend_do_convert_call_user_func()` in Zend/zend_compile.c
  Rewrite code to use ZEND_VM_JMP() instead of repeated ZEND_VM_INC_OPCODE() calls
  QA: Simplify code to find matching ZEND_DO_FCALL_BY_NAME CG(context).nested_calls is stored inside the initializer's result.num and inside the finalizer's op2.num, by comparing these we don't need to count manually, and are thus safer from future expansion with specialized opcodes e.g.
  Fix expected fatal error, now is catchable fatal
  Adjust expected fatal error message Now also includes "on [TYPE]" after merge from master
  Check for memory leaks when not using return value
  Adjust expected fatal error message Now also includes "on [TYPE]" after merge from master
  Add tests with arrays as parameters
  Handle ZEND_NEW nesting
  Also verify nesting with dynamically called static methods
  Handle ZEND_INIT_NS_FCALL_BY_NAME nesting
  QA: Refactor: Split tests a bit to make them more comprehendable
  Support nested static calls
  Handle ZEND_EXT_FCALL_END, skipping if necessary Verified with running tests with new "-e" run-tests arg: $ make test TESTS=Zend/tests/*-on-non-objects-*phpt TEST_PHP_ARGS=-e # Tests passed    :   11 (100.0%)
  Add support for PHP's 'extended information for debugger/profiler' mode
  Verify non-CV-operands also work See discussion https://github.com/php/php-src/pull/647#issuecomment-48050551
  Only allocate NULL return value if it's actually used
  ...

Conflicts:
	ext/date/tests/bug67118.phpt
 2014-10-06 05:52:43 +08:00
Nikita Popov
a86fd31c8c Regenerate tokenizer data 
Also fix the tokenizer_data_gen.sh script after 64bit changes.
 2014-10-05 22:09:28 +02:00
Nikita Popov
e756333bbb Remove <% and <script language="php"> tags 
As per https://wiki.php.net/rfc/remove_alternative_php_tags.

Removes:
 * <% opening tag
 * %> closing tag
 * <%= short opening tag
 * /<script\s+language\s*=\s*(php|"php"|'php')\s*>/i opening tag
 * /</script>/i closing tag
 * asp_tags ini directive
 2014-10-05 21:57:05 +02:00
Anatol Belski
d58b70622a properly export tsrm_strtok_r() 
for this particular case fixing phar shared build, but for the
general usage anyway
 2014-10-05 13:20:27 +02:00
Dmitry Stogov
7c7b9184b1 Fixed list() behavior inconsistency (string handling is disabled for all cases, ArrayAccess objects handling is enabled for all cases, ZEND_FETCH_DIM_TMP_VAR opcode is renamed into ZEND_FETCH_LIST, ZEND_FETCH_ADD_LOCK flag is removed). 2014-10-05 13:02:58 +04:00
Johannes Schlüter
429e1b45a7 Merge branch 'PHP-5.6' 2014-10-04 20:07:00 +02:00
Johannes Schlüter
79ca53b62b Merge branch 'PHP-5.5' into PHP-5.6 2014-10-04 20:06:44 +02:00
Johannes Schlüter
b386991471 Fix accidental edit in previous commit 2014-10-04 20:06:02 +02:00
Johannes Schlüter
a1347a0190 Merge branch 'PHP-5.6' 2014-10-04 20:00:40 +02:00
Johannes Schlüter
61d29990b4 Merge branch 'PHP-5.5' into PHP-5.6 2014-10-04 20:00:10 +02:00
Johannes Schlüter
136dd53ac2 Fix arginfo 2014-10-04 19:59:21 +02:00