clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
110,094 Commits 491 Branches 1,363 Tags 837 MiB
7530938670
Commit Graph

225 Commits

Author SHA1 Message Date
Adam Baratz
0de333bd62 Adjust error formatting so ext/pdo/tests/bug_43130.phpt passes with pdo_dblib 2016-09-13 16:43:33 -04:00
Adam Baratz
69eef8c361 Free error and message strings when cleaning up PDO instances that use pdo_dblib 2016-09-13 16:43:30 -04:00
Adam Baratz
efadcb0390 Add common suite 2016-09-13 16:43:25 -04:00
Adam Baratz
c02ff02953 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Handle SQLDECIMAL/SQLNUMERIC types, which are used by later TDS versions
 2016-09-13 16:33:18 -04:00
Adam Baratz
91c49c4ab0 Handle SQLDECIMAL/SQLNUMERIC types, which are used by later TDS versions 2016-09-13 16:32:37 -04:00
Adam Baratz
421f654874 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Allow \PDO::setAttribute() to set pdo_dblib query timeouts
 2016-09-13 16:14:55 -04:00
Adam Baratz
9cdf2042bd Allow \PDO::setAttribute() to set pdo_dblib query timeouts 2016-09-13 16:13:26 -04:00
Adam Baratz
76af2def79 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Never quote values as raw binary data
 2016-09-12 17:44:33 -04:00
Adam Baratz
2302eef5c9 Never quote values as raw binary data 
This reverts a1a18fca6e which was intended to fix
bug #52885. That commit introduced a BC break which wasn't universally
desirable. The issue of quoting binary data (or NVARCHAR strings, or other
nonstandard types) will have to be addressed separately.
 2016-09-12 17:32:50 -04:00
Stanislav Malyshev
f57c059b96 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Recognize TDS versions 7.3 and 7.4
 2016-09-05 00:29:21 -07:00
Stanislav Malyshev
b5f9427ca9 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Recognize TDS versions 7.3 and 7.4
 2016-09-05 00:29:18 -07:00
Stanislav Malyshev
cee363d609 Merge branch 'pull-request/2061' into PHP-5.6 
* pull-request/2061:
  Recognize TDS versions 7.3 and 7.4
 2016-09-05 00:29:11 -07:00
Stanislav Malyshev
498e36294e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Use integer placeholders, since values can vary with the TDS version
 2016-09-05 00:19:34 -07:00
Stanislav Malyshev
54f6c8d6df Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Use integer placeholders, since values can vary with the TDS version
 2016-09-05 00:19:26 -07:00
Adam Baratz
84d495055d Use integer placeholders, since values can vary with the TDS version 2016-09-05 00:17:59 -07:00
Anatol Belski
726e3b8ff0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
  pdo_dblib: stringify uniqidentifier field
 2016-08-25 19:46:01 +02:00
Alexander Zhuravlev
a000bff2c3 pdo_dblib: stringify uniqidentifier field 
Keep old 5.6 behavior: return Uniqidentifier value as 36-byte hex string (not binary),
when PDO::ATTR_STRINGIFY_FETCHES is TRUE

pdo_dblib: Stringify uniqidentifier field

Keep old 5.6 behavior: return Uniqidentifier value as 36-byte hex string (not binary),
when PDO::ATTR_STRINGIFY_FETCHES is TRUE

Tests added.

pdo_dblib: Stringify uniqidentifier field

Keep old 5.6 behavior: return Uniqidentifier value as 36-byte hex string (not binary),
when PDO::ATTR_STRINGIFY_FETCHES is TRUE

Tests fix.

pdo_dblib: Stringify uniqueidentifier field Added separate PDO::DBLIB_ATTR_STRINGIFY_UNIQUEIDENTIFIER attribute instead of PDO::ATTR_STRINGIFY_FETCHES.

pdo_dblib: Stringify uniqueidentifier field Added `getAttribute` support for PDO::DBLIB_ATTR_STRINGIFY_UNIQUEIDENTIFIER.

Simplify storage of stringify_uniqueidentifier attribute
 2016-08-25 19:37:21 +02:00
Lior Kaplan
283ee1f6dc Recognize TDS versions 7.3 and 7.4 2016-08-07 15:15:59 +03:00
Julien Pauli
1097fe03a1 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Correct for connection with PDO::ATTR_STRINGIFY_FETCHES set to false
 2016-07-08 15:55:22 +02:00
Adam Baratz
8db64e919c Correct for connection with PDO::ATTR_STRINGIFY_FETCHES set to false 2016-07-08 15:54:52 +02:00
Nikita Popov
cc909a8923 Merge branch 'PHP-7.0' 2016-07-05 16:10:25 +02:00
Adam Baratz
f22bc6438d Use size_t instead of int for loop counter 2016-07-05 16:09:27 +02:00
Anatol Belski
6170b2fbae Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix test
  fix bug #71667 (emulate how mssql extension names "computed" columns)
 2016-04-06 14:45:35 +02:00
