1
0
mirror of https://github.com/php/php-src.git synced 2026-03-26 09:12:14 +01:00
Commit Graph

470 Commits

Author SHA1 Message Date
Lior Kaplan
9131cf4924 Add missing variable from birdstep_commit() which got removed in e8fcd52ef 2015-09-03 18:46:07 +03:00
Anatol Belski
8c4bbf0f47 properly export ext/odbc globals 2015-08-02 13:05:10 +02:00
Anatol Belski
4e66cce87c switch to the unified globals accessor where appropriate 2015-07-29 13:26:35 +02:00
Christoph M. Becker
e75cf6b7e4 Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed fix #69975 wrt. ODBCVER < 0x0300
2015-07-03 13:32:05 +02:00
Christoph M. Becker
344ff5dd4c fixed fix #69975 wrt. ODBCVER < 0x0300 2015-07-03 13:30:39 +02:00
Christoph M. Becker
caa539b481 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns
2015-07-03 00:25:03 +02:00
Christoph M. Becker
16db4d1462 Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns
The SQL Server Native Client 11.0 and maybe other ODBC drivers report
NVARCHAR(MAX) columns as SQL_WVARCHAR with size 0. This causes too small a
buffer to be emalloc'd, likely causing a segfault in the following. As we don't
know the real size of the column data, we treat such colums as
SQL_WLONGVARCHAR.

The related bug #67437 suggests that some drivers report a size of ~4GB. It is
not certain that this is really the case (there might be some integer overflow
involved, and anyway, there has been no feedback), so we do not cater for this
now. However, it would not be hard to treat all sizes above a certain threshold
in a similar way, i.e. as SQL_WLONGVARCHAR.
2015-07-03 00:15:47 +02:00
Dmitry Stogov
07e646f8ff Cleanup (avoid reallocation) 2015-07-02 19:09:37 +03:00
Dmitry Stogov
7aa7627172 Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). 2015-06-30 13:59:27 +03:00
Rasmus Lerdorf
28d7bb97a1 Fix more proto comments 2015-06-23 17:46:20 -04:00
Frederic Marchal
f505d11207 Fixed bug #69381 out of memory with sage odbc driver
This is just a hotfix as there are still drivers with no full
ODBC 3.x support. This patch origins from bug #68350 which was
solved by the proper 3.0 migration, another driver (Sage)
turned out to have the real issue.
2015-04-28 15:08:53 +02:00
Anatol Belski
268eb1999b fix bug #69381
a simpler version is to be backported
2015-04-28 15:02:48 +02:00
Stanislav Malyshev
4eb375320e Merge branch 'pull-request/1239'
* pull-request/1239:
  fixes confusing SQLDescribeParam error message
2015-04-18 20:45:16 -07:00
Anatol Belski
8192d645db Merge branch 'PHP-5.6'
* PHP-5.6:
  fix column name attribute with ODBC 3.0
  migrate SQLAllocStmt for ODBC 3.0 compliance
2015-04-17 17:14:18 +02:00
Anatol Belski
e09febb286 fix column name attribute with ODBC 3.0 2015-04-17 17:10:46 +02:00
Anatol Belski
db1596c8b1 migrate SQLAllocStmt for ODBC 3.0 compliance 2015-04-17 17:06:00 +02:00
Christoph M. Becker
d9de707311 fixes confusing SQLDescribeParam error message 2015-04-16 04:12:11 +02:00
Anatol Belski
7eda18514d added test for bug #69354 2015-04-04 21:42:51 +02:00
Anatol Belski
0ae0d0bc53 revert skipif, this should run everywhere 2015-04-04 21:42:43 +02:00
Anatol Belski
d27d9158c9 further ODBC 3.0 compliance 2015-04-04 21:42:33 +02:00
Anatol Belski
5c2aa71e0c more compliance with the ODBC 3.0 2015-04-04 21:42:17 +02:00
Anatol Belski
a5bb37117c test fixes 2015-04-04 21:42:08 +02:00
Anatol Belski
f26592846f added test for bug #69354 2015-04-02 20:19:51 +02:00
Anatol Belski
b244fdfb2f revert skipif, this should run everywhere 2015-04-02 20:19:42 +02:00
Anatol Belski
899362db6e further ODBC 3.0 compliance 2015-04-02 20:19:23 +02:00
Anatol Belski
b3a027d610 more compliance with the ODBC 3.x 2015-04-02 20:18:11 +02:00
Anatol Belski
48447da836 test fixes 2015-04-02 20:16:01 +02:00
Anatol Belski
b13df7327f force ext/odbc to be shared in snapshot build 2015-03-31 12:54:10 +02:00
Anatol Belski
1f84e29506 integrate static tsrm_ls cache for ext/odbc 2015-03-25 15:32:36 +01:00
Remi Collet
23336d77a6 Merge branch 'PHP-5.6'
* PHP-5.6:
  revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared
  Fixed typo
  Fixed typo
