mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
126,816 Commits 500 Branches 1,381 Tags 797 MiB
2145f80d4b
Commit Graph

663 Commits

Author SHA1 Message Date
Anatol Belski
23287a0a81 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #73725 Unable to retrieve value of varchar(max) type
 2018-01-22 17:05:03 +01:00
Anatol Belski
e403e122cd Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #73725 Unable to retrieve value of varchar(max) type
 2018-01-22 17:03:48 +01:00
Anatol Belski
2384ade53c Fixed bug #73725 Unable to retrieve value of varchar(max) type 2018-01-22 17:02:54 +01:00
Gabriel Caruso
6400264856 Trailing whitespaces 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-01-03 14:38:00 +01:00
Xinchen Hui
a6519d0514 year++ 2018-01-02 12:57:58 +08:00
Xinchen Hui
7a7ec01a49 year++ 2018-01-02 12:55:14 +08:00
Xinchen Hui
ccd4716ec7 year++ 2018-01-02 12:53:31 +08:00
Anatol Belski
e68084780f Tell the diff by returning NULL, if system has no ODBC data sources 2017-12-20 22:32:54 +01:00
Anatol Belski
09a3da88f0 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Templatize driver name in the expected string
 2017-12-20 18:50:52 +01:00
Anatol Belski
dcc3f00090 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Templatize driver name in the expected string
 2017-12-20 18:50:10 +01:00
Anatol Belski
c2308d5d7c Templatize driver name in the expected string 2017-12-20 18:46:56 +01:00
Dmitry Stogov
9e709e2fa0 Move constants into read-only data segment 2017-12-14 18:43:44 +03:00
Dmitry Stogov
67d5f39a47 Persistent resources are "thread-local". 
Register persistent resources through new functions zend_register_persistent_resource()/zend_register_persistent_resource_ex().
 2017-11-01 15:19:31 +03:00
Dmitry Stogov
49ea143bbd Encapsulate reference-counting primitives. 
Prohibit direct update of GC_REFCOUNT(), GC_SET_REFCOUNT(), GC_ADDREF() and GC_DELREF() shoukf be instead.
Added mactros to validate reference-counting (disabled for now).
These macros are going to be used to eliminate race-condintions during reference-counting on data shared between threads.
 2017-10-27 01:28:58 +03:00
Kalle Sommer Nielsen
a35e39f1f7 ODBC Solid is not supported in our build system on Windows, so remove this #ifdef 2017-07-28 10:34:38 +02:00
Kalle Sommer Nielsen
398be731e6 Removed support for ODBCRouter 2017-07-28 10:31:48 +02:00
Kalle Sommer Nielsen
a398df3e36 Removed Bird(broken)step support from ODBC 2017-07-19 10:19:32 +02:00
Sammy Kaye Powers
dac6c639bb Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06:00
Kalle Sommer Nielsen
d4831e2d0a Eliminate win95nt.h 
- Most of this is builtin php.h now
- Removed some dead defines
- We now pass /D _USE_MATH_DEFINES for M_PI etc
 2016-12-22 06:51:18 +01:00
Kalle Sommer Nielsen
a569d003e2 Hmm actually it seems to be the other way around, Anatol? 2016-12-22 05:53:13 +01:00
Kalle Sommer Nielsen
34283026da Sync the default value of --with-odbcver with the hardcoded default for ODBCVER 2016-12-22 05:46:12 +01:00
Nikita Popov
5af586bec5 Remove more PHP 6 leftovers from tests 2016-11-24 22:39:39 +01:00
Anatol Belski
271a593198 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  avoid unneeded copying
 2016-11-07 21:19:04 +01:00
Anatol Belski
0c2156d190 avoid unneeded copying 2016-11-07 21:09:03 +01:00
Anatol Belski
1257287dbd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add test for bug #73448
 2016-11-07 20:40:46 +01:00
Anatol Belski
f0676cbe20 Add test for bug #73448 2016-11-07 20:39:51 +01:00
Anatol Belski
42925630a4 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73448 odbc_errormsg returns trash, always 513 bytes
 2016-11-07 20:21:56 +01:00
Anatol Belski
3558e70e58 Fixed bug #73448 odbc_errormsg returns trash, always 513 bytes 2016-11-07 20:18:29 +01:00
Anatol Belski
4b9362d347 Increase ODBCVER to 3.5 by default 2016-07-04 16:48:59 +02:00
Dmitry Stogov
323b2733f6 Fixed compilation warnings 2016-06-22 00:40:50 +03:00
Remi Collet
2291ebc0ea Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  NEWS
  Fix Bug #63171 	Script hangs after max_execution_time
 2016-03-17 13:42:34 +01:00
Remi Collet
407ad28ae5 Fix Bug #63171 Script hangs after max_execution_time 
If aborted via timer expiration, don't try to call any unixODBC function
which may hangs because of internal locks
 2016-03-17 13:38:45 +01:00
