mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-12 11:23:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
80,302 Commits 503 Branches 1,384 Tags 800 MiB
adf8f0f284
Commit Graph

392 Commits

Author SHA1 Message Date
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
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