clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
95,640 Commits 491 Branches 1,363 Tags 846 MiB
66ad7918b8
Commit Graph

41637 Commits

Author SHA1 Message Date
Anatol Belski
66ad7918b8 fix uninitialized member 2016-12-08 17:15:06 +01:00
Anatol Belski
ff6565462e git clean section 2016-12-08 03:24:18 +01:00
Dorin Marcoci
13ffa88e1f Fixed bug #72931 PDO_FIREBIRD with Firebird 3.0 not work on returning statement 2016-12-07 21:06:11 +01:00
Anatol Belski
9b1430140a fix leak, take on 7.x 2016-12-06 14:42:59 +01:00
Stanislav Malyshev
183b4d78aa Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  This still leaks memory, I don't have enough knowledge in WDDX code to fix them :(
 2016-12-05 22:33:33 -08:00
Stanislav Malyshev
d7ce944cf1 This still leaks memory, I don't have enough knowledge in WDDX code to fix them :( 2016-12-05 22:32:59 -08:00
Stanislav Malyshev
1d59ed7524 Fix bug #73645 - int/size_t confusion 2016-12-05 22:16:00 -08:00
Stanislav Malyshev
6292fe84d3 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #73631 - Invalid read when wddx decodes empty boolean element
 2016-12-05 21:58:55 -08:00
Stanislav Malyshev
266ecb6d0a Fix bug #73631 - Invalid read when wddx decodes empty boolean element 2016-12-05 21:40:55 -08:00
Anatol Belski
eddca73ad2 fix test 
This test depends on connection flags modifable from teh env,
that can affect the exact function called.
 2016-12-04 22:42:39 +01:00
Anatol Belski
1eb3f01c68 fix test 
On Windows, either doubled backslashes or forward slashes are supported
on the server side.
 2016-12-04 22:27:17 +01:00
Anatol Belski
69fbc751ff fix ident 2016-12-04 20:59:12 +01:00
Anatol Belski
8e209d0435 fix test 2016-12-04 17:28:43 +01:00
Anatol Belski
10a2ceef3b enforce the test ini usage for the child process 2016-12-04 14:01:40 +01:00
Anatol Belski
2252d4e59d fork tests 2016-12-01 14:52:18 +01:00
Dmitry Stogov
7f22e3c879 Fixed bad merge 2016-12-01 16:21:57 +03:00
Dmitry Stogov
b7b7dd8cea Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Workaround for GCC-4.9.2 bug
  oops, changed in wrong place
 2016-12-01 15:50:05 +03:00
Anatol Belski
043d8e2fe1 improve skipif 2016-12-01 13:32:10 +01:00
Dmitry Stogov
003346c450 Simpler overflow check 2016-12-01 10:30:02 +03:00
Nuno Lopes
d5a2af6d1c Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0 2016-11-30 14:41:26 -05:00
Dmitry Stogov
9a9ad56af0 Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filter is working on). 2016-11-28 12:54:47 +03:00
Stanislav Malyshev
c8778eb293 oops, changed in wrong place 2016-11-27 16:11:41 -08:00
Stanislav Malyshev
f1a9851c3e Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix #68447: grapheme_extract take an extra trailing character
 2016-11-27 15:36:29 -08:00
Stanislav Malyshev
8856b3a63c Merge branch 'pull-request/1974' into PHP-5.6 
* pull-request/1974:
  Fix #68447: grapheme_extract take an extra trailing character
 2016-11-27 15:34:58 -08:00
Stanislav Malyshev
1cb58ead70 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix #73549: Use after free when stream is passed to imagepng
 2016-11-27 14:53:27 -08:00
Christoph M. Becker
5049ef2f1c Fix #73549: Use after free when stream is passed to imagepng 
If a stream is passed to imagepng() or other image output functions,
opposed to a filename, we must not close this stream.
 2016-11-27 14:51:02 -08:00
