Christoph M. Becker
7958a7b38f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed bug #61221 - imagegammacorrect function loses alpha channel
2015-06-17 02:18:53 +02:00
Christoph M. Becker
61d58f2d9e
updated NEWS
2015-06-17 02:17:40 +02:00
Christoph M. Becker
7469c7e7d0
Fixed bug #61221 - imagegammacorrect function loses alpha channel
...
When applying imagegammacorrect() the alpha channel is now fully retained, instead of being completely lost.
2015-06-17 02:15:59 +02:00
Derick Rethans
c661e7680f
- Updated to version 2015.5 (2015e)
2015-06-15 10:41:30 +01:00
Derick Rethans
76c3117af5
Empty merge
2015-06-15 10:41:30 +01:00
Derick Rethans
558342124e
- Updated to version 2015.5 (2015e)
2015-06-15 10:41:29 +01:00
Derick Rethans
22a43410cb
- Updated to version 2015.5 (2015e)
2015-06-15 10:28:23 +01:00
Derick Rethans
dab34e2433
Empty merge
2015-06-15 10:28:23 +01:00
Derick Rethans
9026a66579
- Updated to version 2015.5 (2015e)
2015-06-15 10:28:22 +01:00
Derick Rethans
4903f1d139
- Updated to version .-96 ()
2015-06-15 10:17:24 +01:00
Derick Rethans
3f93e4485e
Empty merge
2015-06-15 10:17:24 +01:00
Derick Rethans
1d6f4891bd
- Updated to version .-96 ()
2015-06-15 10:17:23 +01:00
Matteo Beccati
b564aa95be
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix copy/paste error in test
2015-06-13 08:08:21 +02:00
Matteo Beccati
9e4d720825
Fix copy/paste error in test
2015-06-13 08:07:49 +02:00
Matteo Beccati
3bb1a4ffe3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
Fixed bug #61574 - No MSI
Conflicts:
ext/pdo_pgsql/pgsql_driver.c
2015-06-12 02:07:02 +02:00
Matteo Beccati
b60efdce9f
Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
2015-06-12 02:05:28 +02:00
Matteo Beccati
afa4c3e7c7
Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
2015-06-12 00:21:48 +02:00
Matteo Beccati
7c0b8f872e
Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
2015-06-12 00:20:33 +02:00
Christoph M. Becker
8de667b8d2
Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6
2015-06-11 23:55:10 +02:00
Christoph M. Becker
d8223c4424
Fixed bug #61574 - No MSI
...
The information regarding the Windows installers (.msi) in install.txt are
obsolete, so let's remove them.
2015-06-11 22:52:30 +02:00
Christoph M. Becker
44b09b80f2
Fixed bug #61574 - No MSI
...
The information regarding the Windows installers (.msi) in install.txt are
obsolete, so let's remove them.
2015-06-11 22:44:14 +02:00
Nikita Popov
1acf55eb75
Fixed bug #69803
2015-06-11 22:20:05 +02:00
Ferenc Kovacs
3f471c1c69
this is in 5.6.10, not in 5.6.9
2015-06-11 20:30:56 +02:00
Nikita Popov
8405265578
Fix bug #69740
2015-06-11 17:40:10 +02:00
Anatol Belski
702e349df4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
rework that test to allow delta for rounding errors
2015-06-11 17:06:46 +02:00
Anatol Belski
a037b6de21
rework that test to allow delta for rounding errors
...
If this workout doesn't make travis happy, the patch needs to be
reviewed as the leak might still persist.
2015-06-11 17:05:03 +02:00
Anatol Belski
d777669679
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
improve test
2015-06-11 15:36:30 +02:00
Anatol Belski
dcfd1153ec
improve test
2015-06-11 15:36:02 +02:00
Anatol Belski
b19790ab34
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added test for bug #69646
2015-06-11 12:07:32 +02:00
Anatol Belski
e711325ca6
added test for bug #69646
2015-06-11 12:06:59 +02:00
Stanislav Malyshev
9d162550ac
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix bad copypaste
2015-06-11 01:52:23 -07:00
Stanislav Malyshev
cd927cca50
fix bad copypaste
2015-06-11 01:51:55 -07:00
Ferenc Kovacs
f4d820f2ee
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
make it possible to set the re2c and yacc paths via environment variables for genfiles
2015-06-11 00:13:40 +02:00
Ferenc Kovacs
72b8a30c1a
make it possible to set the re2c and yacc paths via environment variables for genfiles
2015-06-11 00:13:08 +02:00
Anatol Belski
2b0a19f4ed
updated NEWS
2015-06-10 16:41:33 +02:00
Anatol Belski
effbc87ff1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
fix memory leak in pdo_pgsql closeCursor (bug 69752)
2015-06-10 16:41:07 +02:00
Anatol Belski
9d5ab7e22f
updated NEWS
2015-06-10 16:40:38 +02:00
Philip Hofstetter
9ba3a4c66a
fix memory leak in pdo_pgsql closeCursor (bug 69752)
...
the parent PDO closeCursor method resets the pdo_stmt_t's executed flag
which is used by the postgres driver as a flag to check whether to
allocate memory for the column data or not.
This means that after the parent closeCursor() has been called, the
pdo_pgsql driver will allocate a new buffer for the columns, so the
existing buffer should be freed when the cursor is being closed.
2015-06-10 16:36:00 +02:00
Anatol Belski
b1f3403c98
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
regenerated the ini scanner
2015-06-10 13:16:29 +02:00
Anatol Belski
f14141aca2
regenerated the ini scanner
...
follow up fix for bug #69551
2015-06-10 13:15:01 +02:00
Anatol Belski
2c55ae5261
updated NEWS
2015-06-10 11:26:00 +02:00
Anatol Belski
64df05d5b1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
Revert "Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
2015-06-10 11:25:21 +02:00
Anatol Belski
60e181c20a
updated NEWS
2015-06-10 11:24:45 +02:00
Christian Wenz
0c8136654d
Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
2015-06-10 11:22:30 +02:00
Christian Wenz
82e5260104
Revert "Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
...
This reverts commit 4a05c81b85
.
2015-06-10 11:22:29 +02:00
Christian Wenz
741b949a6f
Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
2015-06-10 11:22:28 +02:00
Anatol Belski
f4707ed256
updated NEWS
2015-06-10 10:44:02 +02:00
Anatol Belski
ca467d5117
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
made failing test more meaningful
added failing test
2015-06-10 10:43:23 +02:00
Anatol Belski
aef5a02ebb
updated NEWS
2015-06-10 10:42:31 +02:00
Christoph M. Becker
36222eb4cc
fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
2015-06-10 10:39:37 +02:00