php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 19:52:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
98,432 Commits 547 Branches 1,481 Tags
bbdff7ea24d97cdc198b413165a5218213b6c22d
Commit Graph

43118 Commits

Author SHA1 Message Date
Nikita Popov
bbe0cca221 Drop SXE_ELEMENT_BY_NAME 
Effectively commented out code
 2016-09-04 12:31:06 +02:00
Nikita Popov
f1fc531e74 Drop unnecessary macro redefinition 2016-09-04 12:28:00 +02:00
Christoph M. Becker
5b011b0d8a Remove support for ORIGINAL_LIB_JPEG 
This had already been removed in GD 2.1.0, and wouldn't compile anyway.
 2016-09-03 21:33:40 +02:00
Christoph M. Becker
ee86b5c254 Merge branch 'PHP-7.1' 2016-09-03 20:11:15 +02:00
Christoph M. Becker
85824eda36 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-03 20:09:50 +02:00
Christoph M. Becker
8cc9570f53 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-03 19:59:44 +02:00
Christoph M. Becker
d582241368 Fix #67325: imagetruecolortopalette: white is duplicated in palette 
gdImageTrueColorToPalette() is sometimes wasteful by putting multiple white
color entries into the palette. This is caused by an obvious typo, where
to avoid a division by zero when `total` is zero, `count` is checked instead
of `total`.

We fix this issue to improve the quality of the color quantization.

Cf. <https://github.com/libgd/libgd/commit/24b4550f>
 2016-09-03 19:50:42 +02:00
Anatol Belski
950a4ef0e9 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix leak and error check order
 2016-09-03 17:05:28 +02:00
Anatol Belski
1b2a06fe64 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix leak and error check order
 2016-09-03 17:04:43 +02:00
Anatol Belski
c9040d43a8 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix leak and error check order
 2016-09-03 17:03:55 +02:00
Anatol Belski
9513187dee fix leak and error check order 2016-09-03 16:59:17 +02:00
Christoph M. Becker
af69021f67 Merge branch 'PHP-7.1' 2016-09-03 14:01:39 +02:00
Christoph M. Becker
9eeb705eca Merge branch 'PHP-7.0' into PHP-7.1 2016-09-03 13:53:07 +02:00
Christoph M. Becker
0bc7e0c0ce Merge branch 'PHP-5.6' into PHP-7.0 2016-09-03 13:46:03 +02:00
Christoph M. Becker
bca913d70a Fix proto comment 
While we're at it, we also change a related comment to use American English
consistently.
 2016-09-03 13:41:29 +02:00
Christoph M. Becker
2c91684394 Replace dirname(__FILE__) with __DIR__ in tests 2016-09-03 00:56:09 +02:00
Christoph M. Becker
f2ee4dec99 Merge branch 'PHP-7.1' 2016-09-03 00:41:33 +02:00
Christoph M. Becker
b8d26ebb9a Merge branch 'PHP-7.0' into PHP-7.1 2016-09-03 00:40:05 +02:00
Christoph M. Becker
f3dc00fdfb Merge branch 'PHP-5.6' into PHP-7.0 2016-09-03 00:30:05 +02:00
Christoph M. Becker
c83bdb8e6a Make test case more resilient 
When ran from a root directory the test case failed, because the open_basedir
restriction for "../[…]" won't kick in. Therefore we change the current
working directory to the test case's directory, as discussed on internals,
see <http://news.php.net/php.internals/95585>.
 2016-09-03 00:24:30 +02:00
Anatol Belski
54ef995ed6 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix double free
 2016-09-03 00:06:36 +02:00
Anatol Belski
e89c09ba29 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix double free
 2016-09-03 00:06:16 +02:00
Anatol Belski
7483acf511 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix double free
 2016-09-03 00:05:02 +02:00
Anatol Belski
5efd2a33df fix double free 2016-09-03 00:01:04 +02:00
Anatol Belski
5a0b45ab10 Merge branch 'PHP-7.1' 
* PHP-7.1:
  improve fix
  fix leak
  fix leak
 2016-09-02 23:55:22 +02:00