2015-03-25 10:33:39 +01:00
Remi Collet
1174b399ad revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared 2015-03-25 10:33:08 +01:00
Anatol Belski
19360f386e cleanup mod version macros, round 3 2015-03-23 20:54:55 +01:00
Stanislav Malyshev
32bd6568d3 Merge branch 'PHP-5.6'
* PHP-5.6:
  Print checking message for all ODBC drivers
  Change default option of ODBC drivers to no to enable bulding standalone ODBC
2015-03-22 22:05:12 -07:00
Lior Kaplan
6f5ed34d20 Print checking message for all ODBC drivers
This makes the output more readble in case no ODBC driver was selected
2015-03-22 22:03:38 -07:00
Lior Kaplan
7a41574239 Change default option of ODBC drivers to no to enable bulding standalone ODBC 2015-03-22 22:03:29 -07:00
Anatol Belski
a759c40872 cosmetic fix to default odbcver 2015-03-23 00:07:09 +01:00
Anatol Belski
6b01927126 cosmetic fix to default odbcver 2015-03-23 00:06:00 +01:00
Remi Collet
02808aeca3 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix odbc build as shared
2015-03-08 07:37:07 +01:00
Remi Collet
43da0d302b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix odbc build as shared
2015-03-08 07:36:35 +01:00
Remi Collet
89f86119d6 Fix odbc build as shared
Broken since a41aa46759
2015-03-08 07:34:51 +01:00
Anatol Belski
f1d1273f2b fix fetching wrong resource 2015-03-06 21:02:29 +01:00
Anatol Belski
1c331d8d39 added ODBCVER to phpinfo() 2015-02-07 11:23:50 +01:00
Anatol Belski
47af2381eb Merge branch 'PHP-5.6'
* PHP-5.6:
  fix setting default ODBCVER value in config.w32
2015-02-06 20:00:26 +01:00
Anatol Belski
464667153d Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix setting default ODBCVER value in config.w32
2015-02-06 19:59:55 +01:00
Anatol Belski
9bf95d8291 fix setting default ODBCVER value in config.w32 2015-02-06 19:59:14 +01:00
Anatol Belski
d0319e60b9 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #68964 Allowed memory size exhausted with odbc_exec
2015-02-06 19:05:43 +01:00
Anatol Belski
e46e208819 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #68964 Allowed memory size exhausted with odbc_exec
2015-02-06 19:05:13 +01:00
Anatol Belski
a41aa46759 Fixed bug #68964 Allowed memory size exhausted with odbc_exec
This is done in two steps:

- the ODBCVER has to be rased to 0x0300 which corresponds to Sql
  Server 9, otherwise the client will not recognize several SQL
  datatypes

- additionally the config scripts was tweaked so then ODBCVER
  can be overridden, that still allows enabling compatibility
  with lower versions

Bug #67437 might be fixed by this as well.
2015-02-06 19:00:27 +01:00
Xinchen Hui
17286ab869 Attempt to port odbc 2015-02-04 13:58:22 +08:00
Anatol Belski
73a6e7e24a fix int to void * cast 2015-02-03 17:52:18 +01:00