Anatol Belski
704a9aeea7 fix pointer truncation on 64 bit 2016-03-14 16:44:27 +01:00
Nikita Popov
1ac152938c Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE 
Also re bug #71575.
 2016-03-03 16:50:01 +01:00
Anatol Belski
c9778d3eb9 Port patch and test for bug #47803 to 7.0 
See ff115e285a
 2016-02-24 12:03:21 +01:00
Anatol Belski
90ad6e3c6c add test for bug #47803 2016-02-24 11:49:02 +01:00
Anatol Belski
ff115e285a Fixed bug #47803 
Executing prepared statements is succesfull only for the first two statements

The reworked patch descends to the bug #69526 which is fixed by
this as well. The broken logic in the current code was, that
SQLDescribeParam was executed in odbc_execute every time. This piece
is now moved into odbc_prepare and the results are carried on in an
additional structure.

Since the ext/odbc headers are not being currently installed and the
corresponding structs like odbc_result are not used outside ext/odbc,
the binary compatibility persists. Executing SQLDescribeParam only once
in odbc_prepare is also an optimization as the filds usually won't
change that fast and thus requestind the descriptions on every
execution is not required.
 2016-02-24 11:40:35 +01:00
Anatol Belski
01e85f3fdc add test for bug #71171 2016-02-23 14:39:17 +01:00
Anatol Belski
cd75429ad8 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  make ext/odbc test credentials configurable
 2016-02-23 14:22:06 +01:00
Anatol Belski
9623d2dd83 make ext/odbc test credentials configurable 2016-02-23 14:21:04 +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
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
Rasmus Lerdorf
030b4b29db int -> size_t 2015-01-20 22:58:31 -08:00
Xinchen Hui
af6119cf6c Fixed key length 2015-01-16 00:56:21 -05: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
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Veres Lajos
4b9535341a typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-19 20:23:00 +00:00
Keyur Govande
9ca16fd809 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add to NEWS
  Add to NEWS
  Fix for bug #68087 (ODBC not reading DATE columns correctly)
 2014-10-07 21:23:04 +00:00
Keyur Govande
92f108801e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add to NEWS
  Fix for bug #68087 (ODBC not reading DATE columns correctly)
 2014-10-07 21:22:07 +00:00
Keyur Govande
df9078ea55 Fix for bug #68087 (ODBC not reading DATE columns correctly) 
Temporary variable indicating column field type ID should be
reset to default for loop iteration (i.e. every column in the
record set. The old buggy code made it persist across all columns
leading to invalid reads from the buffer, if for example a DATE
column was preceded by a VARCHAR column.
 2014-10-07 21:17:36 +00:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski
cbf530c7c0 fix possible pointer truncation 2014-09-14 12:18:52 +02:00
Dmitry Stogov
88d7ca44f6 Refactored INI subsystem to use zend_string* instead of char* 2014-09-01 20:57:33 +04:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Anatol Belski
202e8db1dc fixed several long vs zend_long casts 2014-08-26 11:26:53 +02:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski
4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
70de6180d5 fixes to %pd format usage 2014-08-24 02:35:34 +02:00
Anatol Belski
e8fcd52ef1 ported ext/odbc 2014-08-19 19:35:29 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Dmitry Stogov
01c8aee7d2 cleanup 2014-08-13 22:18:05 +04:00
Dmitry Stogov
06476e5291 Fixed ext/odbc 2014-08-12 11:27:30 +04:00
Dmitry Stogov
c4fc99ff82 ext/odbc support for phpng (incomplete) 2014-08-12 02:10:30 +04:00
Dmitry Stogov
7301994c28 Merge branch 'master' into phpng 
* master: (46 commits)
  PHP_INT_MIN and _MAX tests
  NEWS and UPGRADING
  Added PHP_INT_MIN
  Fix wrong lenght size
  Bug #51096 - Remove unnecessary ? for first/last day of
  Moved streams related functions to xp_ssl.c
  Remove duplicate NEWS
  Update NEWS
  Update NEWS
  Update NEWS
  BFN
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
  We need to turn off any strict mode here for this warning to show up
  Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
  Revert "Fix bug #67064 in a BC safe way"
  Updated NEWS for #67693
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array
  add missing entry to NEWS
  ...

Conflicts:
	Zend/tests/errmsg_040.phpt
	Zend/tests/ns_059.phpt
	Zend/zend_language_parser.y
	Zend/zend_vm_def.h
	ext/openssl/openssl.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_directory.c
	ext/spl/spl_iterators.c
	ext/sqlite3/sqlite3.c
	ext/standard/array.c
 2014-08-04 13:56:27 +04:00
Keyur Govande
f0278589e1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Undo inadvertent commit of php_version
  Corrected patch for bug #60616
 2014-07-30 02:41:01 +00:00
Keyur Govande
ab4c4c3970 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Undo inadvertent commit of php_version
  Corrected patch for bug #60616
 2014-07-30 02:34:46 +00:00
Keyur Govande
65364fe7d0 Corrected patch for bug #60616 
For unixODBC, use ODBC version as defined by it (as of v2.2.14 it is 3.5).
This allows us to use newer features like SQL_DESC_OCTET_LENGTH (which
returns the number of bytes required to store the data). This fixes the issue
in #60616. If the newer version is not available, over-allocate to accomodate
4-byte Unicode characters for CHAR and VARCHAR datatypes (and their Wide
counterparts).
version.
Fixed a couple of failing tests.
 2014-07-30 02:28:31 +00:00
Keyur Govande
9720d92c67 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)
 2014-07-28 23:16:52 +00:00
