clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 22:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
95,865 Commits 494 Branches 1,367 Tags 790 MiB
b28c2e20ca
Commit Graph

486 Commits

Author SHA1 Message Date
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
Dmitry Stogov
1dbaae2795 Added automatic module globals management 2006-06-15 18:33:09 +00:00
Antony Dovgal
21891aecc1 MFH: fix #35959 (Cannot build with Solid 2.3) 2006-01-10 14:15:35 +00:00
foobar
5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
foobar
3e669bc950 MFH: nuke php3 legacy 2005-12-06 02:28:41 +00:00
foobar
d95275052b MFH 2005-12-06 01:08:49 +00:00
foobar
a3af52c11e MFH: list_entry -> zend_rsrc_list_entry 2005-12-05 23:38:04 +00:00
foobar
e47c21e0bc test -e does not work with solaris 2005-11-21 19:06:04 +00:00
Dmitry Stogov
42fb30298c Fixed crash on AIX 2005-09-08 06:19:07 +00:00
foobar
91860cf594 No HTML output if html_errors is off (bug #34006) 2005-08-05 22:37:48 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
Edin Kadribasic
9ac84b2f1a Don't crash on exit by destroying the same hash twice 2005-07-02 22:48:06 +00:00
foobar
bfa890d81e - Fixed bug #33427 (ext/odbc: check if unixODBC header file exists) 2005-06-22 08:26:00 +00:00
foobar
4ca58ffa00 no trailing dots 2005-06-18 13:17:52 +00:00
Antony Dovgal
7e450f528c fix bug #33214 (odbc_next_result does not signal SQL errors with 2-statement SQL batches). 
Path by rich at kastle dot com.
 2005-06-02 15:40:45 +00:00
foobar
a20383ba06 - Unify the "configure --help" texts 2005-05-29 23:17:16 +00:00
foobar
84bdf9b0a0 MFB: - Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems) 2005-05-10 13:22:22 +00:00
foobar
626253940e - Added PHP_INSTALL_HEADERS() macro 
- Fixed several VPATH build issues
- Changed all awk calls to use $AWK
- Changed all mkdir calls to use "$php_shtool mkdir"
 2005-05-07 02:51:53 +00:00
foobar
f2d086127c - Fix birdstep support (no SQLDataSources() support in it) 2005-04-21 23:01:53 +00:00
foobar
172f3af8ed - Add support for latest Birdstep 2005-04-14 21:17:20 +00:00
foobar
8509f06056 - This was supposed to be escaped with \ 2005-04-10 19:23:59 +00:00
foobar
338bdf1587 Add more detailed failure msg. (bug #32649) 2005-04-10 19:18:37 +00:00
Antony Dovgal
f2a3b12445 fix #32560 (configure looks for incorrect library - libdb2.so instead of libdb2.a, 
which is used actually)
 2005-04-04 10:50:32 +00:00
Antony Dovgal
84fe72612e add checks for libs & headers required by IBM DB2 2005-01-18 21:16:32 +00:00
Antony Dovgal
63fbc27466 fix bug #30430 (odbc_next_result() doesn't bind values and that results in segfault) 
fix protos
 2005-01-18 15:03:51 +00:00
Antony Dovgal
7c152b6a8e fix weird DB2 issue: 
DB2's SQLDataSources() returns _max available_ length of result string instead of
_real_ length and that results in strings a-la "\0                  "
 2005-01-17 18:08:54 +00:00
Antony Dovgal
acbdbe1e65 fix leak appearing when odbc_errormsg() got invalid resource 2005-01-17 15:05:11 +00:00
Wez Furlong
f17311c9dd Add support for ODBCRouter 2005-01-13 02:06:39 +00:00
foobar
a139dbf9cc - Fix outside-source-tree builds. Always include generated header files 
with #include <some_header.h> to make sure the correct file is used.
 2005-01-09 21:05:06 +00:00
foobar
69eec3f3b9 MFB_4_3: Quote macro names in AC_DEFUN() 2004-12-30 07:08:39 +00:00
Joe Orton
2685ca935f Update extensions to use /path/to/$PHP_LIBDIR rather than /path/to/lib 
to support multi-ABI platforms.
 2004-11-03 14:32:52 +00:00
