[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Feb 19 20:32:35 2004 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1543r2=1.1544ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1543 php-src/ChangeLog:1.1544 --- php-src/ChangeLog:1.1543Wed Feb 18 20:32:21 2004 +++ php-src/ChangeLog Thu Feb 19 20:32:34 2004 @@ -1,3 +1,17 @@ +2004-02-19 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_3) + ext/cpdf/cpdf.c: + MFH: Fixed possible resource/memory leak. + +* ext/cpdf/cpdf.c: + Fixed possible resource/memory leak. + +2004-02-19 Jani Taskinen [EMAIL PROTECTED] + +* ext/session/session.c: + Improve error messages + 2004-02-18 Hartmut Holzgraefe [EMAIL PROTECTED] * ZendEngine2/zend.h
[PHP-CVS] cvs: php-src /ext/soap TODO php_sdl.c php_sdl.h soap.c
dmitry Thu Feb 19 03:21:15 2004 EDT
Modified files:
/php-src/ext/soap TODO php_sdl.c php_sdl.h soap.c
Log:
Support for SOAP Fault encoding according to WSDL fault and soap:fault
http://cvs.php.net/diff.php/php-src/ext/soap/TODO?r1=1.44r2=1.45ty=u
Index: php-src/ext/soap/TODO
diff -u php-src/ext/soap/TODO:1.44 php-src/ext/soap/TODO:1.45
--- php-src/ext/soap/TODO:1.44 Fri Feb 13 10:19:09 2004
+++ php-src/ext/soap/TODO Thu Feb 19 03:21:12 2004
@@ -49,11 +49,12 @@
WSDL
? server part support for document style encoding
+? support for fault, soap:fault
+- soap:headerfault
- soap:body parts attribute (with MIME/DIME binding)
- MIME binding
- DIME binding
- support for portType/operation parameterOrder attribute
-- support for fault, soap:fault, soap:headerfault
- support for binding operation input/output name attribute (part of overloading)
- function/method overloading/redeclaration (test(int); test(string))
- wsdl auto generation
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.62r2=1.63ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.62 php-src/ext/soap/php_sdl.c:1.63
--- php-src/ext/soap/php_sdl.c:1.62 Tue Feb 17 10:10:16 2004
+++ php-src/ext/soap/php_sdl.c Thu Feb 19 03:21:12 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.62 2004/02/17 15:10:16 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.63 2004/02/19 08:21:12 dmitry Exp $ */
#include php_soap.h
#include libxml/uri.h
@@ -33,6 +33,7 @@
# define O_BINARY 0
#endif
+static void delete_fault(void *fault);
static void delete_binding(void *binding);
static void delete_function(void *function);
static void delete_parameter(void *paramater);
@@ -344,14 +345,16 @@
if (binding-use == SOAP_ENCODED) {
tmp = get_attribute(body-properties, encodingStyle);
- if (tmp
-
strncmp(tmp-children-content,SOAP_1_1_ENC_NAMESPACE,sizeof(SOAP_1_1_ENC_NAMESPACE))
!= 0
-
strncmp(tmp-children-content,SOAP_1_2_ENC_NAMESPACE,sizeof(SOAP_1_2_ENC_NAMESPACE))
!= 0) {
- php_error(E_ERROR, SOAP-ERROR: Parsing WSDL:
Unknown encodingStyle '%s',tmp-children-content);
- } else if (tmp == NULL) {
- php_error(E_ERROR, SOAP-ERROR: Parsing WSDL:
Unspecified encodingStyle);
+ if (tmp) {
+ if
(strncmp(tmp-children-content,SOAP_1_1_ENC_NAMESPACE,sizeof(SOAP_1_1_ENC_NAMESPACE))
== 0) {
+ binding-encodingStyle =
SOAP_ENCODING_1_1;
+ } else if
(strncmp(tmp-children-content,SOAP_1_2_ENC_NAMESPACE,sizeof(SOAP_1_2_ENC_NAMESPACE))
== 0) {
+ binding-encodingStyle =
SOAP_ENCODING_1_2;
+ } else {
+ php_error(E_ERROR, SOAP-ERROR:
Parsing WSDL: Unknown encodingStyle '%s',tmp-children-content);
+ }
} else {
- binding-encodingStyle =
estrdup(tmp-children-content);
+ php_error(E_ERROR, SOAP-ERROR: Parsing WSDL:
Unspecified encodingStyle);
}
}
} else if (node_is_equal_ex(trav, header, wsdl_soap_namespace)) {
@@ -404,14 +407,16 @@
if (h-use == SOAP_ENCODED) {
tmp = get_attribute(header-properties,
encodingStyle);
- if (tmp
-
strncmp(tmp-children-content,SOAP_1_1_ENC_NAMESPACE,sizeof(SOAP_1_1_ENC_NAMESPACE))
!= 0
-
strncmp(tmp-children-content,SOAP_1_2_ENC_NAMESPACE,sizeof(SOAP_1_2_ENC_NAMESPACE))
!= 0) {
- php_error(E_ERROR, SOAP-ERROR: Parsing WSDL:
Unknown encodingStyle '%s',tmp-children-content);
- } else if (tmp == NULL) {
- php_error(E_ERROR, SOAP-ERROR: Parsing WSDL:
Unspecified encodingStyle);
+ if (tmp) {
+ if
(strncmp(tmp-children-content,SOAP_1_1_ENC_NAMESPACE,sizeof(SOAP_1_1_ENC_NAMESPACE))
== 0) {
+ h-encodingStyle = SOAP_ENCODING_1_1;
+ } else if
(strncmp(tmp-children-content,SOAP_1_2_ENC_NAMESPACE,sizeof(SOAP_1_2_ENC_NAMESPACE))
== 0) {
+
[PHP-CVS] cvs: php-src /ext/soap php_encoding.c
dmitry Thu Feb 19 06:32:43 2004 EDT
Modified files:
/php-src/ext/soap php_encoding.c
Log:
Passing arguments to anyType cause passing type information in literal encoding.
Receiver gets sach parameters as SoapVar objects.
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.61r2=1.62ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.61 php-src/ext/soap/php_encoding.c:1.62
--- php-src/ext/soap/php_encoding.c:1.61Tue Feb 17 13:54:30 2004
+++ php-src/ext/soap/php_encoding.c Thu Feb 19 06:32:42 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.61 2004/02/17 18:54:30 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.62 2004/02/19 11:32:42 dmitry Exp $ */
#include time.h
@@ -247,14 +247,25 @@
Z_TYPE_P(data) == IS_OBJECT
Z_OBJCE_P(data) == soap_var_class_entry) {
zval **ztype, **zdata, **zns, **zstype, **zname, **znamens;
- encodePtr enc;
+ encodePtr enc = NULL;
HashTable *ht = Z_OBJPROP_P(data);
if (zend_hash_find(ht, enc_type, sizeof(enc_type), (void
**)ztype) == FAILURE) {
php_error(E_ERROR, SOAP-ERROR: Encoding: SoapVar hasn't
'enc_type' propery);
}
- enc = get_conversion(Z_LVAL_P(*ztype));
+ if (SOAP_GLOBAL(sdl) encode == NULL) {
+ if (zend_hash_find(ht, enc_stype, sizeof(enc_stype), (void
**)zstype) == SUCCESS) {
+ if (zend_hash_find(ht, enc_ns, sizeof(enc_ns),
(void **)zns) == SUCCESS) {
+ enc = get_encoder(SOAP_GLOBAL(sdl),
Z_STRVAL_PP(zns), Z_STRVAL_PP(zstype));
+ } else {
+ enc = get_encoder(SOAP_GLOBAL(sdl), NULL,
Z_STRVAL_PP(zstype));
+ }
+ }
+ }
+ if (enc == NULL) {
+ enc = get_conversion(Z_LVAL_P(*ztype));
+ }
if (zend_hash_find(ht, enc_value, sizeof(enc_value), (void
**)zdata) == FAILURE) {
node = master_to_xml(enc, NULL, style, parent);
@@ -262,8 +273,11 @@
node = master_to_xml(enc, *zdata, style, parent);
}
- if (style == SOAP_ENCODED) {
+ if (style == SOAP_ENCODED || (SOAP_GLOBAL(sdl) encode == NULL)) {
if (zend_hash_find(ht, enc_stype, sizeof(enc_stype), (void
**)zstype) == SUCCESS) {
+ if (style == SOAP_LITERAL) {
+ encode_add_ns(node, XSI_NAMESPACE);
+ }
if (zend_hash_find(ht, enc_ns, sizeof(enc_ns),
(void **)zns) == SUCCESS) {
set_ns_and_type_ex(node, Z_STRVAL_PP(zns),
Z_STRVAL_PP(zstype));
} else {
@@ -775,17 +789,9 @@
if (model-u.element-name) {
xmlNodePtr node = get_node(data-children,
model-u.element-name);
if (node) {
- xmlAttrPtr typeAttr =
get_attribute(node-properties,type);
- encodePtr enc = NULL;
zval *val;
- if (typeAttr != NULL typeAttr-children
typeAttr-children-content) {
- enc = get_encoder_from_prefix(sdl,
node, typeAttr-children-content);
- }
- if (enc == NULL) {
- enc = model-u.element-encode;
- }
- val = master_to_zval(enc, node);
+ val = master_to_zval(model-u.element-encode,
node);
if ((node = get_node(node-next,
model-u.element-name)) != NULL) {
zval *array;
@@ -793,15 +799,7 @@
array_init(array);
add_next_index_zval(array, val);
do {
- typeAttr =
get_attribute(node-properties,type);
- enc = NULL;
- if (typeAttr != NULL
typeAttr-children typeAttr-children-content) {
- enc =
get_encoder_from_prefix(sdl,
[PHP-CVS] cvs: php-src /ext/soap soap.c
dmitry Thu Feb 19 11:45:27 2004 EDT
Modified files:
/php-src/ext/soap soap.c
Log:
fix: prevent possible crash
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.89r2=1.90ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.89 php-src/ext/soap/soap.c:1.90
--- php-src/ext/soap/soap.c:1.89Thu Feb 19 03:21:13 2004
+++ php-src/ext/soap/soap.c Thu Feb 19 11:45:25 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.89 2004/02/19 08:21:13 dmitry Exp $ */
+/* $Id: soap.c,v 1.90 2004/02/19 16:45:25 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -3172,6 +3172,10 @@
} else {
ht = function-responseParameters;
}
+
+ if (ht == NULL) {
+ return NULL;
+ }
if (param_name != NULL) {
if (zend_hash_find(ht, param_name, strlen(param_name), (void **)tmp)
!= FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_sdl.c
dmitry Thu Feb 19 11:46:53 2004 EDT
Modified files:
/php-src/ext/soap php_sdl.c
Log:
WSDL caching bugs were fixed
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.63r2=1.64ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.63 php-src/ext/soap/php_sdl.c:1.64
--- php-src/ext/soap/php_sdl.c:1.63 Thu Feb 19 03:21:12 2004
+++ php-src/ext/soap/php_sdl.c Thu Feb 19 11:46:52 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.63 2004/02/19 08:21:12 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.64 2004/02/19 16:46:52 dmitry Exp $ */
#include php_soap.h
#include libxml/uri.h
@@ -954,10 +954,10 @@
return ctx.sdl;
}
-#define WSDL_CACHE_VERSION 06
+#define WSDL_CACHE_VERSION 07
#define WSDL_CACHE_GET(ret,type,buf) memcpy(ret,*buf,sizeof(type)); *buf +=
sizeof(type);
-#define WSDL_CACHE_GET_INT(ret,buf)ret =
((int)(*buf)[0])|((int)(*buf)[1]8)|((int)(*buf)[2]16)|((int)(*buf)[3]24); *buf
+= 4;
+#define WSDL_CACHE_GET_INT(ret,buf)ret = ((unsigned char)(*buf)[0])|((unsigned
char)(*buf)[1]8)|((unsigned char)(*buf)[2]16)|((int)(*buf)[3]24); *buf += 4;
#define WSDL_CACHE_GET_1(ret,type,buf) ret = (type)(**buf); (*buf)++;
#define WSDL_CACHE_GET_N(ret,n,buf)memcpy(ret,*buf,n); *buf += n;
#define WSDL_CACHE_SKIP(n,buf) *buf += n;
@@ -975,7 +975,7 @@
int len;
WSDL_CACHE_GET_INT(len, in);
- if (len == 0) {
+ if (len == 0x7fff) {
return NULL;
} else {
s = emalloc(len+1);
@@ -1487,7 +1487,7 @@
int function_num;
WSDL_CACHE_GET_INT(function_num, in);
- sdl_deserialize_key(sdl-requests, functions[function_num],
in);
+ sdl_deserialize_key(sdl-requests, functions[function_num-1],
in);
i--;
}
}
@@ -1506,12 +1506,12 @@
if (str) {
i = strlen(str);
+ WSDL_CACHE_PUT_INT(i, out);
+ if (i 0) {
+ WSDL_CACHE_PUT_N(str, i, out);
+ }
} else {
- i = 0;
- }
- WSDL_CACHE_PUT_INT(i, out);
- if (i 0) {
- WSDL_CACHE_PUT_N(str, i, out);
+ WSDL_CACHE_PUT_INT(0x7fff, out);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_http.c
dmitry Thu Feb 19 11:49:52 2004 EDT
Modified files:
/php-src/ext/soap php_http.c
Log:
Reading HTTP responses without Content-Length: but with Connection: close
http://cvs.php.net/diff.php/php-src/ext/soap/php_http.c?r1=1.43r2=1.44ty=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.43 php-src/ext/soap/php_http.c:1.44
--- php-src/ext/soap/php_http.c:1.43Wed Feb 18 01:58:33 2004
+++ php-src/ext/soap/php_http.c Thu Feb 19 11:49:50 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_http.c,v 1.43 2004/02/18 06:58:33 dmitry Exp $ */
+/* $Id: php_http.c,v 1.44 2004/02/19 16:49:50 dmitry Exp $ */
#include php_soap.h
#include ext/standard/base64.h
@@ -469,7 +469,7 @@
php_stream_close(stream);
zend_hash_del(Z_OBJPROP_P(this_ptr), httpsocket,
sizeof(httpsocket));
zend_hash_del(Z_OBJPROP_P(this_ptr), _use_proxy,
sizeof(_use_proxy));
- add_soap_fault(this_ptr, HTTP, Error Fetching http body, No
Content-Length or chunked data, NULL, NULL TSRMLS_CC);
+ add_soap_fault(this_ptr, HTTP, Error Fetching http body, No
Content-Length, connection closed or chunked data, NULL, NULL TSRMLS_CC);
return FALSE;
}
@@ -635,17 +635,29 @@
static int get_http_body(php_stream *stream, char *headers, char **response, int
*out_size TSRMLS_DC)
{
- char *trans_enc, *content_length, *http_buf = NULL;
- int http_buf_size = 0;
+ char *header, *http_buf = NULL;
+ int header_close = 0, header_chunked = 0, header_length = 0, http_buf_size = 0;
- trans_enc = get_http_header_value(headers, Transfer-Encoding: );
- content_length = get_http_header_value(headers, Content-Length: );
+ header = get_http_header_value(headers, Connection: );
+ if (header) {
+ if(!strcmp(header, close)) header_close = 1;
+ efree(header);
+ }
+ header = get_http_header_value(headers, Transfer-Encoding: );
+ if (header) {
+ if(!strcmp(header, chunked)) header_chunked = 1;
+ efree(header);
+ }
+ header = get_http_header_value(headers, Content-Length: );
+ if (header) {
+ header_length = atoi(header);
+ efree(header);
+ }
- if (trans_enc !strcmp(trans_enc, chunked)) {
+ if (header_chunked) {
char done, chunk_size[10];
done = FALSE;
- http_buf = NULL;
while (!done) {
int buf_size = 0;
@@ -674,7 +686,6 @@
php_stream_getc(stream);
} else {
/* Somthing wrong in chunked encoding */
- efree(trans_enc);
efree(http_buf);
return FALSE;
}
@@ -682,29 +693,26 @@
done = TRUE;
}
}
- efree(trans_enc);
if (http_buf == NULL) {
- http_buf = estrndup(, 1);
- http_buf_size = 1;
- } else {
- http_buf[http_buf_size] = '\0';
+ http_buf = emalloc(1);
}
- } else if (content_length) {
- int size;
- size = atoi(content_length);
- http_buf = emalloc(size + 1);
-
- while (http_buf_size size) {
- http_buf_size += php_stream_read(stream, http_buf +
http_buf_size, size - http_buf_size);
- }
- http_buf[size] = '\0';
- efree(content_length);
+ } else if (header_length) {
+ http_buf = emalloc(header_length + 1);
+ while (http_buf_size header_length) {
+ http_buf_size += php_stream_read(stream, http_buf +
http_buf_size, header_length - http_buf_size);
+ }
+ } else if (header_close) {
+ do {
+ http_buf = erealloc(http_buf, http_buf_size + 4096 + 1);
+ http_buf_size += php_stream_read(stream, http_buf +
http_buf_size, 4096);
+ } while(!php_stream_eof(stream));
} else {
return FALSE;
}
+ http_buf[http_buf_size] = '\0';
(*response) = http_buf;
(*out_size) = http_buf_size;
return TRUE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_sdl.c
dmitry Thu Feb 19 13:49:51 2004 EDT
Modified files:
/php-src/ext/soap php_sdl.c
Log:
Don't try to use input name instead of opeartion name for encoding RPC call
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.64r2=1.65ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.64 php-src/ext/soap/php_sdl.c:1.65
--- php-src/ext/soap/php_sdl.c:1.64 Thu Feb 19 11:46:52 2004
+++ php-src/ext/soap/php_sdl.c Thu Feb 19 13:49:50 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.64 2004/02/19 16:46:52 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.65 2004/02/19 18:49:50 dmitry Exp $ */
#include php_soap.h
#include libxml/uri.h
@@ -775,9 +775,12 @@
function-requestParameters =
wsdl_message(ctx, message-children-content);
name =
get_attribute(input-properties, name);
+/* FIXME
if (name != NULL) {
function-requestName =
estrdup(name-children-content);
} else {
+*/
+ {
function-requestName =
estrdup(function-functionName);
}
@@ -801,11 +804,14 @@
function-responseParameters =
wsdl_message(ctx, message-children-content);
name =
get_attribute(output-properties, name);
+/* FIXME
if (name != NULL) {
function-responseName =
estrdup(name-children-content);
} else if (input == NULL) {
function-responseName =
estrdup(function-functionName);
} else {
+*/
+ {
int len =
strlen(function-functionName);
function-responseName =
emalloc(len + sizeof(Response));
memcpy(function-responseName,
function-functionName, len);
@@ -954,7 +960,7 @@
return ctx.sdl;
}
-#define WSDL_CACHE_VERSION 07
+#define WSDL_CACHE_VERSION 0x08
#define WSDL_CACHE_GET(ret,type,buf) memcpy(ret,*buf,sizeof(type)); *buf +=
sizeof(type);
#define WSDL_CACHE_GET_INT(ret,buf)ret = ((unsigned char)(*buf)[0])|((unsigned
char)(*buf)[1]8)|((unsigned char)(*buf)[2]16)|((int)(*buf)[3]24); *buf += 4;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dio dio.c
iliaa Thu Feb 19 20:09:01 2004 EDT
Modified files:
/php-src/ext/diodio.c
Log:
Added missing safe_mode open_basedir checks.
http://cvs.php.net/diff.php/php-src/ext/dio/dio.c?r1=1.32r2=1.33ty=u
Index: php-src/ext/dio/dio.c
diff -u php-src/ext/dio/dio.c:1.32 php-src/ext/dio/dio.c:1.33
--- php-src/ext/dio/dio.c:1.32 Thu Jan 8 03:15:12 2004
+++ php-src/ext/dio/dio.c Thu Feb 19 20:09:00 2004
@@ -159,6 +159,10 @@
return;
}
+ if (php_check_open_basedir(file_name TSRMLS_CC) || (PG(safe_mode)
!php_checkuid(file_name, wb+, CHECKUID_CHECK_MODE_PARAM))) {
+ RETURN_FALSE;
+ }
+
if (ZEND_NUM_ARGS() == 3) {
fd = open(file_name, flags, mode);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 oci8.c
sniper Thu Feb 19 22:05:43 2004 EDT
Modified files:
/php-src/ext/oci8 oci8.c
Log:
Only use Z_TYPE* with zvals..
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.250r2=1.251ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.250 php-src/ext/oci8/oci8.c:1.251
--- php-src/ext/oci8/oci8.c:1.250 Thu Feb 12 14:05:39 2004
+++ php-src/ext/oci8/oci8.c Thu Feb 19 22:05:42 2004
@@ -22,7 +22,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.250 2004/02/12 19:05:39 ssb Exp $ */
+/* $Id: oci8.c,v 1.251 2004/02/20 03:05:42 sniper Exp $ */
/* TODO list:
*
@@ -786,7 +786,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.250 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.251 $);
sprintf(buf, %ld, num_persistent);
php_info_print_table_row(2, Active Persistent Links, buf);
@@ -1061,7 +1061,7 @@
/* Note sure if we need to free the object. Have an
oracle TAR out on this one.
- OCIDescriptorFree(descr-ocidescr, Z_TYPE_P(descr)); */
+ OCIDescriptorFree(descr-ocidescr, descr-type); */
oci_debug(END _oci_coll_list_dtor: %d,coll-id);
@@ -1086,7 +1086,7 @@
CALL_OCI(
OCIDescriptorFree(
descr-ocidescr,
- Z_TYPE_P(descr)
+ descr-type
)
);
@@ -1350,23 +1350,23 @@
/* {{{ oci_new_desc()
*/
-static oci_descriptor *oci_new_desc(int type,oci_connection *connection)
+static oci_descriptor *oci_new_desc(int type, oci_connection *connection)
{
oci_descriptor *descr;
TSRMLS_FETCH();
descr = emalloc(sizeof(oci_descriptor));
- Z_TYPE_P(descr) = type;
+ descr-type = type;
- switch (Z_TYPE_P(descr)) {
+ switch (descr-type) {
case OCI_DTYPE_FILE:
case OCI_DTYPE_LOB:
case OCI_DTYPE_ROWID:
break;
default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
descriptor type %d.,Z_TYPE_P(descr));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
descriptor type %d., descr-type);
efree(descr);
return 0;
}
@@ -1375,7 +1375,7 @@
OCIDescriptorAlloc(
connection-session-pEnv,
(dvoid*)(descr-ocidescr),
- Z_TYPE_P(descr),
+ descr-type,
(size_t) 0,
(dvoid **) 0
)
@@ -2149,7 +2149,7 @@
if (mydescr-lob_size = 0) {
*loblen = mydescr-lob_size;
} else {
- if (Z_TYPE_P(mydescr) == OCI_DTYPE_FILE) {
+ if (mydescr-type == OCI_DTYPE_FILE) {
CALL_OCI_RETURN(connection-error,
OCILobFileOpen(
connection-pServiceContext,
@@ -2181,7 +2181,7 @@
}
mydescr-lob_size = *loblen;
- if (Z_TYPE_P(mydescr) == OCI_DTYPE_FILE) {
+ if (mydescr-type == OCI_DTYPE_FILE) {
CALL_OCI_RETURN(connection-error,
OCILobFileClose(
connection-pServiceContext,
@@ -2207,7 +2207,7 @@
/* {{{ oci_loadlob()
*/
#define LOBREADSIZE 1048576l /* 1MB */
-static int oci_loadlob(oci_connection *connection, oci_descriptor *mydescr, char
**buffer,ub4 *loblen)
+static int oci_loadlob(oci_connection *connection, oci_descriptor *mydescr, char
**buffer, ub4 *loblen)
{
ub4 siz = 0;
ub4 readlen = 0;
@@ -2216,7 +2216,7 @@
*loblen = 0;
- if (Z_TYPE_P(mydescr) == OCI_DTYPE_FILE) {
+ if (mydescr-type == OCI_DTYPE_FILE) {
CALL_OCI_RETURN(connection-error,
OCILobFileOpen(
connection-pServiceContext,
@@ -2285,7 +2285,7 @@
return -1;
}
- if (Z_TYPE_P(mydescr) == OCI_DTYPE_FILE) {
+ if (mydescr-type == OCI_DTYPE_FILE) {
CALL_OCI_RETURN(connection-error,
OCILobFileClose(
connection-pServiceContext,
@@ -2330,7 +2330,7 @@
return -1;
}
- if (Z_TYPE_P(mydescr) == OCI_DTYPE_FILE) {
+ if (mydescr-type == OCI_DTYPE_FILE) {
CALL_OCI_RETURN(connection-error,
OCILobFileOpen(
connection-pServiceContext,
@@ -2418,7 +2418,7 @@
return -1;
}
- if (Z_TYPE_P(mydescr) ==
[PHP-CVS] cvs: php-src /ext/oci8 oci8.c
sniper Thu Feb 19 22:16:59 2004 EDT
Modified files:
/php-src/ext/oci8 oci8.c
Log:
Fix compile failure
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.251r2=1.252ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.251 php-src/ext/oci8/oci8.c:1.252
--- php-src/ext/oci8/oci8.c:1.251 Thu Feb 19 22:05:42 2004
+++ php-src/ext/oci8/oci8.c Thu Feb 19 22:16:51 2004
@@ -22,7 +22,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.251 2004/02/20 03:05:42 sniper Exp $ */
+/* $Id: oci8.c,v 1.252 2004/02/20 03:16:51 sniper Exp $ */
/* TODO list:
*
@@ -786,7 +786,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.251 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.252 $);
sprintf(buf, %ld, num_persistent);
php_info_print_table_row(2, Active Persistent Links, buf);
@@ -838,7 +838,7 @@
{
TSRMLS_FETCH();
- oci_descriptor *descr = *((oci_descriptor **)data);
+ oci_descriptor *descr = *(oci_descriptor **)data;
if (descr-buffering == 2 (descr-type == OCI_DTYPE_LOB || descr-type ==
OCI_DTYPE_FILE)) {
oci_lob_flush(descr,OCI_LOB_BUFFER_FREE TSRMLS_CC);
descr-buffering = 1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