Keyur Govande
90f99d47c0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)
 2014-07-28 23:16:20 +00:00
Keyur Govande
00546bc9b7 Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields) 
The ODBC extension did not support WVARCHAR. WVARCHAR ends up being handled by
the default handler where vallen is set by the driver to the actual bytes
needed for the field. If it is larger than default-lrl then the output is
corrupted (reading past the buffer) because the return functions don't expect
that to happen. The patch add support to handle WVARCHAR just like a regular
VARCHAR.
 2014-07-28 23:15:23 +00: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
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Yasuo Ohgaki
37fb8e0c15 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
 2013-10-26 10:43:14 +09:00
Yasuo Ohgaki
bd1d2d8fb0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
 2013-10-26 10:42:18 +09:00
Yasuo Ohgaki
e50eb1ce34 Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters 2013-10-26 10:31:21 +09:00
Stanislav Malyshev
1794291ebe Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Use pkg-config to detect iodbc
 2013-08-18 14:16:24 -07:00
Ole Markus With
a3fa25e857 Use pkg-config to detect iodbc 2013-08-18 14:16:17 -07:00
Stanislav Malyshev
8845262995 Merge branch 'pull-request/411' 
* pull-request/411:
  Use pkg-config to detect iodbc
 2013-08-18 14:15:53 -07:00
Veres Lajos
144eab0889 code related typo fixes 2013-08-18 13:46:32 -07:00
Ole Markus With
7e7a8f00c4 Use pkg-config to detect iodbc 2013-08-17 14:22:11 +02:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Felipe Pena
8776555d7a - Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch 2013-06-24 14:43:35 -03:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Johannes Schlüter
5e23a047ac Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Remove extra ;
 2012-06-22 17:33:22 +02:00
Johannes Schlüter
a62d4e2c43 Remove extra ; 2012-06-22 17:32:46 +02:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Pierre Joye
ce96fd6b07 - fix #39863, do not accept paths with NULL in them. See http://news.php.net/php.internals/50191, trunk will have the patch later (adding a macro and/or changing (some) APIs. Patch by Rasmus 2010-11-18 15:22:22 +00:00
Felipe Pena
e6bef6735f - Fixed bug #52512 (Broken error handling in odbc_execute) 
patch by: mkoegler at auto dot tuwien dot ac dot at
 2010-11-07 18:13:53 +00:00
Felipe Pena
d73d4e486c - Fixed bug #52512 (Broken error handling in odbc_execute) 
patch by: mkoegler at auto dot tuwien dot ac dot at
 2010-11-07 18:13:53 +00:00
Pierre Joye
aa0ed267a2 - use TSRMLS_*C instead of TSRMLS_FETCH in zend_list_insert 2010-09-16 09:13:19 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode 
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
 2010-04-26 23:53:30 +00:00
Felipe Pena
3488cd43be - Fixed bug #49429, #51331 (odbc_autocommit doesn't work) 2010-03-20 18:19:16 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Felipe Pena
30188d3c58 - Fixed bug #50162 (Memory leak when fetching timestamp column from Oracle database) 
- Fixed bug #34852 (Failure in odbc_exec() using oracle-supplied odbc driver) (patch by tim dot tassonis at trivadis dot com)
 2009-12-06 18:53:16 +00:00