Anatol Belski
ea64d290fe fix test 2016-04-06 14:44:23 +02:00
Adam Baratz
ed3edc2f05 fix bug #71667 (emulate how mssql extension names "computed" columns) 2016-04-06 14:41:55 +02:00
Anatol Belski
2267812cd2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  return zvals instead of strings, cast or not based on stringify attribute
 2016-04-06 12:23:14 +02:00
Adam Baratz
1e1500a2bc return zvals instead of strings, cast or not based on stringify attribute 2016-04-06 12:18:53 +02:00
Anatol Belski
fe757f09a4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix test
  add skip slow test
 2016-04-06 08:24:09 +02:00
Anatol Belski
354a682c38 fix test 2016-04-06 08:21:10 +02:00
Anatol Belski
fd9137c00c add skip slow test 2016-04-06 08:18:32 +02:00
Adam Baratz
a5e21665ee Add driver-specific attributes for controlling calls to dbsetlogintime() and dbsettime() 2016-04-05 18:24:15 +02:00
Adam Baratz
8a92fed532 Add driver-specific attributes for controlling calls to dbsetlogintime() and dbsettime() 2016-04-05 18:18:37 +02:00
Anatol Belski
b6e42834ed Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix #71943: dblib_handle_quoter needs to allocate an extra byte
 2016-04-04 17:38:04 +02:00
Adam Baratz
9fcfc18ca9 Fix #71943: dblib_handle_quoter needs to allocate an extra byte 2016-04-04 17:33:49 +02:00
Remi Collet
d45f478454 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix #ifdef usage
 2016-03-16 07:18:23 +01:00
Remi Collet
46293ed6d4 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix #ifdef usage
 2016-03-16 07:18:09 +01:00
Remi Collet
478c807128 fix #ifdef usage 2016-03-16 07:17:49 +01:00
Nikita Popov
f57c0b3249 Merge branch 'PHP-7.0' 2016-03-03 16:50:47 +01:00
James Titcumb
c4b188871e Fix bug #71575 removing extra semicolons outside macros 2016-03-03 16:41:03 +01:00
Xinchen Hui
289e492251 Merge branch 'PHP-7.0' 
* PHP-7.0:
  limit size of result set so unit test runs reliably
 2016-03-02 14:27:20 +08:00
Xinchen Hui
db68b8ea54 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  limit size of result set so unit test runs reliably
 2016-03-02 14:27:09 +08:00
Adam Baratz
2e18d438b0 limit size of result set so unit test runs reliably 2016-03-01 17:15:36 -05:00
Xinchen Hui
dd47b3b963 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed another segfault with file_cache_only now
  Fixed bugs #71317 and #71504
  add test for bug #68957
  update NEWS
  update NEWS
  Fixed #54648 PDO::MSSQL forces format of datetime fields
  remove unneeded free parts
  fix leaks and add one more NULL check
  add NULL check
  fix C89 compat
  fix arg type
  fix nmake clean in phpize mode
 2016-03-01 10:51:36 +08:00
Anatol Belski
31dc08a904 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  add test for bug #68957
 2016-02-29 18:44:15 +01:00
Anatol Belski
d78220fb2c add test for bug #68957 2016-02-29 18:43:03 +01:00
Anatol Belski
56ab4a6096 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed #54648 PDO::MSSQL forces format of datetime fields
 2016-02-29 17:07:05 +01:00
Anatol Belski
53c036b30b Fixed #54648 PDO::MSSQL forces format of datetime fields 
adopted patch by steven dot lambeth at gmx dot de
 2016-02-29 17:04:49 +01:00
Anatol Belski
44c3f1492f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  remove unneeded free parts
 2016-02-29 16:30:33 +01:00
Anatol Belski
7816698580 remove unneeded free parts 
See bug #71667, free_statement already does the job
 2016-02-29 16:26:46 +01:00
Anatol Belski
f806fedd80 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix leaks and add one more NULL check
  add NULL check
  fix C89 compat
  fix arg type
 2016-02-29 15:48:51 +01:00
Anatol Belski
d7fd614cc6 fix leaks and add one more NULL check 2016-02-29 15:38:42 +01:00
Anatol Belski
a310c3b484 add NULL check 2016-02-29 15:26:57 +01:00
Anatol Belski
efaafd45b4 fix C89 compat 2016-02-29 15:24:31 +01:00
Anatol Belski
35be4398d1 fix arg type 2016-02-29 15:23:53 +01:00
Adam Baratz
b0793d6d8f Add missing fields to expected test output 2016-02-03 16:50:29 -05:00
Nikita Popov
93dc91b386 Remove version checks 
PHP_VERSION_ID
PHP_API_VERSION
ZEND_MODULE_API_NO
PHP_MAJOR_VERSION, PHP_MINOR_VERSION
ZEND_ENGINE_2

