1
0
mirror of https://github.com/php/php-src.git synced 2026-04-14 19:41:05 +02:00
Commit Graph

75636 Commits

Author SHA1 Message Date
Stanislav Malyshev
e3ca87265d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix test - output can be chunked
2014-05-12 10:54:34 -07:00
Stanislav Malyshev
6ef8e0f088 fix test - output can be chunked 2014-05-12 10:54:16 -07:00
Stanislav Malyshev
c507c9f01b improve CURL tests to allow testing without separate server 2014-05-11 22:43:08 -07:00
Stanislav Malyshev
af5cc61cf3 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
2014-05-11 18:16:19 -07:00
Stanislav Malyshev
291b45afb5 Fix bug #67248 (imageaffinematrixget missing check of parameters) 2014-05-11 18:14:57 -07:00
Stanislav Malyshev
2b475eebbe Fix bug #67247 spl_fixedarray_resize integer overflow 2014-05-11 17:54:27 -07:00
Stanislav Malyshev
14dd6c2d54 fix news 2014-05-11 17:43:28 -07:00
Stanislav Malyshev
cdd1c1122e add tests stuff to README 2014-05-11 16:04:28 -07:00
Bob Weinand
5bc4eb714a Merge branch 'PHP-5.4' into PHP-5.5 2014-05-11 15:15:27 +02:00
Bob Weinand
62b2eb666d Updated NEWS 2014-05-11 15:13:40 +02:00
Bob Weinand
5bf6a093ad Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245)
Linux apparently does not like memcpy in overlapping regions...
2014-05-11 15:11:03 +02:00
Felipe Pena
b99862e7ae Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
2014-05-11 09:46:25 -03:00
Felipe Pena
fb3b8de98d - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org) 2014-05-11 09:45:17 -03:00
Felipe Pena
16b293de50 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Move checking
2014-05-10 11:55:45 -03:00
Felipe Pena
c575ab0c88 - Move checking 2014-05-10 11:55:42 -03:00
Felipe Pena
8bea8cf9cd Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed missing NULL check in SimpleXMLElement::xpath()
2014-05-10 11:53:45 -03:00
Felipe Pena
345f6d90d5 - Fixed missing NULL check in SimpleXMLElement::xpath() 2014-05-10 11:53:40 -03:00
Felipe Pena
2379ec474e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed missing NULL check
2014-05-10 11:39:28 -03:00
Felipe Pena
5bd443a452 - Fixed missing NULL check 2014-05-10 11:39:08 -03:00
Anatol Belski
c62f32c3cc Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
upstream patch applied
2014-05-09 22:15:54 +02:00
Stanislav Malyshev
cf2b9955d4 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  oops, 5.4 and 5.5 use malloc in TSRM
2014-05-08 02:00:23 -07:00
Stanislav Malyshev
4392339c3e oops, 5.4 and 5.5 use malloc in TSRM 2014-05-08 01:59:39 -07:00
Stanislav Malyshev
e9be93b333 make release tags not fail Travis CI 2014-05-08 01:11:29 -07:00
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