Matt Wilmas
1fa3b21c15 MFH: Fixed error message grammar: 
- "cannot" instead of "can not" (meaning "also can")
 - "than" instead of "then" (Hint: "then" should hardly be needed;
     you're not telling the order in which to do something)

... plus removed a couple ending. dots
 2009-06-06 02:40:49 +00:00
Felipe Pena
63c12a8f99 - MFH: Improved fix for #42414 2009-05-14 17:24:42 +00:00
Felipe Pena
3201292cd3 - New tests 2009-05-14 01:28:58 +00:00
Felipe Pena
652b77243c MFH: 
- Fixed bug #42414 (some odbc_*() functions incompatible with Oracle ODBC driver)
  patch by: jhml at gmx dot net
 2009-05-14 01:26:39 +00:00
Felipe Pena
13a3092fce - Starting tests for this extension 2009-05-11 03:09:59 +00:00
Felipe Pena
2b049552d0 - MFH: Fixed bug #48038 (odbc_execute changes variables used to form params array) 2009-05-01 03:02:46 +00:00
Kalle Sommer Nielsen
f4d5a55a90 Nuke unused variable (only in this branch) 2009-03-30 14:25:54 +00:00
Pierre Joye
043ae0e0ee - fix logic after my build fix, thx to Hannes for the head up! 2009-03-24 09:44:16 +00:00
Pierre Joye
c68e24ce1a - fix build 2009-03-24 09:24:35 +00:00
Ilia Alshanetsky
79c44de0ca Improved parameter handling 2009-03-23 22:30:56 +00:00
Felipe Pena
2513cde86e - MFH: Fix proto 
[DOC] proto: $result_array is a reference
 2009-02-17 12:38:21 +00:00
Felipe Pena
4402b82cba - MFH: Fixed bug #47390 (odbc_fetch_into - BC in php 5.3.0) 2009-02-17 12:03:55 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:35:40 +00:00
Patrick van Kleef
905269f056 - MFH: Added odbc.default_cursortype to control the ODBC cursormodel 
(bug #43668)
#[DOC]
 2008-08-29 19:16:58 +00:00
Patrick van Kleef
1401532e97 - MFH: Fixed code to use ODBC 3.52 datatypes for 64bit systems (bug #43666) 2008-08-29 16:44:29 +00:00
Felipe Pena
f8330b9ccc MFH: 
- New parameter parsing API
- CS
 2008-08-24 20:50:41 +00:00
Felipe Pena
b22f47ee30 - Added arginfo 2008-07-20 14:28:41 +00:00
Felipe Pena
40ebd51f8e - Added arginfo 
- Removed #include "zend_arg_defs.c"
 2008-07-05 22:35:14 +00:00
Felipe Pena
0b89de0f5f - New parameter parsing API 2008-06-25 16:18:55 +00:00
Pierre Joye
41976c7ab6 - do not enable an ext when a lib/header fails 
- use MESSAGE in mysql*
- use correct CFLAGS for ext/libxml headers
 2008-06-23 18:40:29 +00:00
Felipe Pena
84a8bb038a MFH: New way for check void parameters 2008-03-10 22:15:36 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Andrey Hristov
b0677f4beb Fix ODBC, the GC patch missed this one leading to compilation failure. 2007-10-10 14:29:27 +00:00
Dmitry Stogov
6c810b0d4c Improved memory usage by movig constants to read only memory. (Dmitry, Pierre) 2007-09-27 18:00:48 +00:00
Jani Taskinen
cd0cfdfc39 MFH 2007-08-31 07:42:05 +00:00
Jani Taskinen
8af7bc2044 MFH: Fix some lib vs $PHP_LIBDIR issues 2007-07-31 13:02:00 +00:00
Jani Taskinen
addd471501 MFH:- Fixed bug #42019 (configure option --with-adabas=DIR does not work) 2007-07-17 12:12:26 +00:00
Jani Taskinen
eb923bf6fc MFH: - Changed AC_ARG_* options to PHP_ARG_* options. 
MFH: - Some cleanups here and there
MFH: - Enabled PHP_CHECK_CONFIGURE_OPTIONS (checks for unknown configure
MFH:   options)
# Note to Marcus: ext/dba/config.m4 needs to be "converted" to use
# the PHP_ARG_* options. I did't touch it needs quite a lot of work to keep
# it's current behaviour regarding "enabled-by-default" parts of it.
#
# Hint: By using the PHP_ARG_* options you have the "default" option.. ;)
 2007-07-11 23:20:37 +00:00
foobar
7ed3c4536d MFH: Fix some configure --help texts 2007-07-03 17:25:43 +00:00
Stanislav Malyshev
c3e4a2854a fix odbc resource handling, patch by Dave Lawson 2007-03-13 00:04:38 +00:00
Marcus Boerger
50ea26760d - Avoid sprintf, even when checked copy'n'paste or changes lead to errors 2007-02-24 02:17:47 +00:00
Antony Dovgal
19c517938e MFH: check SQLError() return value and output a meaningful errmsg when it fails 2007-02-19 20:22:38 +00:00
Ilia Alshanetsky
b4f76016fd Fixed output code inside odbc_result_all() 2007-01-16 18:56:06 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Antony Dovgal
ef9646c867 MFH 2006-12-28 14:26:36 +00:00
Antony Dovgal
3ce8ccb6f2 fix #37848 (ext/odbc compile failure) 2006-06-19 16:13:15 +00:00