Commit Graph

226 Commits

Author SHA1 Message Date
Rasmus Lerdorf
8c497f05c4 We don't consistently check for args passed to functions that don't
take any args.  In some cases we probably want to skip the check for
performance reasons, but in other cases where performance is unlikely
to be a factor, not throwing a warning on the wrong number of args passed
to a function is at best inconsistent, and at worst it could hide a bug.
So, add a few such checks.  There are still lots of cases out there.
2001-08-13 06:43:47 +00:00
Andi Gutmans
d80ee070f9 - Make odbc_fetch_object() work with Engine 2 2001-08-11 18:28:31 +00:00
Sascha Schumann
373b3e101e more tsrm cleanup -- output.c is not doing any fetches anymore 2001-08-05 15:55:43 +00:00
foobar
85e15deabe These are redefined in the sqltypes.h that comes with unixODBC. PR: #12519 2001-08-03 05:07:22 +00:00
Zeev Suraski
aa1772ca72 More TSRMLS_FETCH annihilation 2001-07-31 05:44:11 +00:00
Zeev Suraski
d76cf1da18 More TSRMLS_FETCH work 2001-07-31 04:53:54 +00:00
Zeev Suraski
c43806f415 Zend compatibility patch 2001-07-30 08:24:42 +00:00
Zeev Suraski
797a079a95 More TSRMLS_FETCH work, and a bit of cleanup 2001-07-30 06:18:13 +00:00
Zeev Suraski
7b1c400631 More TSRMLS_FETCH annihilation (Zend compatibility patch) 2001-07-30 04:58:07 +00:00
Zeev Suraski
1c25b8dd53 Avoid TSRMLS_FETCH()'s, and clean up a bit of stale extern's and layout on the way 2001-07-30 01:56:43 +00:00
Andi Gutmans
75ba1461dd - Object macros... 2001-07-28 19:29:16 +00:00
Zeev Suraski
d87cc976e1 Redesigned thread safety mechanism - nua nua 2001-07-28 11:36:37 +00:00
Zeev Suraski
fe6f8712a4 - Get rid of ELS_*(), and use TSRMLS_*() instead.
- Move to the new ts_allocate_id() API
This patch is *bound* to break some files, as I must have had typos somewhere.
If you use any uncommon extension, please try to build it...
2001-07-27 10:16:41 +00:00
Dan Kalowsky
eb7b11ce2e Making --with-openlink work the same as --with-iodbc for it's eventual
disappearing act.
#  As requested by the Openlink Software people
2001-07-06 14:30:34 +00:00
Dan Kalowsky
746dd9cbe4 Closed off Solid DB access to a function that it doesn't support in 3.0 and less.
Thanks to Eric Veldhuzen
2001-06-19 17:58:09 +00:00
foobar
1e0aaeffe9 Fix bug: #11508 2001-06-19 16:48:37 +00:00
Dan Kalowsky
f2ec3fa6e5 adding in some error checking for parameter counts, and some thread safety for
functions
2001-06-14 15:02:17 +00:00
Dan Kalowsky
a7e9b56112 # just correcting the evil vim removal of {{{'s and }}}'s ... bad vim! no folding for you! 2001-06-11 01:00:43 +00:00
Dan Kalowsky
eea60318d7 corrected a compile error (named variable missing). thanks to sebastian for pointing it out
# but why is he getting php-cvs commit messages and i'm not?!?
# i hope to hear that the mailing lists will be back online soon...
2001-06-10 22:40:32 +00:00
Dan Kalowsky
c3a3d5c853 added in a bit more checking on the persistent connection checks... 2001-06-08 15:31:29 +00:00
Rasmus Lerdorf
81e2cf03ac Fix folding and clean up some extensions 2001-06-06 13:06:12 +00:00
Rasmus Lerdorf
25c3a3a39d vim-6 does folding - clean up a bunch of missing folding tags plus
some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 13:12:10 +00:00
foobar
3a1b61c07d Fix bug: #9009. 2001-06-01 06:26:22 +00:00
foobar
58d35ea778 Missing entries in phpinfo() output 2001-06-01 05:02:13 +00:00
foobar
328258ac08 Output something if password is not set. 2001-06-01 05:01:50 +00:00
Stig Bakken
1beda9ee1e * include "config.h" if HAVE_CONFIG_H is defined (for standalone dso build) 2001-05-24 10:07:29 +00:00
Frank M. Kromann
251996bb79 Fixing prototypes to match function names 2001-05-22 18:26:36 +00:00
Sascha Schumann
afdaee9e47 Nuke more quotes 2001-05-12 11:09:05 +00:00
Sascha Schumann
718b588b14 Fix indentation of ./configure --help messages. 2001-05-12 09:13:42 +00:00
Wenhui Zhang
b6b5039f25 Change for Empress PHP support 2001-05-09 15:35:31 +00:00
Dan Kalowsky
b3a509ac9e this is a fix for bug 10250. it basically provides the unixODBC driver with
access to the SQLDriver functions.  patch originally submitted by
dzoll@nyscul.org, and is going to be tested by some of the unixODBC people.
2001-05-08 19:47:20 +00:00
Andi Gutmans
eb4d840a40 - More strncpy() -> strlcpy() changes. Am I getting bored yet? :) 2001-05-02 23:20:04 +00:00
foobar
d0dac28cc2 Fix bug #10563 2001-05-01 23:22:55 +00:00
Andi Gutmans
a5a4b4e2f8 - Use memcpy() instead of strlcpy() which is faster. 2001-04-19 21:42:45 +00:00
Dan Kalowsky
d7383e3255 appling patch for joey since he has no ODBC karma. this is for bug #10252 2001-04-19 19:55:05 +00:00
Dan Kalowsky
f41f369754 corrects bug #7488, patch supplied by submitter (torben@php.net).
quick local tests show it to work.
2001-04-19 02:31:23 +00:00
Dan Kalowsky
685186f9fd This change seems to fix bugs 7158, 7807, 8531, and 8636. After asking why this patch was applied no one seemed to respond with anything useful. If you find this change in error, sorry, I tested it on as many systems as I could. 2001-04-17 02:02:36 +00:00
Kevin
3cd2c989d3 Fixed compatibility issues in the ODBC extension for the Velocis Database server. Specifically, config.m4 was changed to use the client libraries instead of the serer libraries, and to look for the libs in the $RDSHOME/lin directory ass opposed to the $RDSHOME/bin directory. Makefile.in was changed to use the php_odbc.c file as the source for Velocis support. Other misc changes include a few #defines for some undefined data types and some #ifdefs for unsupported functions. 2001-04-10 16:26:28 +00:00
Wilfredo Sanchez
cb71c4c2d0 Separate CPPFLAGS from CFLAGS. 2001-04-03 23:30:49 +00:00
Nick Gorham
971d65059a Added small change to php_odbc module, to check for failed SQLDisconnects
and to close any outstanding transactions if the call fails, then disconnect
again. This can cause chaos with SQL Server, this regards a SELECT as
starting a transaction, and will leave it  open if the result set is not all
read.
2001-04-02 15:18:47 +00:00
foobar
8a26918ed1 Renamed the AC_ prefixed macros defined in acinclude.m4 to PHP_* prefixes.
# Heads up people! I tested this before committing but you never know..
2001-03-27 20:35:04 +00:00
Dan Kalowsky
959f40a957 The last fix was missing a &, Marc Boeren either made the patch wrong, or I applied it improperly. Anyways, Sebastian Bergmann discovered it, and supposedly is fixed with this. 2001-03-27 15:46:27 +00:00
Dan Kalowsky
0d7729ed58 Fix for Bug #9272, as submitted by marc boeren (m.boeren@guidance.nl).
Applied by me, due to apparently a lack of cvs access to ext/odbc for him.
2001-03-27 14:17:52 +00:00
Frank M. Kromann
f98710c870 Adding a new function odbc_next_result() allowing the query to return more than one result.
This can be done with a stored procedure or by sending more than one select to the server.
2001-03-09 23:44:55 +00:00
Andi Gutmans
eb6ba01d1c - Fix copyright notices with 2001 2001-02-26 06:11:02 +00:00
Stig Bakken
5ed1199b61 * dbmaker fix, shared support 2001-02-21 18:23:53 +00:00
Zeev Suraski
90c8e2cf75 Fix Win32 build 2001-01-15 10:22:19 +00:00
Stig Bakken
fcdf6ac680 @- Added odbc_error() and odbc_errormsg() functions (Stig) 2001-01-15 01:11:06 +00:00
Frank M. Kromann
e4d1107058 Adding hack to allow odbc_tables to work on Access databases 2001-01-05 22:01:22 +00:00
Dan Kalowsky
fbbaf5b5b5 it seems one section was missing the HAVE_SOLID_30 section... 2000-12-28 22:01:50 +00:00
Dan Kalowsky
8b2dbfca77 added #define(OPENLINK) to the SDWORD instead of SQLINTEGER line.. this is for bug #5526 to allow compiles. 2000-12-28 19:23:09 +00:00
Dan Kalowsky
68fa8f9b0b config file was missing a new line which seemed to cause the if statement to parse the else into an echo. yuck. 2000-12-28 19:12:28 +00:00
Sascha Schumann
7f96af83b2 Stop automatically passing vars to AC_SUBST through PHP_SUBST.
There are some variables which are needed for Makefiles and files
created by AC_OUTPUT; we use PHP_SUBST_OLD for those now.

