Commit Graph

38505 Commits

Author SHA1 Message Date
Remi Collet
1f0a6241b4 Merge branch 'PHP-5.6'
* PHP-5.6:
  relax tests with huge year (new zic)
2015-04-18 10:00:24 +02:00
Remi Collet
1302eb7f72 relax tests with huge year (new zic) 2015-04-18 10:00:15 +02:00
Remi Collet
3bbfb96e1a ignore second value for huge timestamp test (new zic) 2015-04-18 09:37:06 +02:00
Remi Collet
81d01809a2 Merge branch 'PHP-5.6'
* PHP-5.6:
  relax test for date < INT32_MIN (new zic)
2015-04-18 09:28:39 +02:00
Remi Collet
3c81e945a3 relax test for date < INT32_MIN (new zic) 2015-04-18 09:28:29 +02:00
Remi Collet
f877bdac72 Merge branch 'PHP-5.6'
* PHP-5.6:
  relax bigbang content (new zic)
2015-04-18 09:11:48 +02:00
Remi Collet
984f4b09e0 relax bigbang content (new zic) 2015-04-18 09:11:39 +02:00
Remi Collet
971441cfe5 Merge branch 'PHP-5.6'
* PHP-5.6:
  Make date transitions tests more flexible
2015-04-18 07:50:31 +02:00
Remi Collet
cd93b120c3 Make date transitions tests more flexible
zic in recent glibc (2.20) introduce a new transitionn
so use a range to avoid failure when total number
of transitions is different (243/244)
2015-04-18 07:47:47 +02:00
Nikita Popov
ffa285ca73 Fix filter_var leak of object without __toString() 2015-04-17 21:51:49 +02:00
Anatol Belski
8192d645db Merge branch 'PHP-5.6'
* PHP-5.6:
  fix column name attribute with ODBC 3.0
  migrate SQLAllocStmt for ODBC 3.0 compliance
2015-04-17 17:14:18 +02:00
Anatol Belski
042fa25896 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix column name attribute with ODBC 3.0
  migrate SQLAllocStmt for ODBC 3.0 compliance
2015-04-17 17:13:45 +02:00
Anatol Belski
e09febb286 fix column name attribute with ODBC 3.0 2015-04-17 17:10:46 +02:00
Anatol Belski
db1596c8b1 migrate SQLAllocStmt for ODBC 3.0 compliance 2015-04-17 17:06:00 +02:00
Remi Collet
9340c5b347 Merge branch 'PHP-5.6'
* PHP-5.6:
  skip test when xml not available
2015-04-17 15:21:03 +02:00
Remi Collet
342acbe1c6 skip test when xml not available 2015-04-17 15:20:22 +02:00
Nikita Popov
e74b84a9fe Fix Intl constructor leaks
Drop the Z_OBJ(return_value) = NULL hack and return status code
from ctor function instead.
2015-04-17 10:33:59 +02:00
Nikita Popov
25affa8a0f Fix leak in transliterator_transliterate() 2015-04-17 10:33:58 +02:00
Nikita Popov
8138756295 Fix leak in IntlDateFormatter::getTimeZone() 2015-04-17 09:28:38 +02:00
Nikita Popov
4e2be45309 Fix leak in IntlCalendar::fromDateTime() 2015-04-17 09:28:36 +02:00
Nikita Popov
6202e2860d Fix leak of Pdo object if query() fails
Decref the DBH object when storing the errored query statement --
the DBH owns the stmt, so it will live long enough.
2015-04-16 21:08:29 +02:00
Nikita Popov
32ab26182b Fix leak of FETCH_INTO object 2015-04-16 21:08:29 +02:00
Nikita Popov
3d7959c87b Fix PdoRow leak
PdoStatement should only hold a weakref to the PdoRow.
2015-04-16 21:08:29 +02:00
Dmitry Stogov
e44ccde39a "C" is the default locale 2015-04-16 21:44:50 +03:00
Nikita Popov
c669aaac71 Merge branch 'PHP-5.6'
Conflicts:
	ext/gmp/gmp.c