I've left litespeed alone, as it seems to genuinely maintain support
for many PHP versions.
 2016-01-30 15:35:28 +01:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Anatol Belski
af8937c056 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  C89 compat
  use spprintf instead (no need to estrdup afterwards).
  dblib's dbcolname can return null in some cases
  testcase fot bug #69757
  Segmentation fault on pdo_dblib::nextRowset (bug #69757)

Conflicts:
	ext/pdo_dblib/dblib_stmt.c
 2015-10-18 11:28:57 +02:00
Anatol Belski
7f33ab834d C89 compat 2015-10-18 11:14:30 +02:00
MiRacLe.RPZ
2b5af600e3 use spprintf instead (no need to estrdup afterwards). 2015-10-18 11:10:50 +02:00
MiRacLe.RPZ
5c19355095 dblib's dbcolname can return null in some cases 2015-10-18 11:10:45 +02:00
MiRacLe.RPZ
4c8f064d7d testcase fot bug #69757 2015-10-18 11:10:39 +02:00
MiRacLe.RPZ
acb2368976 Segmentation fault on pdo_dblib::nextRowset (bug #69757) 2015-10-18 11:10:34 +02:00
Dmitry Stogov
70c86732cb Use zend_string to represent pdo_column_data.name and avoid duplication. 2015-05-05 16:19:51 +03:00
Anatol Belski
19360f386e cleanup mod version macros, round 3 2015-03-23 20:54:55 +01:00
Maxime BESSON
f384971552 Look for PDO include files in the right folder 
Configure scripts for extensions look for PDO include files in
$prefix/include/php. This change makes them look into $phpincludedir
instead, which may be different from $prefix/include/php.
 2015-02-06 12:06:29 +01:00
Stanislav Malyshev
dfe6aea9ca size_t cleanup for PDO 2015-01-26 16:16:02 -08:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
STANLEY SUFFICOOL
f35e6a8394 Update PDO_DBLIB README file 2014-10-24 20:30:18 -07:00
STANLEY SUFFICOOL
a1a18fca6e Fixed Bug #52885 - PDO_DBLIB: Binary data may be truncated 
Data containing characters in conflict with the server
codepage or containing null char will throw an error.
Implement binary quoting to allow binding of binary values.
 2014-10-24 20:10:04 -07:00
STANLEY SUFFICOOL
560649283c Implement Bug #66062 - pdo_dblib enable timeout parameter 2014-10-22 23:17:28 -07:00
Stanley Sufficool
83144a7281 Fixed bug #64511 - pdo_dblib segfaults or leaks on nextRowset() 2014-10-22 20:13:22 -07:00
Stanley Sufficool
09cf64678a Fix bug #67134 (PDO_DBLIB Missing null string terminator) 2014-10-20 21:44:47 -07:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
4ed156d4df ported from pdo - pgsql, odbc, mysql, firebirt, dblib 2014-08-19 19:02:07 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Stanley Sufficool
9c7dbb0487 Fix bug #64338 pdo_dblib can't connect to Azure SQL 2013-10-05 18:26:25 -07:00
Derick Rethans
9ef4e5d23d Merge branch 'PHP-5.5' 2013-09-27 10:14:51 +01:00
Stanley Sufficool
ac05cfb499 FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver 2013-09-26 19:53:47 -07:00
Stanislav Malyshev
f20d28a6b1 Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1)) 
The exists test should has covered this bug

Conflicts:

	ext/pdo_dblib/dblib_driver.c
 2013-08-04 19:19:37 -07:00
Stanley Sufficool
d012bdca03 Fix Bug #65219 
DBSETLDBNAME should be called before login to set DBNAME in login record
 2013-07-14 11:16:42 -07:00
Felipe Pena
7549beb102 - Fixed build on FreeTDS 0.82 2013-07-03 15:02:03 -03:00
Stanley Sufficool
5a04ab9a54 Fix PDO_DBLIB bugs: #64338, #64808, #63638 
Synchronize with master
 2013-06-03 20:02:08 -07:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
0c0b5a3543 Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1)) 
The exists test should has covered this bug
 2012-10-12 10:37:05 +08:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
d080277d97 - Fixed bug #60033 (Incorrectly merged PDO dblib patches break uniqueidentifier column type) 2011-10-12 01:24:51 +00:00
Felipe Pena
707a8f70b8 - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Rasmus Lerdorf
8e256774b0 Cache the PDO include path 2011-05-15 05:24:34 +00:00
Felipe Pena
6ba343aeff - Fixed bug #54167 (PDO_DBLIB returns null on SQLUNIQUE field) 
# initial patch by: mjh at hodginsmedia dot com (5.3)
# trunk version by me
 2011-03-05 23:07:45 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Stanley Sufficool
013725218a Remove non C90 quotes 2010-09-29 00:55:43 +00:00