-
Notifications
You must be signed in to change notification settings - Fork 7.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix #74779: x() and y() truncating floats to integers
We must not use the locale dependent `atof()`, but instead use the (hopefully) locale independent `zend_strtod()`, when converting string representations of floating point numbers which are sent by the server. Closes GH-6665.
- Loading branch information
Showing
3 changed files
with
46 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
--TEST-- | ||
Bug #74779 (x() and y() truncating floats to integers) | ||
--SKIPIF-- | ||
<?php | ||
require_once('skipif.inc'); | ||
require_once('skipifconnectfailure.inc'); | ||
if (!setlocale(LC_NUMERIC, "de_DE", "de_DE.UTF-8", "de-DE")) die('skip locale not available'); | ||
?> | ||
--FILE-- | ||
<?php | ||
require_once("connect.inc"); | ||
|
||
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { | ||
printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", | ||
$host, $user, $db, $port, $socket); | ||
} | ||
|
||
if (!setlocale(LC_NUMERIC, "de_DE", "de_DE.UTF-8", "de-DE")) { | ||
echo "[002] Cannot set locale\n"; | ||
} | ||
|
||
if (!$link->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE, true)) { | ||
printf("[003] [%d] %s\n", $link->errno, $link->error); | ||
} | ||
|
||
if (!$result = $link->query("SELECT Y(Point(56.7, 53.34))")) { | ||
printf("[004] [%d] %s\n", $link->errno, $link->error); | ||
} | ||
|
||
if (!$array = $result->fetch_array(MYSQLI_ASSOC)) { | ||
printf("[005] [%d] %s\n", $link->errno, $link->error); | ||
} | ||
|
||
var_dump($array); | ||
|
||
mysqli_close($link); | ||
?> | ||
--EXPECT-- | ||
array(1) { | ||
["Y(Point(56.7, 53.34))"]=> | ||
float(53,34) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters