[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8 oci8.c package.xml
tony2001Wed Jan 24 14:34:13 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/oci8 oci8.c package.xml Log: prepare to release 1.2.3 http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.28r2=1.269.2.16.2.29diff_format=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.28 php-src/ext/oci8/oci8.c:1.269.2.16.2.29 --- php-src/ext/oci8/oci8.c:1.269.2.16.2.28 Thu Jan 11 11:27:52 2007 +++ php-src/ext/oci8/oci8.c Wed Jan 24 14:34:13 2007 @@ -26,7 +26,7 @@ +--+ */ -/* $Id: oci8.c,v 1.269.2.16.2.28 2007/01/11 11:27:52 tony2001 Exp $ */ +/* $Id: oci8.c,v 1.269.2.16.2.29 2007/01/24 14:34:13 tony2001 Exp $ */ /* TODO * * file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty() with OCI_ATTR_LOBEMPTY @@ -375,7 +375,7 @@ PHP_RINIT(oci), /* per-request startup function */ PHP_RSHUTDOWN(oci), /* per-request shutdown function */ PHP_MINFO(oci), /* information function */ - 1.2.2, + 1.2.3, #if (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION 1) || (PHP_MAJOR_VERSION 5) PHP_MODULE_GLOBALS(oci), /* globals descriptor */ PHP_GINIT(oci), /* globals ctor */ @@ -669,8 +669,8 @@ php_info_print_table_start(); php_info_print_table_row(2, OCI8 Support, enabled); - php_info_print_table_row(2, Version, 1.2.2); - php_info_print_table_row(2, Revision, $Revision: 1.269.2.16.2.28 $); + php_info_print_table_row(2, Version, 1.2.3); + php_info_print_table_row(2, Revision, $Revision: 1.269.2.16.2.29 $); sprintf(buf, %ld, OCI_G(num_persistent)); php_info_print_table_row(2, Active Persistent Connections, buf); http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/package.xml?r1=1.2.4.1.2.1r2=1.2.4.1.2.2diff_format=u Index: php-src/ext/oci8/package.xml diff -u php-src/ext/oci8/package.xml:1.2.4.1.2.1 php-src/ext/oci8/package.xml:1.2.4.1.2.2 --- php-src/ext/oci8/package.xml:1.2.4.1.2.1Thu Aug 24 11:59:15 2006 +++ php-src/ext/oci8/package.xmlWed Jan 24 14:34:13 2007 @@ -30,23 +30,19 @@ licensePHP/license release statestable/state - version1.2.2/version - date2006-08-24/date + version1.2.3/version + date2007-01-25/date notes - Reimplemented oci_lob_read() utilities using patch from Massimo Squillace (msquillace at sogei dot it), which should fix Unicode LOB problems. - Fixed bug #38161 (oci_bind_by_name() returns garbage when Oracle didn't set the variable) - Fixed bug #38173 (Freeing nested cursors causes OCI8 to segfault) - Fixed bug #37886 (oci_connect may crash when charset parameter is given) - Fixed bug #37931 (possible crash after database restart when using persistent connections) - Fixed bug #37531 (oci8 persistent connection corruption) - Fixed bug #37487 (oci_fetch_array() array-type should always default to OCI_BOTH) - Fixed bug #37392 (Unnecessary call to OCITransRollback() at the end of request) - Fixed bug #35973 (Error ORA-24806 occurs when trying to fetch a NCLOB field) - Fixed bug #34005 (oci_password_change() fails). Patch by pholdaway at technocom-wireless dot com. - Fixed PECL bug #8112 (Persistent connections misbehave when Apache process times out) + Fixed possible segfault in ZTS mode when statements containing sub-statements are destroyed in wrong order. + Fixed bug #40078 (ORA-01405 when fetching NULL values using oci_bind_array_by_name()). + Fixed bug #39988 (type argument of oci_define_by_name() is ignored). + Fixed bug #39732 (oci_bind_array_by_name doesn't work on Solaris 64bit). + Fixed PECL bug #8816 (issue in php_oci_statement_fetch with more than one piecewise column). + Various minor improvements. /notes deps dep type=php rel=ge version=4.3.10/ + dep type=php rel=lt version=6.0.0/ /deps /release filelist @@ -62,10 +58,39 @@ file role=src name=oci8_collection.c/ file role=src name=php_oci8.h/ file role=src name=php_oci8_int.h/ + file role=test name=tests/connect.inc/ + file role=test name=tests/create_table.inc/ + file role=test name=tests/create_type.inc/ + file role=test name=tests/details.inc/ + file role=test name=tests/drop_table.inc/ + file role=test name=tests/drop_type.inc/ + file role=test name=tests/skipif.inc/ + file role=test name=tests/array_bind_001.phpt/ + file role=test name=tests/array_bind_002.phpt/ + file role=test name=tests/array_bind_003.phpt/ + file role=test name=tests/array_bind_004.phpt/ + file role=test name=tests/array_bind_005.phpt/ + file role=test name=tests/array_bind_006.phpt/ + file role=test name=tests/array_bind_007.phpt/ + file role=test name=tests/array_bind_008.phpt/ + file role=test name=tests/array_bind_009.phpt/ + file role=test name=tests/array_bind_010.phpt/ + file role=test name=tests/array_bind_011.phpt/ + file role=test
[PHP-CVS] cvs: php-src / NEWS /ext/soap php_http.c php_xml.c /ext/standard php_fopen_wrapper.c /main main.c php_globals.h php_streams.h /main/streams streams.c userspace.c
pollita Wed Jan 24 21:43:47 2007 UTC
Modified files:
/php-src/ext/soap php_http.c php_xml.c
/php-src/ext/standard php_fopen_wrapper.c
/php-src/main main.c php_globals.h php_streams.h
/php-src/main/streams streams.c userspace.c
/php-srcNEWS
Log:
Expand allow_url_fopen/allow_url_include functionality
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.100r2=1.101diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.100 php-src/ext/soap/php_http.c:1.101
--- php-src/ext/soap/php_http.c:1.100 Wed Jan 17 00:22:48 2007
+++ php-src/ext/soap/php_http.c Wed Jan 24 21:43:47 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_http.c,v 1.100 2007/01/17 00:22:48 pollita Exp $ */
+/* $Id: php_http.c,v 1.101 2007/01/24 21:43:47 pollita Exp $ */
#include php_soap.h
#include ext/standard/base64.h
@@ -232,7 +232,7 @@
int content_type_xml = 0;
char *content_encoding;
char *http_msg = NULL;
- zend_bool old_allow_url_fopen;
+ char *old_allow_url_fopen_list;
soap_client_object *client;
if (this_ptr == NULL || Z_TYPE_P(this_ptr) != IS_OBJECT) {
@@ -317,13 +317,16 @@
return FALSE;
}
- old_allow_url_fopen = PG(allow_url_fopen);
- zend_alter_ini_entry(allow_url_fopen, sizeof(allow_url_fopen), 1,
1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
+ old_allow_url_fopen_list = PG(allow_url_fopen_list);
+ if (!old_allow_url_fopen_list) {
+ old_allow_url_fopen_list = ;
+ }
+ zend_alter_ini_entry(allow_url_fopen, sizeof(allow_url_fopen), *,
1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
if (use_ssl php_stream_locate_url_wrapper(https://;, NULL,
STREAM_LOCATE_WRAPPERS_ONLY TSRMLS_CC) == NULL) {
php_url_free(phpurl);
if (request != buf) {efree(request);}
add_soap_fault(this_ptr, HTTP, SSL support is not available
in this build, NULL, NULL TSRMLS_CC);
- zend_alter_ini_entry(allow_url_fopen,
sizeof(allow_url_fopen), old_allow_url_fopen ? 1 : 0, 1, PHP_INI_SYSTEM,
PHP_INI_STAGE_RUNTIME);
+ zend_alter_ini_entry(allow_url_fopen,
sizeof(allow_url_fopen), old_allow_url_fopen_list,
strlen(old_allow_url_fopen_list), PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
return FALSE;
}
@@ -376,11 +379,11 @@
php_url_free(phpurl);
if (request != buf) {efree(request);}
add_soap_fault(this_ptr, HTTP, Could not connect to
host, NULL, NULL TSRMLS_CC);
- zend_alter_ini_entry(allow_url_fopen,
sizeof(allow_url_fopen), old_allow_url_fopen ? 1 : 0, 1, PHP_INI_SYSTEM,
PHP_INI_STAGE_RUNTIME);
+ zend_alter_ini_entry(allow_url_fopen,
sizeof(allow_url_fopen), old_allow_url_fopen_list,
strlen(old_allow_url_fopen_list), PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
return FALSE;
}
}
- zend_alter_ini_entry(allow_url_fopen, sizeof(allow_url_fopen),
old_allow_url_fopen ? 1 : 0, 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
+ zend_alter_ini_entry(allow_url_fopen, sizeof(allow_url_fopen),
old_allow_url_fopen_list, strlen(old_allow_url_fopen_list), PHP_INI_SYSTEM,
PHP_INI_STAGE_RUNTIME);
if (stream) {
if (client-url) {
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_xml.c?r1=1.31r2=1.32diff_format=u
Index: php-src/ext/soap/php_xml.c
diff -u php-src/ext/soap/php_xml.c:1.31 php-src/ext/soap/php_xml.c:1.32
--- php-src/ext/soap/php_xml.c:1.31 Wed Jan 17 00:22:48 2007
+++ php-src/ext/soap/php_xml.c Wed Jan 24 21:43:47 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_xml.c,v 1.31 2007/01/17 00:22:48 pollita Exp $ */
+/* $Id: php_xml.c,v 1.32 2007/01/24 21:43:47 pollita Exp $ */
#include php_soap.h
#include libxml/parser.h
@@ -80,16 +80,19 @@
{
xmlParserCtxtPtr ctxt = NULL;
xmlDocPtr ret;
- zend_bool old_allow_url_fopen;
+ char *old_allow_url_fopen_list;
/*
xmlInitParser();
*/
- old_allow_url_fopen = PG(allow_url_fopen);
- zend_alter_ini_entry(allow_url_fopen, sizeof(allow_url_fopen), 1,
1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
+ old_allow_url_fopen_list = PG(allow_url_fopen_list);
+ if (!old_allow_url_fopen_list) {
+ old_allow_url_fopen_list = ;
+ }
+ zend_alter_ini_entry(allow_url_fopen, sizeof(allow_url_fopen), *,
1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
ctxt = xmlCreateFileParserCtxt(filename);
-
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard head.c mail.c
iliaa Thu Jan 25 00:26:51 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard head.c mail.c
Log:
Eliminate strcat() and strcpy()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/head.c?r1=1.84.2.1.2.4r2=1.84.2.1.2.5diff_format=u
Index: php-src/ext/standard/head.c
diff -u php-src/ext/standard/head.c:1.84.2.1.2.4
php-src/ext/standard/head.c:1.84.2.1.2.5
--- php-src/ext/standard/head.c:1.84.2.1.2.4Wed Jan 24 00:45:54 2007
+++ php-src/ext/standard/head.c Thu Jan 25 00:26:51 2007
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf [EMAIL PROTECTED]|
+--+
*/
-/* $Id: head.c,v 1.84.2.1.2.4 2007/01/24 00:45:54 iliaa Exp $ */
+/* $Id: head.c,v 1.84.2.1.2.5 2007/01/25 00:26:51 iliaa Exp $ */
#include stdio.h
#include php.h
@@ -109,7 +109,7 @@
} else {
sprintf(cookie, Set-Cookie: %s=%s, name, value ?
encoded_value : );
if (expires 0) {
- strcat(cookie, ; expires=);
+ strlcat(cookie, ; expires=, len + 100);
dt = php_format_date(D, d-M-Y H:i:s T, sizeof(D,
d-M-Y H:i:s T)-1, expires, 0 TSRMLS_CC);
strlcat(cookie, dt, len + 100);
efree(dt);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/mail.c?r1=1.87.2.1.2.1r2=1.87.2.1.2.2diff_format=u
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.87.2.1.2.1
php-src/ext/standard/mail.c:1.87.2.1.2.2
--- php-src/ext/standard/mail.c:1.87.2.1.2.1Mon Jan 1 09:36:08 2007
+++ php-src/ext/standard/mail.c Thu Jan 25 00:26:51 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mail.c,v 1.87.2.1.2.1 2007/01/01 09:36:08 sebastian Exp $ */
+/* $Id: mail.c,v 1.87.2.1.2.2 2007/01/25 00:26:51 iliaa Exp $ */
#include stdlib.h
#include ctype.h
@@ -200,10 +200,7 @@
#endif
}
if (extra_cmd != NULL) {
- sendmail_cmd = emalloc (strlen (sendmail_path) + strlen
(extra_cmd) + 2);
- strcpy (sendmail_cmd, sendmail_path);
- strcat (sendmail_cmd, );
- strcat (sendmail_cmd, extra_cmd);
+ spprintf(sendmail_cmd, 0, %s %s, sendmail_path, extra_cmd);
} else {
sendmail_cmd = sendmail_path;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard user_filters.c
iliaa Thu Jan 25 00:27:19 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard user_filters.c
Log:
Added safety checks to the code
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/user_filters.c?r1=1.31.2.4.2.5r2=1.31.2.4.2.6diff_format=u
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.31.2.4.2.5
php-src/ext/standard/user_filters.c:1.31.2.4.2.6
--- php-src/ext/standard/user_filters.c:1.31.2.4.2.5Fri Jan 19 14:50:11 2007
+++ php-src/ext/standard/user_filters.c Thu Jan 25 00:27:19 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: user_filters.c,v 1.31.2.4.2.5 2007/01/19 14:50:11 tony2001 Exp $ */
+/* $Id: user_filters.c,v 1.31.2.4.2.6 2007/01/25 00:27:19 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -256,6 +256,7 @@
zval *obj, *zfilter;
zval func_name;
zval *retval = NULL;
+ int len;
/* some sanity checks */
if (persistent) {
@@ -264,9 +265,10 @@
return NULL;
}
+ len = strlen(filtername);
+
/* determine the classname/class entry */
- if (FAILURE == zend_hash_find(BG(user_filter_map), (char*)filtername,
- strlen(filtername) + 1, (void**)fdat)) {
+ if (FAILURE == zend_hash_find(BG(user_filter_map), (char*)filtername,
len + 1, (void**)fdat)) {
char *period;
/* Userspace Filters using ambiguous wildcards could cause
problems.
@@ -275,10 +277,10 @@
TODO: Allow failed userfilter creations to continue
scanning through the list */
if ((period = strrchr(filtername, '.'))) {
- char *wildcard;
+ char *wildcard = emalloc(len + 3);
/* Search for wildcard matches instead */
- wildcard = estrdup(filtername);
+ memcpy(wildname, filtername, len + 1); /* copy \0 */
period = wildcard + (period - filtername);
while (period) {
*period = '\0';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard user_filters.c
rasmus Thu Jan 25 06:12:58 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard user_filters.c
Log:
Fix typo
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/user_filters.c?r1=1.31.2.4.2.6r2=1.31.2.4.2.7diff_format=u
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.31.2.4.2.6
php-src/ext/standard/user_filters.c:1.31.2.4.2.7
--- php-src/ext/standard/user_filters.c:1.31.2.4.2.6Thu Jan 25 00:27:19 2007
+++ php-src/ext/standard/user_filters.c Thu Jan 25 06:12:58 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: user_filters.c,v 1.31.2.4.2.6 2007/01/25 00:27:19 iliaa Exp $ */
+/* $Id: user_filters.c,v 1.31.2.4.2.7 2007/01/25 06:12:58 rasmus Exp $ */
#include php.h
#include php_globals.h
@@ -280,7 +280,7 @@
char *wildcard = emalloc(len + 3);
/* Search for wildcard matches instead */
- memcpy(wildname, filtername, len + 1); /* copy \0 */
+ memcpy(wildcard, filtername, len + 1); /* copy \0 */
period = wildcard + (period - filtername);
while (period) {
*period = '\0';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
