diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-08-19 10:22:38 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-08-19 10:22:38 +0200 |
| commit | f452a2b3e4e4279b27594a8ddb66525442d59227 (patch) | |
| tree | d05cb62c5515ada33076d3cc3e49b664733a478c /ext/interbase | |
| parent | 038ba12e8724d537040e88ec794354b0c063f0a6 (diff) | |
| download | php-upstream/5.3.7.tar.gz | |
Imported Upstream version 5.3.7upstream/5.3.7
Diffstat (limited to 'ext/interbase')
| -rw-r--r-- | ext/interbase/ibase_query.c | 9 | ||||
| -rw-r--r-- | ext/interbase/interbase.c | 11 | ||||
| -rwxr-xr-x | ext/interbase/php_ibase_includes.h | 4 |
3 files changed, 10 insertions, 14 deletions
diff --git a/ext/interbase/ibase_query.c b/ext/interbase/ibase_query.c index a510814e5..b72721631 100644 --- a/ext/interbase/ibase_query.c +++ b/ext/interbase/ibase_query.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ibase_query.c 306939 2011-01-01 02:19:59Z felipe $ */ +/* $Id: ibase_query.c 313447 2011-07-19 20:25:51Z mariuz $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -672,14 +672,7 @@ static int _php_ibase_bind(XSQLDA *sqlda, zval ***b_vars, BIND_BUF *buf, /* {{{ if (! force_null) break; case IS_NULL: - - /* complain if this field doesn't allow NULL values */ - if (! (var->sqltype & 1)) { - _php_ibase_module_error("Parameter %d: non-empty value required" TSRMLS_CC, i+1); - rv = FAILURE; - } else { buf[i].sqlind = -1; - } if (var->sqltype & SQL_ARRAY) ++array_cnt; diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index 39964cb0d..a1bed0157 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c 308618 2011-02-24 02:42:38Z felipe $ */ +/* $Id: interbase.c 313830 2011-07-28 10:39:19Z pajoye $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -441,7 +441,7 @@ const zend_function_entry ibase_functions[] = { PHP_FALIAS(fbird_wait_event, ibase_wait_event, arginfo_ibase_wait_event) PHP_FALIAS(fbird_set_event_handler, ibase_set_event_handler, arginfo_ibase_set_event_handler) PHP_FALIAS(fbird_free_event_handler, ibase_free_event_handler, arginfo_ibase_free_event_handler) - {NULL, NULL, NULL} + PHP_FE_END }; zend_module_entry ibase_module_entry = { @@ -998,9 +998,12 @@ static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /* ZEND_REGISTER_RESOURCE(return_value, ib_link, le_link); } else { zend_rsrc_list_entry new_le; - + ib_link = (ibase_db_link *) malloc(sizeof(ibase_db_link)); - + if (!ib_link) { + RETURN_FALSE; + } + /* hash it up */ Z_TYPE(new_le) = le_plink; new_le.ptr = ib_link; diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h index c2c125600..071d9447f 100755 --- a/ext/interbase/php_ibase_includes.h +++ b/ext/interbase/php_ibase_includes.h @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ibase_includes.h 306939 2011-01-01 02:19:59Z felipe $ */ +/* $Id: php_ibase_includes.h 311341 2011-05-22 19:06:21Z felipe $ */ #ifndef PHP_IBASE_INCLUDES_H #define PHP_IBASE_INCLUDES_H @@ -51,7 +51,7 @@ extern int le_link, le_plink, le_trans; #define LE_PLINK "Firebird/InterBase persistent link" #define LE_TRANS "Firebird/InterBase transaction" -#define IBASE_MSGSIZE 256 +#define IBASE_MSGSIZE 512 #define MAX_ERRMSG (IBASE_MSGSIZE*2) #define IB_DEF_DATE_FMT "%Y-%m-%d" |