Dan Kalowsky
206c05dc47 Checking in a patch by Dave Lawson (dlawson@masterytech.com) to correct 
some of the behavior found in the odbc_fetch_*() functions.  This patch
NEEDS to be tested on MS Access before a release is done with it.  This
submission is to get it into the daily builds for testing.
 2004-08-13 19:33:24 +00:00
Andi Gutmans
56f8195fe5 - Nuke empty_string. It is a reminanent from the time where RETURN_FALSE() 
used to return "" and not bool(false). It's not worth keeping it because
  STR_FREE() and zval_dtor() always have to check for it and it slows down
  the general case. In addition, it seems that empty_string has been abused
  quite a lot, and was used not only for setting zval's but generally in
  PHP code instead of "", which wasn't the intention. Last but not least,
  nuking empty_string should improve stability as I doubt every place
  correctly checked if they are not mistakenly erealloc()'ing it or
  calling efree() on it.
  NOTE: Some code is probably broken. Each extension maintainer should
  check and see that my changes are OK. Also, I haven't had time to touch
  PECL yet. Will try and do it tomorrow.
 2004-07-19 07:19:50 +00:00
Dan Kalowsky
f20849d12e Bug 29058 (patch submitted by bug reporter) 2004-07-15 15:09:12 +00:00
Ilia Alshanetsky
0c72b185fd Fixed possible memory leak. 2004-06-18 00:44:35 +00:00
foobar
f4983c0d3f - Renamed all *php4* files to *php5*, changed all php4/PHP4 to php5/PHP5 2004-01-17 13:00:38 +00:00
foobar
ccfc46b0aa - Happy new year and PHP 5 for rest of the files too.. 
# Should the LICENSE and Zend/LICENSE dates be updated too?
 2004-01-08 17:33:29 +00:00
Andi Gutmans
dbeb4158d2 - A belated happy holidays and PHP 5 2004-01-08 08:18:22 +00:00
Wez Furlong
05b9b20ed8 Add new (optional!) win32 build infrastructure. 
Will follow up to internals@ shortly.
 2003-12-02 23:17:04 +00:00
foobar
7a3ad4172f - Fixed bug #26376 (typo in ext/odbc/config.m4: DBMaker test fails) 2003-11-25 08:07:35 +00:00
Ilia Alshanetsky
4c4d5a02b9 Fixed formatting issues (patch by: Joe Orton) 2003-10-17 02:21:27 +00:00
foobar
db50cd251e Aligned configure help texts. 2003-10-03 05:24:33 +00:00
Moriyoshi Koizumi
5fee3a3ce1 Alignment fix 2003-10-03 01:13:44 +00:00
Zeev Suraski
8767205afa Fix Win32 linkage problems 2003-08-31 12:41:53 +00:00
Andrey Hristov
b2eb454171 format string fixes 2003-08-28 21:00:24 +00:00
foobar
04bbd9a2f7 Revert the patch per Dan\´s request 2003-08-28 16:35:32 +00:00
foobar
29b9d26223 typofix 2003-08-28 09:55:11 +00:00
Dan Kalowsky
0347ca91f4 Committing a patch for IBM DB2 BLOB support submitted by Clara Liu 
(clara@zealworks.com).
# I haven't had time to completely test this patch, a few users have stated
# that it works well for them and a few others want to test with windows
# builds, hence the submission.
 2003-08-27 18:21:52 +00:00
Ilia Alshanetsky
741014089e emalloc -> safe_emalloc 2003-08-18 04:41:48 +00:00
Ilia Alshanetsky
e6b916cb15 Fixed bug #25081 (odbc_fetch_array() may mangle numeric fields). 2003-08-14 14:36:38 +00:00
Ilia Alshanetsky
93bcd55eaf emalloc -> safe_emalloc 2003-08-12 00:58:52 +00:00
foobar
7f5dc67bb0 Fix compile warning 2003-08-11 02:03:40 +00:00
Zeev Suraski
538d58dd5f Use new infrastructure. 
There are bound to be some messups, please report build/runtime bugs!
 2003-08-03 17:44:39 +00:00
