Commit Graph

250 Commits

Author SHA1 Message Date
Thies C. Arntzen
04c3f8403f mega patch to avoid recursive oci-calls as they might break oracle!
php will simply exit() (!!!) once it encounters an attemp to call oracle
while still in an oracle-call. this can only happen when the script gets
interrupted (timeout, apache-restart) and php tries to run the cleanups even
though we are in an unclean state. i will add an -ini flag soon (not before
4.0.7) which will (optional) make php not run the cleanups when in an unclean
state!
2001-08-15 16:00:56 +00:00
Thies C. Arntzen
384c86542a beautify 2001-08-11 10:52:52 +00:00
Thies C. Arntzen
6479bfe3b7 use macros for accessing properties in object. 2001-08-11 10:29:14 +00:00
Frank M. Kromann
4c5a6cbb82 Fixing a TSRMLS_FETCH problem. 2001-08-07 19:56:33 +00:00
Zeev Suraski
1159c84ab7 - TSRMLS_FETCH work
- whitespace fixes
2001-08-05 01:43:02 +00:00
foobar
474da88b4c more ZTS fixes. 2001-07-31 23:47:35 +00:00
Zeev Suraski
b1de7fc900 More TSRMLS_FETCH annihilation. Enough for today... 2001-07-31 07:09:49 +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
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
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
Thies C. Arntzen
a9e0de3947 @- Improved the stability of OCIPlogon() after a database restart. (Thies) 2001-07-25 22:34:25 +00:00
Thies C. Arntzen
3db0b1813a clearify ocisetprefetch 2001-07-14 12:45:42 +00:00
Thies C. Arntzen
0ef0f8e32b ZVAL_BOOL(v,0) -> ZVAL_FALSE(v) 2001-07-11 12:42:25 +00:00
Thies C. Arntzen
9f3110ea32 fix newly introduced SEFAULT. 2001-07-09 18:01:18 +00:00
Thies C. Arntzen
1e3553bd42 use erealloc for zvals! 2001-07-09 06:48:15 +00:00
Thies C. Arntzen
423613f4ee @ - Make sure that OCI8 outbound variables are always zero-terminated. (Thies) 2001-07-08 12:37:08 +00:00
Andi Gutmans
c977f29862 - Use ALLOC_HASHTABLE() instead of emalloc(sizeof(HashTable)) 2001-06-19 16:03:35 +00:00
Rasmus Lerdorf
81e2cf03ac Fix folding and clean up some extensions 2001-06-06 13:06:12 +00:00
Andy Sautins
c3106f4c3e Change OCIFreeColl to OCIFreeCollection for consistency
with OCINewCursor/OCIFreeCursor
2001-06-06 00:08:21 +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
Sterling Hughes
439038759b should fix compile warnings on win32 2001-05-30 17:49:33 +00:00
Sterling Hughes
c9ce7fcfc3 fix compile 2001-05-30 17:43:32 +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
Andy Sautins
915875a667 - Add correct OCIObjectFree to free collections immediately ( OCI_FREECOLLECTION_FORCE )
- Added schema optional parameter to OCINewCollection to allow accessing types in
     other schemas.
   - Added OCI_TYPECODE_TABLE to OCINewCollection to allow creation of collection of TYPES
     as well as VARRAYS
2001-05-22 23:16:03 +00:00
Thies C. Arntzen
a085b708e1 namespace-protect "open" 2001-05-04 14:53:45 +00:00
Andi Gutmans
4c823e8a89 - Change macros from V_ to VCWD_ because of AIX name clash 2001-04-30 12:45:02 +00:00
Andy Sautins
1dc4678d44 Collections cleanup
- Removed date specific methods.  Dates work consistently with
         the rest of the oci8 code.
       - Removed unused variables from collection code.
       - RETURN_FALSE on all errors.
       - fix error prints to php_error.