2015-04-16 16:31:53 +02:00
Nikita Popov
25e45a9350 Run gmp_random tests more quickly 2015-04-16 16:29:57 +02:00
Nikita Popov
7e049b0427 Normalize gmp_remroot() behavior to GMP 5.1 2015-04-16 16:27:42 +02:00
Nikita Popov
8e167a2a00 Fix leak in gmp_pow() 2015-04-16 16:04:19 +02:00
Nikita Popov
feaabd09d0 Fix leak in gmp_pow() 2015-04-16 16:00:47 +02:00
Nikita Popov
c77d97f356 Implement GC for spl dll
As far as I can discern this should be safe, because the rc on the
linked list elements is only > 1 if an iterator points to it and
the iterator will also hold a reference to the list object.

The implementation for mangagement of the GC array is the same as
with the spl object storage.
2015-04-16 15:46:28 +02:00
Nikita Popov
6c98024f87 Drop unused is_self member 2015-04-16 15:33:47 +02:00
Nikita Popov
86152b18a3 Add GC support to SPL heap and PQ
ctor/dtor are now no longer called for insert/delete_top operations,
only for cloning and freeing of the object. Otherwise elements will
have a minimum rc of 2 and GC won't be able to free them.
2015-04-15 22:00:12 +02:00
Nikita Popov
dc764bf644 Use object apply count in var_dump / print_r
Instead of using the array apply count on the debug_info array, use
the object apply count for recursion detection when dumping. This
handles recursion in a more generic way and does not require each
debug_info handler to deal with this.

This allows returning a temporary debug_info array, instead of
having to store it in the object (thus delaying destruction of the
values).

Switch SPL debug_info handlers to use a temporary array.
2015-04-15 22:00:12 +02:00
Nikita Popov
eed18f0ee8 Return null on zpp failure in Array::exchangeArray()
Method was still returning a value despite zpp failing previously...
2015-04-15 20:43:41 +02:00
Nikita Popov
e10be0d0fd Remove unnecessary retval members in SPL
This is what the rv params are for. Avoid holding onto values
longer than necessary.
2015-04-15 20:39:08 +02:00
Nikita Popov
b4b872f4c9 Fix leak in RecursiveRegexIterator::getChildren() 2015-04-15 20:03:15 +02:00
Nikita Popov
7605e02e3b Fix leaks in recursive iterator construction 2015-04-15 19:51:02 +02:00
Anatol Belski
b9732a37c5 fix possible int overflow 2015-04-15 17:57:27 +02:00
Anatol Belski
7a88cfe44d fix datatype mismatches 2015-04-15 17:57:26 +02:00
Anatol Belski
0c6753bf6b optimize structs 2015-04-15 17:57:25 +02:00
Anatol Belski
a01e8c1fe9 fix data type and 64-bit compat 2015-04-15 17:57:23 +02:00
Remi Collet
c48bf6e55c Merge branch 'PHP-5.6'
* PHP-5.6:
  bump zip release to match pecl version
2015-04-15 17:38:01 +02:00
Remi Collet
60b3526bfb bump zip release to match pecl version 2015-04-15 17:37:12 +02:00
Anatol Belski
b816266223 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix dir separator in test
2015-04-15 11:10:29 +02:00
Anatol Belski
e53947609a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix dir separator in test
2015-04-15 11:09:54 +02:00
Anatol Belski
8947c7aa0d fix dir separator in test 2015-04-15 11:07:13 +02:00
Xinchen Hui
556e6f6cb1 Merge branch 'PHP-5.6'
Conflicts:
	Zend/zend_exceptions.c
2015-04-15 10:44:51 +08:00
Xinchen Hui
caf4beab2d Merge branch 'PHP-5.5' into PHP-5.6 2015-04-15 10:39:17 +08:00
Xinchen Hui
be504995c3 Fixed warnings 2015-04-15 10:37:35 +08:00
Nikita Popov
10756522a7 Fix leak in timezone_open when instantiation fails 2015-04-14 21:44:33 +02:00