Anatol Belski
e4564e4b98 improve fix 2016-09-02 23:33:43 +02:00
Anatol Belski
93bb779433 fix leak 2016-09-02 23:31:26 +02:00
Anatol Belski
0b5faa4461 fix leak 2016-09-02 20:20:37 +02:00
Christoph M. Becker
3a2286422e Merge branch 'pull-request/2078' 2016-09-02 20:12:55 +02:00
Anatol Belski
8bf4eb461a Merge branch 'PHP-7.1' 
* PHP-7.1:
  Add skipifs to some mb path tests
  fix leak
  fix mem leak
 2016-09-02 19:47:08 +02:00
Anatol Belski
596f488e06 Add skipifs to some mb path tests 
These were invented primarily to test the multibyte path handling
patch on Windows. How it turns out by PR #2105, some test issues
on some filesystems are possible. Particularly HFS is configurable
to use different ways to save filenames, see
https://developer.apple.com/library/mac/qa/qa1173/_index.html
This makes it impossible to test the filenames byte wise, while
the results are still correct. There are still several other tests
using UTF-8 file names spread over other extensions. So far no
false positives are to see, they don't need to be touched.
 2016-09-02 19:46:32 +02:00
Anatol Belski
2c02e93e69 fix leak 2016-09-02 19:46:32 +02:00
Anatol Belski
44e43a4738 fix mem leak 2016-09-02 19:46:32 +02:00
Christoph M. Becker
0bf11d1e71 Implement FAST_ZPP support for imagecolorat() and imagesetpixel() 
These functions may be used in tight loops to do image manipulation in
userland. Using FAST_ZPP is supposed to bring considerable performance
improvements in this case; we've been able to measure up to 25%.
 2016-09-02 19:06:26 +02:00
Christoph M. Becker
a565f06d89 Merge branch 'PHP-7.1' 2016-09-02 18:00:06 +02:00
Christoph M. Becker
8f110ee4dc Update to SQLite 3.14.1 2016-09-02 17:58:16 +02:00
Julien Pauli
94ed034827 Revert "Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT." 
This reverts commit 04115b4e3f.
 2016-09-02 17:57:17 +02:00
Julien Pauli
0dbcdceb28 Revert "PHP 7 compat" 
This reverts commit 24a57ee03b.
 2016-09-02 17:57:09 +02:00
Christoph M. Becker
67153d644d Fix typo 2016-09-02 17:34:11 +02:00
Julien Pauli
85ff5f9572 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix warning about sign-mismatch comparisons
 2016-09-02 17:02:43 +02:00
Julien Pauli
24a57ee03b PHP 7 compat 2016-09-02 17:02:39 +02:00
Bishop Bettini
04115b4e3f Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT. 
Conflicts:
	ext/pdo/pdo_stmt.c
 2016-09-02 17:02:39 +02:00
Julien Pauli
e681b8771b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix warning about sign-mismatch comparisons
 2016-09-02 17:02:25 +02:00
Julien Pauli
e14b14d026 Fix warning about sign-mismatch comparisons 2016-09-02 17:01:52 +02:00
Stanislav Malyshev
9ca79ad832 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix bug #72910
  5.6.27 will be next
 2016-09-01 23:29:34 -07:00
Stanislav Malyshev
01f4a52aaa Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #72910
  5.6.27 will be next
 2016-09-01 23:29:17 -07:00
Stanislav Malyshev
ccc8d92d3d Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #72910
  5.6.27 will be next
 2016-09-01 23:28:44 -07:00
Stanislav Malyshev
e576714f6b Fix bug #72910 
Merge upstream patch from 65bdf2a0d1
 2016-09-01 23:27:06 -07:00
Yasuo Ohgaki
b651b96738 Allow array input for mb_check_encoding() 2016-09-02 14:18:34 +09:00
Anatol Belski
edc4de58b7 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix useless assignment
  avoid needless function call
  remove useless assignment
  remove unused assignment
  rewrite the getcwd part
  fix leak
  fix unused assignment
  remove duplicated symbol
 2016-09-01 23:54:33 +02:00