2001-04-25 17:48:30 +00:00
Thies C. Arntzen
c03efd49f4 fixed ZTS buidl - still some WS pollution left 2001-04-23 11:54:02 +00:00
Jason Greene
ebad4ff6af Change all // to /* */, fixed small whitespace.
Builds on Solaris now.
2001-04-19 22:00:34 +00:00
Thies C. Arntzen
c42f260145 enable temporary LOBs when we detect oracle 8.1
enabled by default in Win32 project!
2001-04-14 09:51:29 +00:00
Thies C. Arntzen
8ac2502dfe @- Added temporary LOB support in OCI8 (Patch by David Benson) 2001-04-14 08:38:46 +00:00
Thies C. Arntzen
b9216bcc1b @ - OCI8 now supports binding of collections
@   (Patch by Andy Sautins <asautins@veripost.net>)
2001-04-13 14:43:39 +00:00
Thies C. Arntzen
cb88701315 never initialize oci in OCI_THREADED mode. seems to break win32. 2001-04-11 15:46:03 +00:00
Thies C. Arntzen
1b7eaa76c4 @- Fixed binding of ROWIDs in OCI8. (Thies) 2001-03-02 09:12:55 +00:00
Andi Gutmans
01ed33d1b6 - Pointed out by Andrei. zval_ptr_dtor() should be used instead of the
zval_del_ref() function which should be nuked.
2001-02-27 20:16:35 +00:00
Andi Gutmans
eb6ba01d1c - Fix copyright notices with 2001 2001-02-26 06:11:02 +00:00
Thies C. Arntzen
5f4090d0e0 - Fixed crash in OCI8 when using unitialized LOBs. (Thies) 2001-02-18 11:10:30 +00:00
Thies C. Arntzen
67c2eaa6ea make oci work again. 2001-02-17 15:54:40 +00:00
Thies C. Arntzen
8499b430cf @- Fixed some modules to allow using output-buffering. (Thies)
i nuked all unneded calls to php_header() - i'm not too sure how we do
handle HEAD Requests as they were only detected via php_header(). but calling
php_header from a module makes output-buffering unusable.