genif.sh was moved to an appropiate place.
2000-12-20 17:21:37 +00:00
Stanislav Malyshev
8b1377043d No need to link main binary with ODBC libs if we use shared module 2000-12-17 11:17:50 +00:00
Stig Bakken
ac2e12a9a9 @Added ODBC_TYPE constant (Stig) 2000-12-15 00:57:04 +00:00
Stanislav Malyshev
7ff9dcacb1 Enable DB2 shared build 2000-12-07 11:13:49 +00:00
Stig Bakken
92fc209384 Applied IBM DB2 patch by Walter Franzini <walter@sys-net.it>
@ext/odbc: IBM DB2 patch by Walter Franzini <walter@sys-net.it>
2000-12-05 12:11:30 +00:00
Dan Kalowsky
bfe4e5bf37 added name for credits on work for Solid interface.. 2000-12-04 15:47:30 +00:00
Dan Kalowsky
e7aff0b676 @ Put an end to BUG#4615 (kalowsky & Eric Veldhuyzen)
This should remove the BUG#4615, thanks to Eric Veldhuyzen
(eric@terra.telemediair.nl) for the assistance on this (aka elegence vs
my hack).

This does not fix BUG#7922 though, which is currently being looked into
2000-11-22 15:31:04 +00:00
Hartmut Holzgraefe
1f6878e912 2nd step towards auto-credits 2000-11-20 10:33:33 +00:00
Dan Kalowsky
b52648efd5 Missed one section that required the addition of a new HAVE_SOLID_30
This should be correct now.
2000-11-17 15:48:09 +00:00
Dan Kalowsky
3e2ddd1edf Corrected the spelling of verion to version, and cleaned the configuration
code up a bit.  Also added in much better (read: tested) support for
Solid 3.0.   Credit for almost all of the patch goes to Eric Veldhuyzen,
minor modifications done (by me) to make it non-linux specific.

