Stanislav Malyshev
a444900c8d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix memory leak in TSRM
2014-05-08 01:00:51 -07:00
Stanislav Malyshev
0cc18fdfba
Fix memory leak in TSRM
2014-05-08 01:00:34 -07:00
Ferenc Kovacs
8e2d396b52
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test (it requires ext/hash)
2014-05-07 00:55:05 +02:00
Dmitry Stogov
8517001b25
Fixed test (it requires ext/hash)
2014-05-07 00:52:49 +02:00
Ferenc Kovacs
579898e338
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed tests (they might fail from time to time because of session GC)
Fix author name on the #63228 patch.
2014-05-07 00:38:32 +02:00
Dmitry Stogov
f880013c4d
Fixed tests (they might fail from time to time because of session GC)
2014-05-07 00:37:56 +02:00
Ferenc Kovacs
58f4bf441a
only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
2014-05-03 02:50:37 +02:00
Adam Harvey
d8ff8f6f20
Fix author name on the #63228 patch.
2014-05-02 10:24:09 -07:00
Adam Harvey
f7cb87f333
Fix author name on the #63228 patch.
2014-05-02 10:23:09 -07:00
Ferenc Kovacs
192b35382a
Revert "show leaks in their own group"
...
using valgrind would be a bit too much for travis I guess.
This reverts commit ea60d79e23
.
2014-05-02 09:49:10 +02:00
Ferenc Kovacs
ea60d79e23
show leaks in their own group
2014-05-02 09:32:42 +02:00
Adam Harvey
eb46096608
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Use the right path for the suggested PHP invocation in ext_skel.
2014-05-01 11:22:46 -07:00
Adam Harvey
941c39bd06
Use the right path for the suggested PHP invocation in ext_skel.
...
Fixes bug #67160 (ext_skel outputs incorrect information).
2014-05-01 11:22:20 -07:00
Ferenc Kovacs
0842200501
5.5.12 was released yesterday
2014-05-01 10:54:15 +02:00
Ferenc Kovacs
b14b8dfc10
add missing NEWS entry to the correct release where it was added
2014-05-01 10:52:24 +02:00
Ferenc Kovacs
ef7821506a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add missing NEWS entry to the correct release where it was added
2014-05-01 10:52:13 +02:00
Ferenc Kovacs
1c13ad7c0e
add missing NEWS entry to the correct release where it was added
2014-05-01 10:50:08 +02:00
Michael Wallner
b79301d11f
fix test locality inconsitency
2014-04-30 13:01:59 +02:00
Michael Wallner
54fee59598
fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
2014-04-30 09:27:58 +02:00
Ferenc Kovacs
220e0d4a55
Merge remote-tracking branch 'tyrael/more_travis' into PHP-5.5
...
* tyrael/more_travis:
separate travis jobs for debug and non-debug builds
separate travis jobs for TS and NTS builds
put this test back to XFAIL, as it was before, since it is still leaking memory
2014-04-29 23:34:10 +02:00
Stanislav Malyshev
770fcdab90
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67060 : use default mode of 660
2014-04-29 09:15:23 -07:00
Stanislav Malyshev
35ceea928b
Fix bug #67060 : use default mode of 660
2014-04-29 09:14:11 -07:00
Ferenc Kovacs
ea1d42641c
separate travis jobs for debug and non-debug builds
2014-04-29 16:09:51 +02:00
Ferenc Kovacs
4cad8fcad2
separate travis jobs for TS and NTS builds
2014-04-29 16:09:42 +02:00
Ferenc Kovacs
35d213c9ce
put this test back to XFAIL, as it was before, since it is still leaking memory
2014-04-29 15:58:00 +02:00
Anatol Belski
3fbacdc6e8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
2014-04-29 13:46:03 +02:00
Anatol Belski
b22f33afe2
updated NEWS
2014-04-29 13:44:54 +02:00
Anatol Belski
2d625b5f81
Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
2014-04-29 13:40:44 +02:00
Popa Adrian Marius
aa1c4fd0be
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/push/php-src :
enable gmp for tests
2014-04-28 12:15:53 +03:00
Popa Adrian Marius
a827fa9cd8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Cleanup ZEND_MODULE_API_NO => 20050922
2014-04-28 12:13:44 +03:00
Popa Adrian Marius
bb422cb60e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Cleanup ZEND_MODULE_API_NO => 20050922
2014-04-28 12:13:11 +03:00
Popa Adrian Marius
dbcd6304bb
Cleanup ZEND_MODULE_API_NO => 20050922
2014-04-28 12:12:52 +03:00
Stanislav Malyshev
b576cbbf05
enable gmp for tests
2014-04-28 00:56:22 -07:00
Anatol Belski
1c7f4d2b4b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed test
2014-04-25 17:40:19 +02:00
Anatol Belski
d3dcd61623
fixed test
2014-04-25 17:39:53 +02:00
Anatol Belski
46344b11b4
updated NEWS
2014-04-25 17:25:37 +02:00
Anatol Belski
cc9f02751b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #67118 DateTime constructor crash with invalid data
2014-04-25 17:24:58 +02:00
Anatol Belski
c1aa9baf29
Fixed bug #67118 DateTime constructor crash with invalid data
2014-04-25 17:23:26 +02:00
Stanislav Malyshev
81098de41c
update NEWS
2014-04-25 00:00:01 -07:00
Stanislav Malyshev
f6841d250a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add a test case previously broken by a bad fix
Revert "Fixed bug #64604 "
2014-04-24 23:59:32 -07:00
Stanislav Malyshev
03c703b8bd
add a test case previously broken by a bad fix
2014-04-24 23:58:38 -07:00
Stanislav Malyshev
a328803803
Revert "Fixed bug #64604 "
...
This reverts commit b05c088a3a
.
Breaks parsing urls where query has : in it, like: /foo/bar?baz=goo:boo
2014-04-24 23:50:45 -07:00
Anatol Belski
db960e82b4
updated libmagic.patch
2014-04-24 20:13:47 +02:00
Anatol Belski
d7bb09cc1d
backport this piece from 5.6, related to the #66307 fix
2014-04-24 19:50:23 +02:00
Anatol Belski
03fa5501a8
Fixed bug #66307 Fileinfo crashes with powerpoint files
2014-04-24 19:30:34 +02:00
Anatol Belski
acfed1c4c7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix dll export
2014-04-24 10:52:22 +02:00
Anatol Belski
03be983398
fix dll export
2014-04-24 10:51:42 +02:00
Stanislav Malyshev
aca526a13b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix accepting ill-formed UTF-8 characters
Conflicts:
ext/phar/phar_path_check.c
2014-04-22 16:57:17 -07:00
Jakub Zelenka
61499bf282
Fix accepting ill-formed UTF-8 characters
...
Conflicts:
ext/phar/phar_path_check.c
2014-04-22 16:55:58 -07:00
Stanislav Malyshev
dafb2af705
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
Conflicts:
ext/phar/phar_path_check.c
2014-04-20 17:22:21 -07:00