NOTICE: there is some EBSDIC stuff in gd.c - i think it's obsolete.
2001-02-15 14:49:01 +00:00
Thies C. Arntzen
ecaeac5881 ocifreedesc() now spits a NOTICE when called the "wrong" way. 2001-02-14 13:06:03 +00:00
Thies C. Arntzen
201342385e @- Improved OCI8 dead-session detection. (Patch by: George Schlossnagle) 2001-02-12 14:36:28 +00:00
Thies C. Arntzen
d79071b2da fix small leak in ociexecute()
fixes: #8573
submitted by: tcarroll@chc-chimes.com
2001-01-07 11:43:07 +00:00
Thies C. Arntzen
31f63bee93 don't use TLS in MINIT function. 2000-11-16 10:16:22 +00:00
Thies C. Arntzen
db65d0e076 @- Fixed column-title buffer-overflow in OCIFetchStatement(). (Thies)
fix #7784
2000-11-13 17:30:52 +00:00
Thies C. Arntzen
825457ae64 update my email. 2000-10-29 09:14:55 +00:00
Andrei Zmievski
f1dcb32c9f Use zend_register_list_destructors_ex() instead. 2000-10-25 17:44:02 +00:00
Thies C. Arntzen
248d8527fd @- OCIBindByName() now does better parameter-checking. (Thies) 2000-10-22 19:33:59 +00:00
Daniel Beulshausen
1d582b8829 added missing def. 2000-10-21 21:17:31 +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
Thies C. Arntzen
6b5441c30f @- Fixed returning of empty LOB fields in OCI8. (Thies) 2000-10-07 09:10:54 +00:00
Thies C. Arntzen
ffad41019e compile fix 2000-08-16 15:23:05 +00:00
Hartmut Holzgraefe
66f9f8bf38 return type in proto for OCIError fixed 2000-08-11 13:13:11 +00:00
Thies C. Arntzen
e05fbd00c2 fixed binary mode for Win32 2000-08-07 12:01:52 +00:00
Thies C. Arntzen
8289c85438 @- Fixed CLOB handling in OCI8 driver when using variable-width
@  character sets. (Thies)
2000-08-07 11:34:48 +00:00
Thies C. Arntzen
53defde3e2 @- Fixed warning when shutting down OCINLogon() connections. (Thies) 2000-08-05 10:45:55 +00:00
Thies C. Arntzen
34dfe582ff @- OCIError() would sometimes not report failed connections. (Thies) 2000-08-05 10:07:39 +00:00
Thies C. Arntzen
cef6cc1ec0 fixed uninitilized var in ZTS mode. 2000-07-15 14:54:04 +00:00
Thies C. Arntzen
d58ff645ff @- Fixed crash on OCI?Logon() failure. (thies) 2000-07-03 15:05:46 +00:00
Andi Gutmans
6ce07a85e4 - Change register_internal_class to zend_register_internal_class for
- consistency.
- Andrei: I'm still thinking about the _ex you want me to implement
2000-06-09 08:41:59 +00:00
Thies C. Arntzen
c8ffb0ba59 @- Fixed crash in OCIFetchStatement() when trying to read after
@  all data has already been read. (Thies)
2000-06-08 09:49:31 +00:00
Andi Gutmans
3701bc4207 - ARG_COUNT(ht) -> ZEND_NUM_ARGS() mega patch 2000-06-05 19:47:54 +00:00
Thies C. Arntzen
8c65f81676 @- fixed crash in OCIParse when parsing invalid SQL. (Thies) 2000-05-30 09:25:02 +00:00
Thies C. Arntzen
ff53dde157 @- Uncommitted outstanding OCI8 transactions are now rolled back
@  before the connection is closed. (Thies)
2000-05-25 07:44:45 +00:00
Hartmut Holzgraefe
0fa7618f7c proto function name fixed 2000-05-23 22:30:21 +00:00
Sascha Schumann
4686a3b50e Use #ifdef COMPILE_DL_EXTNAME solely. 2000-05-23 09:33:51 +00:00
Zeev Suraski
e043439ff6 Update the license with the new clause 6 2000-05-18 15:34:45 +00:00
Thies C. Arntzen
831459885e rewritten the configure stuff 2000-05-08 09:06:48 +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
Andi Gutmans
5d5b09e1a7 - Change some open's to V_OPEN()'s 2000-04-30 19:01:17 +00:00
Thies C. Arntzen
ea9be8b88b compile fix 2000-04-28 10:37:17 +00:00
Thies C. Arntzen
6f08c178b9 . 2000-04-27 14:32:58 +00:00
Thies C. Arntzen
6ccea93d6b allow oci8 to be build as loadable module. 2000-04-27 14:29:11 +00:00
Thies C. Arntzen
232bcff77e . 2000-04-24 16:46:56 +00:00
Thies C. Arntzen
57c20bf836 fix warning 2000-04-24 12:35:30 +00:00
Thies C. Arntzen
eb786dc055 make it compile on Win32 2000-04-21 14:45:27 +00:00
Thies C. Arntzen
b27718ff00 @- OCIBindByName() will no longer complain about bindlength beeing zero. (Thies) 2000-04-21 09:54:15 +00:00
Colin Viebrock
a7c8bfb9fb phpinfo() prettying 2000-04-06 21:07:44 +00:00
Egon Schmid
ae67ddc318 One space character is enough. 2000-03-14 21:47:47 +00:00
Egon Schmid
29c41fe46d Thies, please check the function names and descriptions. 2000-03-14 21:17:07 +00:00
Sascha Schumann
caeaaf4d98 Fix build on systems which lack snprintf or vsnprintf.
PR: #3786
2000-03-12 15:47:34 +00:00
Thies C. Arntzen
9abeb4819f (OCILogon) fixed crash in OCILogon if username was not valid (newly introduced - no need for a NEWS entry) 2000-03-09 02:42:38 +00:00
Stig Bakken
d02fe90b00 Change extension names in all extensions' zend_module_entry to their
directory name.
2000-03-06 18:44:01 +00:00
Thies C. Arntzen
ad5b022ed1 @- OCINLogon() sessions are now closed again. (Thies)
# happy hacking in hongkong!
2000-03-06 08:02:15 +00:00
Joe Martin
68c10efe1b Added functions to retrieve scale, precision and raw oracle data type for
columns.
2000-03-03 01:28:27 +00:00
Thies C. Arntzen
490569ca28 @- OCINLogon no longer crashes. (Thies) 2000-03-01 08:17:33 +00:00
Thies C. Arntzen
08055feffa out of space in private (brain) memory;-) 2000-02-27 18:02:14 +00:00
Thies C. Arntzen
48bc90a8aa just so that i don't forget 2000-02-27 14:31:04 +00:00
Egon Schmid
6aff02506e Thies, it looks now a little bit better.
Please correct my dummy entries.
2000-02-23 15:54:23 +00:00
Thies C. Arntzen
e0b0919375 @- Fixed OCI8 crash when returning cursors from stored-procedures. (Thies) 2000-02-22 13:56:48 +00:00
Zeev Suraski
86fa2aade2 the pipe is breaking all the time 2000-02-19 23:41:32 +00:00
Zeev Suraski
1c4532dcbf *** empty log message *** 2000-02-19 13:11:02 +00:00
Zeev Suraski
6d0ab6166c SAPIfication, Episode VI: Return of the SAPI
Remove mostly all references to APACHE and CGI_BINARY from the code.