Matteo Beccati
54c04befc2 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix occasionaly failing test
 2016-11-27 10:20:38 +01:00
Matteo Beccati
2a80758fd5 Fix occasionaly failing test 2016-11-27 10:20:13 +01:00
Stanislav Malyshev
bc85678df3 Add more mbfl string size checks (bug #73505) 2016-11-26 14:49:48 -08:00
Stanislav Malyshev
58cdd03d92 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Add more mbfl string size checks (bug #73505)
 2016-11-26 14:48:40 -08:00
Stanislav Malyshev
5ee02b207d Add more mbfl string size checks (bug #73505) 2016-11-26 14:47:58 -08:00
Christoph M. Becker
003727d851 Fix #73612: preg_*() may leak memory 
We have to make sure that collectible zvals end up in the GC root
buffer, to avoid memory leaks.
 2016-11-26 15:34:27 +01:00
Stanislav Malyshev
8be94d46f8 Fix more size_t/int implicit conversions 
Now the conversions are explicit and do checks. Not sure it's
the best way but at least we can see them now in the open.
 2016-11-25 15:31:50 -08:00
Stanislav Malyshev
bcc913fa8b Fix int/size_t confusion in isValidPharFilename (bug #73580) 2016-11-25 15:31:50 -08:00
Christoph M. Becker
bc979aee6d Merge branch 'PHP-5.6' into PHP-7.0 2016-11-25 23:16:18 +01:00
Christoph M. Becker
7f529e3dee Fix #73582: Failing ext/gd/tests/imagettftext_charmap_order.phpt 
This test is not supposed to work with JIS-mapped Japanese font support
enabled.
 2016-11-25 23:14:08 +01:00
Anatol Belski
a36dd1dfd8 add test for bug #57547 2016-11-24 19:25:47 +01:00
Derick Rethans
c38f2c2a6b Updated to version 2016.10 (2016j) 2016-11-24 10:40:14 +00:00
Derick Rethans
6785ea2340 Updated to version 2016.10 (2016j) 2016-11-24 10:40:11 +00:00
Nikita Popov
5b88c61580 Merge branch 'PHP-5.6' into PHP-7.0 2016-11-22 19:25:31 +01:00
Nikita Popov
2d19c92fc2 Make php_url_parse_ex() respect length argument 
This should fix all out-of-bounds reads that could previously
occur if the string passed to php_url_parse_ex() is not NUL
terminated.
 2016-11-22 19:24:24 +01:00
Nikita Popov
f0f68c7274 Cleanup parse_url() query/fragment handling 
The query/fragment handling was pretty convoluted, with many parts
being duplicated. Simplify by checking for fragment, then for query,
then for path.
 2016-11-22 19:24:23 +01:00
Nikita Popov
9befad6fc2 Cleanup parse_url() gotos 
Simplify some unnecessarily complicated code. In particular the
length updates are unnecessary (length is only used at the very
start) and we're goto'ing around a bit too much.
 2016-11-22 19:24:21 +01:00
Anatol Belski
58aa1a70a0 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #73498
  Add a test for bug 73498
 2016-11-22 00:46:03 +01:00
Craig Duncan
644e290fcd Fix bug #73498 
Postgres uses the DELIMITER keyword since 7.3
And WITH is no longer required/used
 2016-11-22 00:42:45 +01:00
Craig Duncan
d36d4c70d3 Add a test for bug 73498 2016-11-22 00:42:45 +01:00
Anatol Belski
5e9b4c26a5 remove TSRMLS_* 2016-11-21 23:53:37 +01:00
Anatol Belski
eb53865dfd Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  add test for bug #73452
  Backport 15ac4904 to 5.6
 2016-11-21 15:29:44 +01:00
Anatol Belski
4805be1db6 add test for bug #73452 2016-11-21 15:25:46 +01:00
Anatol Belski
0da5cb5fb6 Backport 15ac4904 to 5.6 2016-11-21 15:20:03 +01:00