This commit also creates the HAVE_SOLID_30 define

@ Fixed/created support for Solid 3.0 databases (kalowsky)
@ Fixed support for Solid 2.3 databases (kalowsky)
2000-11-17 15:09:46 +00:00
Derick Rethans
2f5f83f518 - Added the two constants mentioned in bug #6097
# I did not test it, because I don't have access to an Adabase RDBMS
2000-10-30 18:00:58 +00:00
Andrei Zmievski
f1dcb32c9f Use zend_register_list_destructors_ex() instead. 2000-10-25 17:44:02 +00:00
Andreas Karajannis
7d3b7d7cb2 Config Patch for DBMaker 2000-10-21 11:11:11 +00:00
Andrei Zmievski
7b4983c8f8 Mega-patch to get better resource information for modules.
* Fixed a bug in zend_rsrc_list_get_rsrc_type()
  * Switched register_list_destructors() to use
    zend_register_list_destructors_ex() instead
  * Updated all relevant modules to provide the resource type name
    to register_list_destructors() call
  * Updated var_dump() to output resource type name instead of number

@- Made resource type names visible, e.g. var_dump() and
@  get_resource_type() display "file" for file resources. (Andrei)
2000-10-20 18:25:16 +00:00
Andreas Karajannis
e8861e6d20 Added support for SAP DB 2000-10-17 15:23:18 +00:00
Dan Kalowsky
ca1b12c5a1 corrected lines for Solid 2.3 systems after some advice from users, please test... 2000-09-29 19:03:23 +00:00
foobar
5844b74e22 Fix configure (with Solaris). 2000-09-28 23:46:15 +00:00
Frank M. Kromann
e048e34e80 Having odbc_tables() and odbc_columns() match the documentation with parameters optionel from the right 2000-09-28 16:42:04 +00:00
Andi Gutmans
3e0d46d222 - Fix build of db2 2000-09-28 13:08:14 +00:00
Dan Kalowsky
b853731aaf prefer -gt to -lt, and dropped the version number to 2 instead of 3 2000-08-24 19:27:21 +00:00
Sascha Schumann
96b221755a -lt is preferred over \> 2000-08-23 12:59:50 +00:00
Dan Kalowsky
bee5b60a22 cleaned up the PHP/SOLID integration code, and corrected some minor assumptions on my part for the 3.5 EE systems. also removed a series of warnings on builds within the ODBC functions, and corrected header order. include of the SS_LINUX and SS_FBX defines, needed to make solid headers completely happy with the wchar.h situation.
THIS DOES NOT FIX BUG ID #4615
2000-08-22 21:27:49 +00:00
Dan Kalowsky
f6d891674d Patched to work for Solid/Linux libc5 and glibc2 without the need for renaming the lib files, thanks to Kevin Way... fixed typo from GLIHC to GLIBC 2000-07-24 18:01:42 +00:00
Dan Kalowsky
ebe6dbbbae Patched to work for Solid/Linux libc5 and glibc2 without the need for renaming the lib files, thanks to Kevin Way 2000-07-24 14:21:18 +00:00
David Croft
83513d9580 Changed lots of PHP 3 licence headers to PHP 4, mainly in .h files.
Added a few RCS $Id$ tags.