- Apache include files are no longer included by any PHP code, except for the Apache SAPI module.
- No server specific code is in any of the base PHP code.

Still left to be done:
- Eliminate any references to APACHE from the few remaining modules.
- Move request_info.c's logic to SAPI
- Modify the regex function names, and globals, so that we can always
  include them, without having to fear any interference with Apache;
  Always use the bundled regex library
2000-02-10 19:41:21 +00:00
Thies C. Arntzen
aee1dd9ec0 kill warning
@- Fixed some OCIBindByName() problems. (Thies)
2000-02-07 10:31:43 +00:00
Thies C. Arntzen
c145f85638 make it work without the zend_hash_pointer*() functions. some work on the shutdown issues (more to follow) 2000-02-01 14:39:59 +00:00
Thies C. Arntzen
8950aa75c4 @- OCI8 now supports binding of NULL-values. Module cleanups. (Thies)
lots of cleanup - all invisible to the user (i hope;-)
- full refcounting of connections & statements
- cleanup of the descriptor-code (descriptors are now real resources)
- we now use SQLT_CHR instead of SQLT_STR (no trailing \0) - smarter & faster
- ocifetchinto(OCI_BOTH) will use references.
2000-01-16 13:30:57 +00:00
Sascha Schumann
43ae2bffbb Happy Y2K patch! Happy new year (or the new millennium, depending on whether
you start counting at 0 or 1).
2000-01-01 01:32:05 +00:00
Thies C. Arntzen
4e095276af digital cc doe not like whitespaces before a # mark 1999-12-23 08:18:35 +00:00
Zeev Suraski
a1ad2872ee - The tree compiles again 1999-12-18 22:40:35 +00:00
Zeev Suraski
396bccfb1d More php3_ cleanup 1999-12-17 22:34:04 +00:00
Zeev Suraski
fb1c77bd4f - Made PHP_VERSION and PHP_OS work again
- More php3_ cleanup
@- Restored the PHP_VERSION and PHP_OS constants (Zeev)
1999-12-17 20:55:31 +00:00
Zeev Suraski
a3c6514332 More php3_ annihilation 1999-12-17 19:51:39 +00:00
Zeev Suraski
02d3b39420 More php3_ annihilation 1999-12-17 19:16:50 +00:00
Thies C. Arntzen
99b5652f40 small cleanups in MINIT code
OCIInitialize is now called at the "right" spot again
1999-12-09 11:02:41 +00:00
Thies C. Arntzen
40340b5aa0 @- OCI8 now returns NULL values in LONG columns correct. (Thies) 1999-12-08 14:04:55 +00:00
Sascha Schumann
5b983c944f Clean up php3.*\.h files. The files itself are renamed, and references in all
.*\.[ch] files were changed. There is a slight chance that my script missed
a few changes, please correct them manually.
1999-12-04 19:19:57 +00:00
Thies C. Arntzen
f6e8a597a9 fixed tiny leak 1999-12-04 12:06:32 +00:00
Thies C. Arntzen
126756d728 just a remark 1999-12-01 07:34:06 +00:00
Thies C. Arntzen
e20e9786b3 added missing function-alias 1999-11-12 17:05:57 +00:00
Thies C. Arntzen
d64e09a322 oops, didn't mean to activate this! 1999-11-12 14:34:50 +00:00
Thies C. Arntzen
e61fea3029 @- Fixed selecting nested-tables in OCI8. (Thies)
fixed mested-tables again (broke it when resourcified the driver)
1999-11-12 14:31:01 +00:00
Rasmus Lerdorf
392659fabe # Fix comments 1999-11-10 05:50:20 +00:00
Thies C. Arntzen
c171eecd7a @- implemented OCI8 $lob->WriteToFile() function - very useful for streaming
@  large amounts of LOB-Data without to need of a huge buffer. (Thies)
1999-10-27 17:51:22 +00:00
Thies C. Arntzen
86bb3fa0c0 new improved resource-API (i hope everything still compiles) 1999-10-12 14:53:15 +00:00
Thies C. Arntzen
7fe8812d3e use reference counting for emulating child<->parent (cursor<->connection) relationships. 1999-10-05 16:06:54 +00:00
Thies C. Arntzen
16e1cbee07 major rework here - the refcount stuff gets better and better! 1999-09-30 08:41:45 +00:00
Thies C. Arntzen
284bc523d6 fixed crash in connection shutdown! 1999-09-29 14:20:27 +00:00
Thies C. Arntzen
73c8429282 just some renaming. 1999-09-29 13:35:12 +00:00
Thies C. Arntzen
74bc24d9d5 initialize OCI in threaded mode if ZTS is defined. 1999-09-28 11:12:32 +00:00
Thies C. Arntzen
128b733eca fix #2316 - fetching empty LOBs via OCI8 1999-09-17 08:25:03 +00:00
Thies C. Arntzen
598aaba8ca you can now position when doing lob-writes. 1999-09-14 12:41:00 +00:00
Thies C. Arntzen
c2042b1561 got rid of the define-callback stuff there's a bug in oracle-oci8! 1999-09-13 15:19:29 +00:00
Thies C. Arntzen
c21663b3e7 ported $lob->savefile($filename) method from PHP3 1999-09-13 11:49:07 +00:00
Thies C. Arntzen
f858b6891c cleanups 1999-09-13 11:13:53 +00:00
Thies C. Arntzen
d5bafdaa20 ported oci8 to use new class API
var_dump no longer tries to traverse avr->value.ht for objects but uses var->value.obj.properties instead
1999-09-13 10:52:54 +00:00
Andi Gutmans
fd28fec38b - Fixed typo in oci8 error message 1999-08-19 04:13:56 +00:00
Thies C. Arntzen
c1218de0d2 ZTS 1999-08-18 16:48:59 +00:00
Thies C. Arntzen
e3aeb15678 ocifetchinto fix 1999-08-18 12:51:51 +00:00
Thies C. Arntzen
f93ce67426 cleanups & ZTS stuff (ZTS untested!) 1999-08-17 13:54:25 +00:00
Thies C. Arntzen
269785f95e starting to clean up 1999-08-10 14:33:59 +00:00
Zeev Suraski
3cb1eb0471 Removed '3' from key functions in PHP (maintained compatibility through
php3_compat.h)
1999-08-02 19:17:14 +00:00
Andrey Hristov
33d27f5bfe More symbol work. 1999-08-02 16:06:13 +00:00
Zeev Suraski
c5724cbd14 License update 1999-07-16 13:13:16 +00:00
Thies C. Arntzen
d4fb7d9e37 fixed mem-problem 1999-07-12 11:49:32 +00:00
Thies C. Arntzen
5a288ffdc8 small php4 fixes 1999-07-12 10:36:19 +00:00
Zeev Suraski
c43c235427 Don't touch refcount and EA directly 1999-07-09 20:45:55 +00:00
Zeev Suraski
5f62c347c7 Step 2:
Rename is_ref to EA
1999-07-09 17:44:41 +00:00
Thies C. Arntzen
ff9407b56b on par with latest php3 1999-07-08 14:12:07 +00:00
Thies C. Arntzen
0e3f5a69f7 ups 1999-07-05 09:33:47 +00:00
Thies C. Arntzen
8788f30c12 fixed mem-leak 1999-07-05 08:49:13 +00:00
Thies C. Arntzen
cab8290b8e up to php3 version
returns resources now!
1999-07-05 06:29:04 +00:00
Thies C. Arntzen
a3464b7c11 oci8 to 3.0.9
implode works!
1999-06-09 19:47:06 +00:00
Thies C. Arntzen
e5da9fc10a up to 3.0.9 1999-06-09 10:40:08 +00:00
Sascha Schumann
b57dc27595 - run ext sources through conv_proto
- add necessary phpext_*_ptr
1999-05-21 10:06:25 +00:00
Thies C. Arntzen
3031862b24 up-to-date with 3.0.8 1999-05-12 14:28:01 +00:00
Thies C. Arntzen
dc8d4f89c7 move oci8 from oracle to it's own ext-directory - configure stuff needs more work - but it configures and compiles 1999-05-12 14:21:38 +00:00