clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,422 Commits 491 Branches 1,363 Tags 844 MiB
7b8222aa44
Commit Graph

963 Commits

Author SHA1 Message Date
Keyur Govande
bcda6c9392 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add to NEWS
  Fix for bug #68114 (Build fails on OS X due to undefined symbols)
 2014-10-07 21:08:18 +00:00
Keyur Govande
648673bffe Fix for bug #68114 (Build fails on OS X due to undefined symbols) 
gcc (i686-apple-darwin10-gcc-4.2.1) on OS X cannot link fixed-width
decimals and fails with undefined symbols errors like ___extendsddf.
If configure used gcc for compiling it would notice and mark the
feature HAVE_DECIMAL_FP_SUPPORT as unsupported.
But configure seems to use cc (i686-apple-darwin10-llvm-gcc-4.2)
instead, which doesn't support fixed-width decimals either, but the
code compiles and links just fine. I suspect it may have something
to do with the llvm backend printed in the version.
Lacking the time to debug this further, the patch fixes the issue by
checking the expected output when fixed-width decimal support is
present and correctly implemented.
 2014-10-07 20:58:43 +00:00
Anatol Belski
0b89bb83ba Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix precision when fetching float through mysqlnd
 2014-09-10 19:31:59 +02:00
Anatol Belski
dff820cea3 fix precision when fetching float through mysqlnd 
fixes failing ext/mysqli/tests/010.phpt
 2014-09-10 19:29:11 +02:00
Anatol Belski
4d667eeaf3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed DBG_INF macro name
 2014-08-27 12:11:35 +02:00
Anatol Belski
7fac56e072 fixed DBG_INF macro name 2014-08-27 12:10:35 +02:00
Lior Kaplan
56d02d564e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  typofixes
 2014-08-17 15:51:15 +03:00
Lior Kaplan
be2128c805 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typofixes
 2014-08-17 15:48:22 +03:00
Veres Lajos
3f42f2f5d1 typofixes 2014-08-17 15:44:02 +03:00
Keyur Govande
032dee4982 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS
  Fix another failing test
  Add NEWS
  Fix failing tests
  Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)

Conflicts:
	ext/mysqli/tests/mysqli_change_user.phpt
 2014-08-15 23:47:06 +00:00
Keyur Govande
7c4b5d9187 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add NEWS
  Fix failing tests
  Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)

Conflicts:
	ext/mysqli/tests/table.inc
 2014-08-15 23:13:36 +00:00
Keyur Govande
c044164a96 Patch for bug #67839 (mysqli does not handle 4-byte floats correctly) 
Before the patch, a value of 9.99 in a FLOAT column came out of mysqli
as 9.9998998641968. This is because it would naively cast a 4-byte float
into PHP's internal 8-byte double.
To fix this, with GCC we use the built-in decimal support to "up-convert"
the 4-byte float to a 8-byte double.
When that is not available, we fall back to converting the float
to a string and then converting the string to a double. This mimics
what MySQL does.
 2014-08-14 18:19:56 +00:00
Andrey Hristov
9959ead309 Use callback structure 2014-08-06 16:50:27 +03:00
Andrey Hristov
3dc9bef819 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/fileinfo/data_file.c
	ext/fileinfo/libmagic/softmagic.c
	ext/fileinfo/magicdata.patch
 2014-08-06 16:25:12 +03:00
Andrey Hristov
41e1ccefd5 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
	configure.in
	main/php_version.h
 2014-08-06 15:27:56 +03:00
Andrey Hristov
547451796c Fix handling of multi-result sets with PS...used to clean not only 
the result set but the whole PS.
 2014-08-06 14:52:12 +03:00
Andrey Hristov
f5deb18b20 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-31 21:28:09 +03:00
Andrey Hristov
95febf26c6 Fix wrong lenght size 2014-07-31 21:27:51 +03:00
Andrey Hristov
23554aae19 Easier to read 2014-07-16 19:50:28 +03:00
Andrey Hristov
06f5f65c94 Add some trace info as well as update CLIENT_ flags 2014-07-16 19:24:39 +03:00
Andrey Hristov
a886a0cf93 Add support for gb18030/MySQL 5.7 2014-06-18 21:53:34 +03:00
Anatol Belski
9e76e87ca9 fix crash in MINFO when no mysqlnd plugins are loaded 2014-04-14 17:44:47 +02:00
Anatol Belski
5c87ed058b fix syntax error in vc++ 2014-04-11 13:08:46 +02:00
Andrey Hristov
090c3e87c0 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 
Conflicts:
	ext/mysqli/tests/mysqli_begin_transaction.phpt
 2014-04-10 16:49:13 +03:00