# Note: I have avoided changing any .h files if the corresponding .c file
# had not already been changed as I am not sure if there are any legal
# issues here. So some extensions still have PHP 3 headers.
2000-07-24 01:40:02 +00:00
Stig Bakken
81ded022e0 Applied DBMaker patch by Jeffrey Lin <clin@lion.syscom.com.tw> 2000-07-06 08:38:12 +00:00
Sascha Schumann
16017f6d78 Change header protection macros to conform to standard.
Draft 3 of IEEE 1003.1 200x, "2.2 The Compilation Environment"

  All identifiers that begin with an underscore and either an uppercase
  letter or another underscore are always reserved for any use by the
  implementation.
2000-07-02 23:46:51 +00:00
Andi Gutmans
b9037f7d69 - Make PHP compile again under Windows.
- Please be careful when you make such changes.
2000-07-02 15:12:34 +00:00
Dan Kalowsky
5f81cba573 updates for the SolidEE to work for 3.5 with PHP4.0.1. Still causes warning of "integer from pointer used without typecast" but does not seem to effect the final build any. have not found a correction yet. has not shown the SQLParamData bug either, but unknown if it is closed as i was unable to reproduce it.
basically fixed the config.m4 file, and added a #define of HAVE_SOLID_35, due to the solidee 3.5 vs all other solidee systems being drastically different.  and solidtech providing no means for testing what version you are using.

does not include fixes for the linux users of glibc2 (automatically assumes libc5).  temporary work around, link your /usr/local/solid/lib files from a scll2x23 or scll2x30 to a scllux30 or scllux23 name...  suggestions to automate this are welcome.
2000-06-30 19:22:52 +00:00
Sascha Schumann
0c03253635 Stop including dl/phpdl.h. 2000-06-24 15:36:04 +00:00
Andi Gutmans
2987d5216e - More #if WIN32|WINNT -> #ifdef PHP_WIN32 conversions 2000-06-15 23:45:05 +00:00
Andi Gutmans
a9d4cf9023 - Nuke COMPILE_DL. Modules that need to be compiled as dll's in Windows
- need to define both COMPILE_DL_MODULE and HAVE_MODULE=1
2000-06-10 08:48:01 +00:00
Zeev Suraski
022159a6cd - Fix Win32 build
- Nuke a warning
2000-06-07 18:10:21 +00:00
Andi Gutmans
3701bc4207 - ARG_COUNT(ht) -> ZEND_NUM_ARGS() mega patch 2000-06-05 19:47:54 +00:00
Andreas Karajannis
2980f7f92d Changed parameter naming some function prototypes 2000-05-28 17:23:24 +00:00
Andreas Karajannis
e50b33c240 Cosmetic changes. 2000-05-28 12:48:12 +00:00
Sascha Schumann
4686a3b50e Use #ifdef COMPILE_DL_EXTNAME solely. 2000-05-23 09:33:51 +00:00
Andreas Karajannis
11f4909068 Turn off retrieving the whole error stack 2000-05-21 08:46:51 +00:00
Zeev Suraski
e043439ff6 Update the license with the new clause 6 2000-05-18 15:34:45 +00:00
Andreas Karajannis
07f7b8c1e3 Prototype adapted 2000-05-11 16:25:58 +00:00
Andreas Karajannis
010f7850e0 Restoring old parameter ordering in odbc_fetch_into() 2000-05-11 16:24:03 +00:00
Egon Schmid
7a3e2ee70a Fixed some typos. 2000-05-11 12:10:53 +00:00
Andreas Karajannis
f4357f3254 Forcing passing by reference for array in odbc_fetch_into()
Added function odbc_column_scale(), new alias odbc_column_precision for odbc_column_len
Added better description in Prototypes for some functions
2000-05-11 11:46:06 +00:00
Sascha Schumann
fe50664d4d #if COMPILE_DL
becomes

    #if defined(COMPILE_DL) || defined(COMPILE_DL_EXTENSION_NAME)
2000-05-02 00:44:35 +00:00
Sascha Schumann
0d383d9373 Replace the various get_module() functions with a uniform
ZEND_GET_MODULE(name) macro.
2000-05-02 00:30:36 +00:00
Sascha Schumann
7613e064f8 Remove trailing empty lines 2000-05-01 22:38:42 +00:00
Sascha Schumann
0d36199cf9 Large test commit IV 2000-05-01 22:04:52 +00:00
Sascha Schumann
de2cea47c0 Large commit test III 2000-05-01 22:00:09 +00:00