foobar
d862a8ee90 WS fix 2003-07-14 16:11:38 +00:00
foobar
c751ba0cc8 Remove un-used code. 2003-07-11 15:56:23 +00:00
Dan Kalowsky
a1d8121bda Fix for bug #22897 2003-07-11 13:13:32 +00:00
Andrey Hristov
8934146246 proto fixes 
#my head hurts now. no more fixes today ;)
 2003-06-16 16:36:51 +00:00
Frank M. Kromann
60d161a382 Updating email address 2003-06-14 03:35:16 +00:00
James Cox
f68c7ff249 updating license information in the headers. 2003-06-10 20:04:29 +00:00
foobar
935672787a MFB 2003-05-31 02:30:50 +00:00
Ilia Alshanetsky
ded4aadde0 Fixed bug #23898 (Proper handling of NULLs in odbc_result, odbc_fetch_into 
and odbc_result_all)
 2003-05-30 14:44:15 +00:00
foobar
20d88e4c34 - Fixed bug #22580 (ext/odbc compile failure with dbmaker) 2003-05-02 00:40:20 +00:00
Wez Furlong
9db67f05e1 UnixODBC also supports the fetch_array() and fetch_object() functions... 2003-04-30 23:32:36 +00:00
Wez Furlong
6fc4f3a2ef Fix memory leak in odbc_fetch_(array|object). 
Enable those functions for IBM DB2.
 2003-04-30 10:45:45 +00:00
Stig Bakken
0e6fca4f22 * email address change 2003-03-18 12:06:09 +00:00
Ilia Alshanetsky
68e36864c9 Fixed spprintf() usage. 
Fixed compiler warnings.
 2003-03-12 04:46:03 +00:00
foobar
9e501d4f37 - Fixed bug #20715 (odbc could not be compiled as shared extension) 2003-03-11 03:11:36 +00:00
foobar
3c9155e0cb Renamed OnUpdateInt -> OnUpdateLong to prevent further misunderstandings. 
# Intentionally left out any 'alias' for it, this way 3rd party extension
# maintainers will really NOTICE the change.
 2003-03-07 05:15:28 +00:00
foobar
e32eaf29de Fixed typo caught by Dave. 2003-03-07 04:32:36 +00:00
Ilia Alshanetsky
c5053e0f62 Fixed bug #22437. 2003-03-04 16:34:52 +00:00
foobar
400f466040 Cleanup 2003-02-25 11:48:50 +00:00
Wez Furlong
0a18a9d744 A add much more useful select(2) implementation than is provided by 
windows sockets.  The winsock implementation will only work with sockets;
our implementation works with sockets and file descriptors.
By association, stream_select() will now operate correctly with files, pipes and sockets.

This change required linking against the winsock2 library.  In terms of
compatibility, only older versions of windows 95 do not have winsock2
installed by default.  It is available as a redistributable file, and is most likely installed by any OS patches (eg: Internet Explorer) applied by the user.

Also, add a win32 compatible pipe test when opening a stream from a pipe.  This test will only work on NT, win2k and XP platforms.  Without this test, interleaved fread() and select() calls would cause the read buffer to be clobbered.  I will be working on a fix for this issue for win9x.
 2003-02-16 03:48:49 +00:00
Dan Kalowsky
cba812ef5c MFB 2003-02-07 02:59:16 +00:00
Dan Kalowsky
b48d709746 Patch for bug #21844 2003-01-24 22:40:38 +00:00
Ilia Alshanetsky
dc150fd2ea getParameters -> zend_get_parameters_ex. 2003-01-21 15:27:39 +00:00
Ilia Alshanetsky
aebb39b014 Changed php_error to php_error_docref. 
Thanks to Marcus Börger for writing a script that significantly simplifies
this process.
 2003-01-18 21:31:11 +00:00
Ilia Alshanetsky
e2868b5788 Removed pointless memory allocation checks. 2003-01-18 19:41:56 +00:00
Dan Kalowsky
dacf98c86f typo corrected 2003-01-16 16:42:25 +00:00