Andrey Hristov
63791d055a New result fetching mode for mysqlnd, which should use less memory but 
implies more memory copy. The old method is still available and can be used.
It stays as default. Choosing the method is through a flag to mysqli_query()/mysqli_real_query()
New mode can be forced with an INI setting, for all extensions that support this mode
(ext/mysql and mysqli, because PDO due to it's architecture can't support it)
The setting is mysqlnd.fetch_data_copy=[0|1]
 2014-04-10 16:44:54 +03:00
Nikita Popov
eaf44ec397 Remove some usages of hashtable internals 2014-04-09 12:31:21 +02:00
Andrey Hristov
d2ab74588e Merge branch 'PHP-5.5' into PHP-5.6 2014-03-20 16:30:01 +02:00
Andrey Hristov
41b4b84dda Emit a warning in case of unallowed characters. Fix another place this 
code is used - reuse
 2014-03-20 16:23:40 +02:00
Andrey Hristov
e52334fdbe Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/mysqli/mysqli_api.c
 2014-03-20 16:16:12 +02:00
Andrey Hristov
059bc99d94 don't replace with ?, just skip it 2014-03-20 12:11:16 +02:00
Andrey Hristov
01c2ec03bc Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	NEWS
	configure.in
	ext/mysqli/mysqli_api.c
	main/php_version.h
 2014-03-19 18:54:39 +02:00
Andrey Hristov
d63ed101ee Fix problem with mysqli_commt()/mysqli_rollback() 2014-03-19 18:32:19 +02:00
Andrey Hristov
73f03a47d0 DI 2014-03-10 18:18:56 +02:00
Andrey Hristov
990f9c8f3f Switch from a single flag to a flag byte 2014-03-10 17:25:53 +02:00
Andrey Hristov
c8033ac207 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-10 12:53:17 +02:00
Andrey Hristov
3a76cb2d95 Fix indentation 2014-03-10 12:52:56 +02:00
Andrey Hristov
6b804b96b8 Refactor the result set data structures. Move more to the buffered and unbuffered 
substructures. Add methods to these too. Preparing for pluggable interface for
returning data to the engine (zvals, c-style, something else)
 2014-03-05 16:22:23 +02:00
Andrey Hristov
3e59f041da remove dead code 2014-02-17 19:04:01 +02:00
Andrey Hristov
b2cd56c3cb Move code out, that handles the actual structure to be used for the decoded 
data. Will make it easier to add different structures
 2014-02-17 18:37:08 +02:00
Andrey Hristov
c1141d43e9 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-28 15:38:14 +02:00
Andrey Hristov
6b77c3aaa1 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-28 15:33:16 +02:00
Andrey Hristov
79cbcd9ded add text for the new constants 2014-01-28 15:32:59 +02:00
Andrey Hristov
a87125c1e8 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-28 15:24:45 +02:00
Andrey Hristov
d3faae03ec add new consts 2014-01-28 15:23:41 +02:00
Andrey Hristov
350b5dddac WS 2014-01-24 12:31:19 +02:00
Andrey Hristov
cd2cc7b8f9 Reduce code duplication a bit 2014-01-24 11:52:35 +02:00
Andrey Hristov
0c90c207a7 Backport refactoring from php-src 2014-01-24 11:39:24 +02:00
Johannes Schlüter
4d43e2efdb Merge branch 'PHP-5.5' into PHP-5.6 2014-01-21 16:38:32 +01:00
Johannes Schlüter
09eb3cf381 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-21 16:37:02 +01:00
Johannes Schlüter
2311ba7d3f Fix bug #66283 (Segmentation fault after memory_limit) 
There are situations where mysqlnd dupliates zvals while freeing result
sets. If the memory_limit is reached during this operation the engine
will bailout. This patch makes sure that a later attempt (during
RSHIUTDOWN) won't cause a double free, instead we rely on the engine to
free emalloc()ed memory after bailout.
 2014-01-21 16:28:30 +01:00