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