date:20041223

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard streamsfuncs.c

2004-12-23 Thread Wez Furlong

wez Thu Dec 23 14:39:49 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   streamsfuncs.c 
  Log:
  MFH
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/streamsfuncs.c?r1=1.35.2.6&r2=1.35.2.7&ty=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.35.2.6 
php-src/ext/standard/streamsfuncs.c:1.35.2.7
--- php-src/ext/standard/streamsfuncs.c:1.35.2.6Thu Dec 23 01:02:54 2004
+++ php-src/ext/standard/streamsfuncs.c Thu Dec 23 14:39:49 2004
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: streamsfuncs.c,v 1.35.2.6 2004/12/23 06:02:54 wez Exp $ */
+/* $Id: streamsfuncs.c,v 1.35.2.7 2004/12/23 19:39:49 wez Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -217,7 +217,7 @@
 
if (peername) {
zval_dtor(peername);
-   ZVAL_STRING(peername, "", 0);
+   ZVAL_NULL(peername);
}
 
if (0 == php_stream_xport_accept(stream, &clistream,
@@ -227,6 +227,7 @@
&tv, &errstr
TSRMLS_CC) && clistream) {
 
+   Z_TYPE_P(peername) = IS_STRING;
php_stream_to_zval(clistream, return_value);
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "accept failed: 
%s", errstr ? errstr : "Unknown error");
@@ -237,10 +238,6 @@
if (errstr) {
efree(errstr);
}
-
-   if (peername && Z_STRVAL_P(peername) == NULL) {
-   ZVAL_STRING(peername, "", 1);
-   }
 }
 /* }}} */
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard streamsfuncs.c

2004-12-23 Thread Wez Furlong

wez Thu Dec 23 14:39:23 2004 EDT

  Modified files:  
/php-src/ext/standard   streamsfuncs.c 
  Log:
  really don't blow up
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/streamsfuncs.c?r1=1.47&r2=1.48&ty=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.47 
php-src/ext/standard/streamsfuncs.c:1.48
--- php-src/ext/standard/streamsfuncs.c:1.47Thu Dec 23 00:56:50 2004
+++ php-src/ext/standard/streamsfuncs.c Thu Dec 23 14:39:22 2004
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: streamsfuncs.c,v 1.47 2004/12/23 05:56:50 wez Exp $ */
+/* $Id: streamsfuncs.c,v 1.48 2004/12/23 19:39:22 wez Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -250,7 +250,7 @@
 
if (peername) {
zval_dtor(peername);
-   ZVAL_STRING(peername, "", 0);
+   ZVAL_NULL(peername);
}
 
if (0 == php_stream_xport_accept(stream, &clistream,
@@ -260,6 +260,7 @@
&tv, &errstr
TSRMLS_CC) && clistream) {
 
+   Z_TYPE_P(peername) = IS_STRING;
php_stream_to_zval(clistream, return_value);
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "accept failed: 
%s", errstr ? errstr : "Unknown error");
@@ -270,10 +271,6 @@
if (errstr) {
efree(errstr);
}
-
-   if (peername && Z_STRVAL_P(peername) == NULL) {
-   ZVAL_STRING(peername, "", 1);
-   }
 }
 /* }}} */
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/fbsql php_fbsql.c

2004-12-23 Thread Ilia Alshanetsky

iliaa   Thu Dec 23 14:29:12 2004 EDT

  Modified files:  
/php-src/ext/fbsql  php_fbsql.c 
  Log:
  Fixed several buffer overflows.
  
  
http://cvs.php.net/diff.php/php-src/ext/fbsql/php_fbsql.c?r1=1.107&r2=1.108&ty=u
Index: php-src/ext/fbsql/php_fbsql.c
diff -u php-src/ext/fbsql/php_fbsql.c:1.107 php-src/ext/fbsql/php_fbsql.c:1.108
--- php-src/ext/fbsql/php_fbsql.c:1.107 Mon Nov 22 17:40:20 2004
+++ php-src/ext/fbsql/php_fbsql.c   Thu Dec 23 14:29:12 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_fbsql.c,v 1.107 2004/11/22 22:40:20 fmk Exp $ */
+/* $Id: php_fbsql.c,v 1.108 2004/12/23 19:29:12 iliaa Exp $ */
 
 /* TODO:
  *
@@ -482,11 +482,11 @@
 
if (FB_SQL_G(allowPersistent))
{
-   sprintf(buf, "%ld", FB_SQL_G(persistentCount));
+   snprintf(buf, sizeof(buf), "%ld", FB_SQL_G(persistentCount));
php_info_print_table_row(2, "Active Persistent Links", buf);
}
 
-   sprintf(buf, "%ld", FB_SQL_G(linkCount));
+   snprintf(buf, sizeof(buf), "%ld", FB_SQL_G(linkCount));
php_info_print_table_row(2, "Active Links", buf);
 
 /*
@@ -530,7 +530,9 @@
if (userName == NULL) userName = FB_SQL_G(userName);
if (userPassword == NULL) userPassword = FB_SQL_G(userPassword);
 
-   sprintf(name, "fbsql_%s_%s_%s", hostName, userName, userPassword);
+   if (snprintf(name, sizeof(name), "fbsql_%s_%s_%s", hostName, userName, 
userPassword) < 0) {
+   RETURN_FALSE;
+   }
 
if (!FB_SQL_G(allowPersistent)) {
persistent=0;
@@ -842,9 +844,21 @@
WRONG_PARAM_COUNT;
break;
}
+
+   if (Z_LVAL_PP(Locking) < 0 || Z_LVAL_PP(Locking) > 2) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid locking 
type.");
+   RETURN_FALSE;
+   }
+   if (Z_LVAL_PP(strIsolation) < 0 || Z_LVAL_PP(Isolation) > 4) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid isolation 
type.");
+   RETURN_FALSE;
+   }
+
ZEND_FETCH_RESOURCE2(phpLink, PHPFBLink *, fbsql_link_index, -1, 
"FrontBase-Link", le_link, le_plink);
 
-   sprintf(strSQL, "SET TRANSACTION LOCKING %s, ISOLATION %s;", 
strLocking[Z_LVAL_PP(Locking)], strIsolation[Z_LVAL_PP(Isolation)]);
+   if (snprintf(strSQL, sizeof(strSQL) , "SET TRANSACTION LOCKING %s, 
ISOLATION %s;", strLocking[Z_LVAL_PP(Locking)], 
strIsolation[Z_LVAL_PP(Isolation)]) < 0) {
+   RETURN_FALSE;
+   }
 
md = fbcdcExecuteDirectSQL(phpLink->connection, strSQL);
fbcmdRelease(md);
@@ -1520,7 +1534,9 @@
convert_to_string_ex(password);
userPassword = Z_STRVAL_PP(password);
 
-   sprintf(buffer, "SET AUTHORIZATION %s;", userName);
+   if (snprintf(buffer, sizeof(buffer), "SET AUTHORIZATION %s;", userName) 
< 0) {
+   RETURN_FALSE;
+   }
 
phpfbQuery(INTERNAL_FUNCTION_PARAM_PASSTHRU, buffer, phpLink, 0);
if (Z_LVAL_P(return_value))
@@ -2210,7 +2226,9 @@
RETURN_FALSE;
}
 
-   sprintf(sql, "SELECT * FROM %s WHERE 1=0;", tableName);
+   if (snprintf(sql, sizeof(sql), "SELECT * FROM %s WHERE 1=0;", 
tableName) < 0) {
+   RETURN_FALSE;
+   }
 
phpfbQuery(INTERNAL_FUNCTION_PARAM_PASSTHRU, sql, phpLink, 0);
 }
@@ -2424,7 +2442,7 @@
{ 
int v = *((int*)data);
char b[128];
-   sprintf(b, "%d", v);
+   snprintf(b, sizeof(b), "%d", v);
phpfbestrdup(b, length, value);
}
break;
@@ -2433,7 +2451,7 @@
{ 
short int v = *((FBTinyInteger*)data);
char b[128];
-   sprintf(b, "%d", v);
+   snprintf(b, sizeof(b), "%d", v);
phpfbestrdup(b, length, value);
}
break;
@@ -2444,9 +2462,9 @@
FBLongInteger v = *((FBLongInteger*)data);
char b[128];
 #ifdef PHP_WIN32
-   sprintf(b, "%I64i", v);
+   snprintf(b, sizeof(b), "%I64i", v);
 #else
-   sprintf(b, "%ll", v);
+   snprintf(b, sizeof(b), "%ll", v);
 #endif
phpfbestrdup(b, length, value);
}
@@ -2456,7 +2474,7 @@
{
short v = *((short*)data);
char b[128];
-   sprintf(b, "%d", v);
+   snprintf(b, sizeof(b), "%d", v);
phpfbestrdup(b, length, value);
}
break; 
@@ -2469,7 +2487,7 @@
{
double v = *((double*)data);

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/fbsql php_fbsql.c

2004-12-23 Thread Ilia Alshanetsky

iliaa   Thu Dec 23 14:29:24 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/fbsql  php_fbsql.c 
  Log:
  MFH: Fixed several buffer overflows.
  
  
http://cvs.php.net/diff.php/php-src/ext/fbsql/php_fbsql.c?r1=1.105&r2=1.105.2.1&ty=u
Index: php-src/ext/fbsql/php_fbsql.c
diff -u php-src/ext/fbsql/php_fbsql.c:1.105 
php-src/ext/fbsql/php_fbsql.c:1.105.2.1
--- php-src/ext/fbsql/php_fbsql.c:1.105 Fri Feb 27 18:03:07 2004
+++ php-src/ext/fbsql/php_fbsql.c   Thu Dec 23 14:29:24 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_fbsql.c,v 1.105 2004/02/27 23:03:07 fmk Exp $ */
+/* $Id: php_fbsql.c,v 1.105.2.1 2004/12/23 19:29:24 iliaa Exp $ */
 
 /* TODO:
  *
@@ -477,11 +477,11 @@
 
if (FB_SQL_G(allowPersistent))
{
-   sprintf(buf, "%ld", FB_SQL_G(persistentCount));
+   snprintf(buf, sizeof(buf), "%ld", FB_SQL_G(persistentCount));
php_info_print_table_row(2, "Active Persistent Links", buf);
}
 
-   sprintf(buf, "%ld", FB_SQL_G(linkCount));
+   snprintf(buf, sizeof(buf), "%ld", FB_SQL_G(linkCount));
php_info_print_table_row(2, "Active Links", buf);
 
 /*
@@ -525,7 +525,9 @@
if (userName == NULL) userName = FB_SQL_G(userName);
if (userPassword == NULL) userPassword = FB_SQL_G(userPassword);
 
-   sprintf(name, "fbsql_%s_%s_%s", hostName, userName, userPassword);
+   if (snprintf(name, sizeof(name), "fbsql_%s_%s_%s", hostName, userName, 
userPassword) < 0) {
+   RETURN_FALSE;
+   }
 
if (!FB_SQL_G(allowPersistent)) {
persistent=0;
@@ -836,9 +838,21 @@
WRONG_PARAM_COUNT;
break;
}
+
+   if (Z_LVAL_PP(Locking) < 0 || Z_LVAL_PP(Locking) > 2) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid locking 
type.");
+   RETURN_FALSE;
+   }
+   if (Z_LVAL_PP(strIsolation) < 0 || Z_LVAL_PP(Isolation) > 4) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid isolation 
type.");
+   RETURN_FALSE;
+   }
+
ZEND_FETCH_RESOURCE2(phpLink, PHPFBLink *, fbsql_link_index, -1, 
"FrontBase-Link", le_link, le_plink);
 
-   sprintf(strSQL, "SET TRANSACTION LOCKING %s, ISOLATION %s;", 
strLocking[Z_LVAL_PP(Locking)], strIsolation[Z_LVAL_PP(Isolation)]);
+   if (snprintf(strSQL, sizeof(strSQL) , "SET TRANSACTION LOCKING %s, 
ISOLATION %s;", strLocking[Z_LVAL_PP(Locking)], 
strIsolation[Z_LVAL_PP(Isolation)]) < 0) {
+   RETURN_FALSE;
+   }
 
md = fbcdcExecuteDirectSQL(phpLink->connection, strSQL);
fbcmdRelease(md);
@@ -1472,7 +1486,9 @@
convert_to_string_ex(password);
userPassword = Z_STRVAL_PP(password);
 
-   sprintf(buffer, "SET AUTHORIZATION %s;", userName);
+   if (snprintf(buffer, sizeof(buffer), "SET AUTHORIZATION %s;", userName) 
< 0) {
+   RETURN_FALSE;
+   }
 
phpfbQuery(INTERNAL_FUNCTION_PARAM_PASSTHRU, buffer, phpLink);
if (Z_LVAL_P(return_value))
@@ -2139,7 +2155,9 @@
RETURN_FALSE;
}
 
-   sprintf(sql, "SELECT * FROM %s WHERE 1=0;", tableName);
+   if (snprintf(sql, sizeof(sql), "SELECT * FROM %s WHERE 1=0;", 
tableName) < 0) {
+   RETURN_FALSE;
+   }
 
phpfbQuery(INTERNAL_FUNCTION_PARAM_PASSTHRU, sql, phpLink);
 }
@@ -2323,7 +2341,7 @@
{ 
int v = *((int*)data);
char b[128];
-   sprintf(b, "%d", v);
+   snprintf(b, sizeof(b), "%d", v);
phpfbestrdup(b, length, value);
}
break;
@@ -2332,7 +2350,7 @@
{ 
short int v = *((FBTinyInteger*)data);
char b[128];
-   sprintf(b, "%d", v);
+   snprintf(b, sizeof(b), "%d", v);
phpfbestrdup(b, length, value);
}
break;
@@ -2343,9 +2361,9 @@
FBLongInteger v = *((FBLongInteger*)data);
char b[128];
 #ifdef PHP_WIN32
-   sprintf(b, "%I64i", v);
+   snprintf(b, sizeof(b), "%I64i", v);
 #else
-   sprintf(b, "%ll", v);
+   snprintf(b, sizeof(b), "%ll", v);
 #endif
phpfbestrdup(b, length, value);
}
@@ -2355,7 +2373,7 @@
{
short v = *((short*)data);
char b[128];
-   sprintf(b, "%d", v);
+   snprintf(b, sizeof(b), "%d", v);
phpfbestrdup(b, length, value);
}
break; 
@@ -2368,7 +2386,7 @@
{
do

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/fbsql php_fbsql.c

2004-12-23 Thread Ilia Alshanetsky

iliaa   Thu Dec 23 14:29:36 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/fbsql  php_fbsql.c 
  Log:
  MFH: Fixed several buffer overflows.
  
  
http://cvs.php.net/diff.php/php-src/ext/fbsql/php_fbsql.c?r1=1.86.2.9&r2=1.86.2.10&ty=u
Index: php-src/ext/fbsql/php_fbsql.c
diff -u php-src/ext/fbsql/php_fbsql.c:1.86.2.9 
php-src/ext/fbsql/php_fbsql.c:1.86.2.10
--- php-src/ext/fbsql/php_fbsql.c:1.86.2.9  Tue Aug 24 14:00:05 2004
+++ php-src/ext/fbsql/php_fbsql.c   Thu Dec 23 14:29:36 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_fbsql.c,v 1.86.2.9 2004/08/24 18:00:05 fmk Exp $ */
+/* $Id: php_fbsql.c,v 1.86.2.10 2004/12/23 19:29:36 iliaa Exp $ */
 
 /* TODO:
  *
@@ -459,11 +459,11 @@
 
if (FB_SQL_G(allowPersistent))
{
-   sprintf(buf, "%ld", FB_SQL_G(persistentCount));
+   snprintf(buf, sizeof(buf), "%ld", FB_SQL_G(persistentCount));
php_info_print_table_row(2, "Active Persistent Links", buf);
}
 
-   sprintf(buf, "%ld", FB_SQL_G(linkCount));
+   snprintf(buf, sizeof(buf), "%ld", FB_SQL_G(linkCount));
php_info_print_table_row(2, "Active Links", buf);
 
 /*
@@ -507,7 +507,9 @@
if (userName == NULL) userName = FB_SQL_G(userName);
if (userPassword == NULL) userPassword = FB_SQL_G(userPassword);
 
-   sprintf(name, "fbsql_%s_%s_%s", hostName, userName, userPassword);
+   if (snprintf(name, sizeof(name), "fbsql_%s_%s_%s", hostName, userName, 
userPassword) < 0) {
+   RETURN_FALSE;
+   }
 
if (!FB_SQL_G(allowPersistent)) {
persistent=0;
@@ -818,9 +820,21 @@
WRONG_PARAM_COUNT;
break;
}
+
+   if (Z_LVAL_PP(Locking) < 0 || Z_LVAL_PP(Locking) > 2) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid locking 
type.");
+   RETURN_FALSE;
+   }
+   if (Z_LVAL_PP(strIsolation) < 0 || Z_LVAL_PP(Isolation) > 4) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid isolation 
type.");
+   RETURN_FALSE;
+   }
+
ZEND_FETCH_RESOURCE2(phpLink, PHPFBLink *, fbsql_link_index, -1, 
"FrontBase-Link", le_link, le_plink);
 
-   sprintf(strSQL, "SET TRANSACTION LOCKING %s, ISOLATION %s;", 
strLocking[Z_LVAL_PP(Locking)], strIsolation[Z_LVAL_PP(Isolation)]);
+   if (snprintf(strSQL, sizeof(strSQL) , "SET TRANSACTION LOCKING %s, 
ISOLATION %s;", strLocking[Z_LVAL_PP(Locking)], 
strIsolation[Z_LVAL_PP(Isolation)]) < 0) {
+   RETURN_FALSE;
+   }
 
md = fbcdcExecuteDirectSQL(phpLink->connection, strSQL);
fbcmdRelease(md);
@@ -1417,7 +1431,9 @@
convert_to_string_ex(password);
userPassword = Z_STRVAL_PP(password);
 
-   sprintf(buffer, "SET AUTHORIZATION %s;", userName);
+   if (snprintf(buffer, sizeof(buffer), "SET AUTHORIZATION %s;", userName) 
< 0) {
+   RETURN_FALSE;
+   }
 
phpfbQuery(INTERNAL_FUNCTION_PARAM_PASSTHRU, buffer, phpLink);
if (Z_LVAL_P(return_value))
@@ -2084,7 +2100,9 @@
RETURN_FALSE;
}
 
-   sprintf(sql, "SELECT * FROM %s WHERE 1=0;", tableName);
+   if (snprintf(sql, sizeof(sql), "SELECT * FROM %s WHERE 1=0;", 
tableName) < 0) {
+   RETURN_FALSE;
+   }
 
phpfbQuery(INTERNAL_FUNCTION_PARAM_PASSTHRU, sql, phpLink);
 }
@@ -2268,7 +2286,7 @@
{ 
int v = *((int*)data);
char b[128];
-   sprintf(b, "%d", v);
+   snprintf(b, sizeof(b), "%d", v);
phpfbestrdup(b, length, value);
}
break;
@@ -2277,7 +2295,7 @@
{ 
short int v = *((FBTinyInteger*)data);
char b[128];
-   sprintf(b, "%d", v);
+   snprintf(b, sizeof(b), "%d", v);
phpfbestrdup(b, length, value);
}
break;
@@ -2288,9 +2306,9 @@
FBLongInteger v = *((FBLongInteger*)data);
char b[128];
 #ifdef PHP_WIN32
-   sprintf(b, "%I64i", v);
+   snprintf(b, sizeof(b), "%I64i", v);
 #else
-   sprintf(b, "%ll", v);
+   snprintf(b, sizeof(b), "%ll", v);
 #endif
phpfbestrdup(b, length, value);
}
@@ -2300,7 +2318,7 @@
{
short v = *((short*)data);
char b[128];
-   sprintf(b, "%d", v);
+   snprintf(b, sizeof(b), "%d", v);
phpfbestrdup(b, length, value);
}
break; 
@@ -2313,7 +2331,7 @@
{

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/swf swf.c

2004-12-23 Thread Ilia Alshanetsky

iliaa   Thu Dec 23 13:29:36 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/swfswf.c 
  Log:
  Fixed potential buffer overflow inside swf_definepoly().
  
  
http://cvs.php.net/diff.php/php-src/ext/swf/swf.c?r1=1.46.2.3&r2=1.46.2.4&ty=u
Index: php-src/ext/swf/swf.c
diff -u php-src/ext/swf/swf.c:1.46.2.3 php-src/ext/swf/swf.c:1.46.2.4
--- php-src/ext/swf/swf.c:1.46.2.3  Thu Dec 23 13:04:10 2004
+++ php-src/ext/swf/swf.c   Thu Dec 23 13:29:36 2004
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: swf.c,v 1.46.2.3 2004/12/23 18:04:10 iliaa Exp $ */
+/* $Id: swf.c,v 1.46.2.4 2004/12/23 18:29:36 iliaa Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -611,8 +611,13 @@
convert_to_double_ex(width);

if (Z_TYPE_PP(coordinates) != IS_ARRAY) {
-   return;
php_error(E_WARNING, "Wrong datatype of second argument to 
swf_definepoly");
+   RETURN_FALSE;
+   }
+
+   if (Z_LVAL_PP(NumPoints) > 256) {
+   php_error(E_WARNING, "The npoints value cannot be larger then 
256.");
+   RETURN_FALSE;
}

npoints = Z_LVAL_PP(NumPoints);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/swf swf.c

2004-12-23 Thread Ilia Alshanetsky

iliaa   Thu Dec 23 13:04:10 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
/php-src/ext/swfswf.c 
  Log:
  Fixed bug #31270 (missing safe_mode/open_basedir check in swf_openfile()).
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.787&r2=1.1247.2.788&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.787 php-src/NEWS:1.1247.2.788
--- php-src/NEWS:1.1247.2.787   Thu Dec 23 11:29:00 2004
+++ php-src/NEWSThu Dec 23 13:04:09 2004
@@ -2,6 +2,7 @@
 |||
 ?? ??? , Version 4.3.11
 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
+- Fixed bug #31270 (missing safe_mode/open_basedir check in swf_openfile()). 
(Ilia)
 - Fixed bug #31174 (compile warning in url.c). (Ilia, lukem at NetBSD dot org)
 - Fixed bug #31159 (COM object access is not working). (Wez)
 - Fixed bug #31142 (imap_mail_compose() fails to generate correct output). 
(Ilia)
http://cvs.php.net/diff.php/php-src/ext/swf/swf.c?r1=1.46.2.2&r2=1.46.2.3&ty=u
Index: php-src/ext/swf/swf.c
diff -u php-src/ext/swf/swf.c:1.46.2.2 php-src/ext/swf/swf.c:1.46.2.3
--- php-src/ext/swf/swf.c:1.46.2.2  Fri Sep 12 00:53:39 2003
+++ php-src/ext/swf/swf.c   Thu Dec 23 13:04:10 2004
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: swf.c,v 1.46.2.2 2003/09/12 04:53:39 iliaa Exp $ */
+/* $Id: swf.c,v 1.46.2.3 2004/12/23 18:04:10 iliaa Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -239,12 +239,17 @@
}
na = tmpna;
 #endif
+   if (php_check_open_basedir(na TSRMLS_CC) || (PG(safe_mode) && 
!php_checkuid(na, "wb+", CHECKUID_CHECK_MODE_PARAM))) {
+   goto err;
+   }
+   
if (!SWFG(use_file))
SWFG(tmpfile_name) = na;
 
swf_openfile(na,(float)Z_DVAL_PP(sizeX), (float)Z_DVAL_PP(sizeY),
 (float)Z_DVAL_PP(frameRate), (float)Z_DVAL_PP(r), 
 (float)Z_DVAL_PP(g), (float)Z_DVAL_PP(b));
+err:
 #ifdef VIRTUAL_DIR
free(na);
 #endif

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard array.c

2004-12-23 Thread Antony Dovgal

tony2001Thu Dec 23 11:38:14 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   array.c 
  Log:
  MFH: destroy return_value and fix leak in array_fill()
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.266.2.10&r2=1.266.2.11&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.266.2.10 
php-src/ext/standard/array.c:1.266.2.11
--- php-src/ext/standard/array.c:1.266.2.10 Thu Dec 16 14:20:54 2004
+++ php-src/ext/standard/array.cThu Dec 23 11:38:13 2004
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.266.2.10 2004/12/16 19:20:54 tony2001 Exp $ */
+/* $Id: array.c,v 1.266.2.11 2004/12/23 16:38:13 tony2001 Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -1510,6 +1510,8 @@
convert_to_long_ex(num);
i = Z_LVAL_PP(num) - 1; 
if (i < 0) {
+   zend_hash_destroy(Z_ARRVAL_P(return_value));
+   efree(Z_ARRVAL_P(return_value));
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Number of elements 
must be positive");
RETURN_FALSE;
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard array.c

2004-12-23 Thread Antony Dovgal

tony2001Thu Dec 23 11:40:03 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/standard   array.c 
  Log:
  MFH: destroy return_value and fix leak in array_fill()
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.199.2.41&r2=1.199.2.42&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.199.2.41 
php-src/ext/standard/array.c:1.199.2.42
--- php-src/ext/standard/array.c:1.199.2.41 Thu Dec 16 14:23:59 2004
+++ php-src/ext/standard/array.cThu Dec 23 11:40:03 2004
@@ -22,7 +22,7 @@
 */
 
 
-/* $Id: array.c,v 1.199.2.41 2004/12/16 19:23:59 tony2001 Exp $ */
+/* $Id: array.c,v 1.199.2.42 2004/12/23 16:40:03 tony2001 Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -1414,6 +1414,8 @@
convert_to_long_ex(num);
i = Z_LVAL_PP(num) - 1; 
if (i < 0) {
+   zend_hash_destroy(Z_ARRVAL_P(return_value));
+   efree(Z_ARRVAL_P(return_value));
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Number of elements 
must be positive");
RETURN_FALSE;
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS

2004-12-23 Thread Antony Dovgal

tony2001Thu Dec 23 11:29:01 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
  Log:
  news entry
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.786&r2=1.1247.2.787&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.786 php-src/NEWS:1.1247.2.787
--- php-src/NEWS:1.1247.2.786   Wed Dec 22 20:47:37 2004
+++ php-src/NEWSThu Dec 23 11:29:00 2004
@@ -1,6 +1,7 @@
 PHP 4  NEWS
 |||
 ?? ??? , Version 4.3.11
+- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
 - Fixed bug #31174 (compile warning in url.c). (Ilia, lukem at NetBSD dot org)
 - Fixed bug #31159 (COM object access is not working). (Wez)
 - Fixed bug #31142 (imap_mail_compose() fails to generate correct output). 
(Ilia)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard array.c

2004-12-23 Thread Antony Dovgal

tony2001Thu Dec 23 11:35:48 2004 EDT

  Modified files:  
/php-src/ext/standard   array.c 
  Log:
  destroy return_value and fix leak in array_fill()
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.287&r2=1.288&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.287 php-src/ext/standard/array.c:1.288
--- php-src/ext/standard/array.c:1.287  Thu Dec 16 14:13:58 2004
+++ php-src/ext/standard/array.cThu Dec 23 11:35:48 2004
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.287 2004/12/16 19:13:58 tony2001 Exp $ */
+/* $Id: array.c,v 1.288 2004/12/23 16:35:48 tony2001 Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -1542,6 +1542,8 @@
convert_to_long_ex(num);
i = Z_LVAL_PP(num) - 1; 
if (i < 0) {
+   zend_hash_destroy(Z_ARRVAL_P(return_value));
+   efree(Z_ARRVAL_P(return_value));
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Number of elements 
must be positive");
RETURN_FALSE;
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/oci8 config.m4

2004-12-23 Thread Antony Dovgal

tony2001Thu Dec 23 11:20:09 2004 EDT

  Modified files:  
/php-src/ext/oci8   config.m4 
  Log:
  add Oracle Instant Client support (initial patch by cjbj at hotmail dot com)
  
  
http://cvs.php.net/diff.php/php-src/ext/oci8/config.m4?r1=1.51&r2=1.52&ty=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.51 php-src/ext/oci8/config.m4:1.52
--- php-src/ext/oci8/config.m4:1.51 Sun Sep 12 02:38:31 2004
+++ php-src/ext/oci8/config.m4  Thu Dec 23 11:20:09 2004
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.51 2004/09/12 06:38:31 tony2001 Exp $
+dnl $Id: config.m4,v 1.52 2004/12/23 16:20:09 tony2001 Exp $
 dnl
 
 AC_DEFUN(PHP_OCI_IF_DEFINED,[
@@ -28,11 +28,29 @@
   elif test -d "$OCI8_DIR/lib" -a -d "$OCI8_DIR/lib32"; then
 OCI8_LIB_DIR=$TMP_OCI8_LIB_DIR
   else
-AC_MSG_ERROR(Oracle-OCI8 libraries directory not found)
+AC_MSG_ERROR([Oracle (OCI8) required libraries not found])
   fi
   AC_MSG_RESULT($OCI8_LIB_DIR)
 ])
 
+AC_DEFUN(AC_OCI8IC_VERSION,[
+  AC_MSG_CHECKING([Oracle Instant Client version])
+  if test -f $PHP_OCI8_INSTANT_CLIENT/libociei.$SHLIB_SUFFIX_NAME; then
+if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
+  if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then
+AC_MSG_ERROR([Link from 
$PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to 
libclntsh.$SHLIB_SUFFIX_NAME.10.1 not found])
+  fi
+  OCI8_VERSION=10.1
+else
+  AC_MSG_ERROR([Oracle Instant Client library version not supported])
+fi
+  else
+AC_MSG_ERROR([Oracle Instant Client libraries not found])
+  fi
+  AC_MSG_RESULT([$OCI8_VERSION])
+])
+
+
 AC_DEFUN(AC_OCI8_VERSION,[
   AC_MSG_CHECKING([Oracle version])
   if test -s "$OCI8_DIR/orainst/unix.rgs"; then
@@ -58,11 +76,24 @@
   AC_MSG_RESULT($OCI8_VERSION)
 ])
 
-PHP_ARG_WITH(oci8, for Oracle-OCI8 support,
-[  --with-oci8[=DIR]   Include Oracle-oci8 support. Default DIR is 
ORACLE_HOME.])
+PHP_ARG_WITH(oci8, for Oracle (OCI8) support using ORACLE_HOME installation,
+[  --with-oci8[=DIR]   Include Oracle (OCI8) support using an ORACLE_HOME
+  install. The default DIR is ORACLE_HOME])
+
+PHP_ARG_WITH(oci8-instant-client, for Oracle (OCI8) support using Oracle 
Instant Client,
+[  --with-oci8-instant-client[=DIR]
+  Include Oracle (OCI8) support using
+  Oracle Instant Client. DIR is the directory with the
+  Instant Client libraries. On Linux it will default to
+  /usr/lib/oracle//client/lib
+  Other platforms will need to have it explicitly 
specified.])
 
 if test "$PHP_OCI8" != "no"; then
-  AC_MSG_CHECKING([Oracle Install-Dir])
+  if test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then
+AC_MSG_ERROR([--with-oci8 and --with-oci8-instant-client are mutually 
exclusive])
+  fi
+
+  AC_MSG_CHECKING([Oracle Install Directory])
   if test "$PHP_OCI8" = "yes"; then
 OCI8_DIR=$ORACLE_HOME
   else
@@ -140,9 +171,11 @@
   PHP_ADD_LIBPATH($OCI8_DIR/$OCI8_LIB_DIR, OCI8_SHARED_LIBADD)
   AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])
   AC_DEFINE(HAVE_OCI_9_2,1,[ ])
+  AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
+  AC_DEFINE(PHP_OCI8_HAVE_COLLECTIONS,1,[ ])
   ;;
 *)
-  AC_MSG_ERROR(Unsupported Oracle version!)
+  AC_MSG_ERROR([Unsupported Oracle version!])
   ;;
   esac
 
@@ -174,7 +207,6 @@
 -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
   ])
 
-
   PHP_NEW_EXTENSION(oci8, oci8.c, $ext_shared)
   AC_DEFINE(HAVE_OCI8,1,[ ])
 
@@ -182,4 +214,70 @@
   PHP_SUBST_OLD(OCI8_DIR)
   PHP_SUBST_OLD(OCI8_VERSION)
   
+elif test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then
+
+  AC_MSG_CHECKING([Oracle Instant Client directory])
+  if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
+dnl Generally the Instant Client can be anywhere so the user must pass in the
+dnl directory to the libraries.  But on Linux we default to the most recent
+dnl version in /usr/lib
+PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client/lib  2> /dev/null 
| tail -1`
+if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
+  AC_MSG_ERROR([Oracle Instant Client directory not found. Try 
--with-oci8-instant-client=DIR])
+fi
+  fi
+  AC_MSG_RESULT($PHP_OCI8_INSTANT_CLIENT)
+
+  OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
+
+  AC_MSG_CHECKING([Oracle Instant Client SDK header directory])
+
+dnl Header directory for Instant Client SDK RPM install
+  OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | sed -e 
's!^/usr/lib/oracle/\(.*\)/client/lib[[/]]*$!/usr/include/oracle/\1/client!'`
+
+dnl Header directory for Instant Client SDK zip file install
+  OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include
+
+  if test -f "$OCISDKRPMINC/oci.h"; then
+AC_MSG_RESULT($OCISDKRPMINC)
+PHP_ADD_INCLUDE($OCISDKRPMINC)
+OCI8INCDIR=$OCISDKRPMINC
+  elif test -f "$OCISDKZIPINC/oci.h"; then
+AC_MSG_RESULT($OCISDKZI

[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS

2004-12-23 Thread Antony Dovgal

tony2001Thu Dec 23 11:26:05 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS 
  Log:
  news entry
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.170&r2=1.1760.2.171&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.170 php-src/NEWS:1.1760.2.171
--- php-src/NEWS:1.1760.2.170   Wed Dec 22 12:28:28 2004
+++ php-src/NEWSThu Dec 23 11:26:04 2004
@@ -1,6 +1,7 @@
 PHPNEWS
 |||
 ?? ??? 2005, PHP 5.0.4
+- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
 - Fixed a bug in mysql_stmt_execute (type conversion with NULL values). (Georg)
 - Fixed bug #31142 (imap_mail_compose() fails to generate correct output). 
(Ilia)
 - Fixed bug #31139 (XML Parser Functions seem to drop & when parsing). 
(Rob)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/oci8 config.m4

2004-12-23 Thread Antony Dovgal

tony2001Thu Dec 23 11:23:22 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/oci8   config.m4 
  Log:
  MFH: add Oracle Instant Client support (patch by cjbj at hotmail dot com)
  
  
http://cvs.php.net/diff.php/php-src/ext/oci8/config.m4?r1=1.37.2.9&r2=1.37.2.10&ty=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.37.2.9 php-src/ext/oci8/config.m4:1.37.2.10
--- php-src/ext/oci8/config.m4:1.37.2.9 Tue Feb  3 09:22:34 2004
+++ php-src/ext/oci8/config.m4  Thu Dec 23 11:23:22 2004
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.37.2.9 2004/02/03 14:22:34 tony2001 Exp $
+dnl $Id: config.m4,v 1.37.2.10 2004/12/23 16:23:22 tony2001 Exp $
 dnl
 
 AC_DEFUN(PHP_OCI_IF_DEFINED,[
@@ -38,16 +38,47 @@
   OCI8_VERSION=8.1
 fi
   else
-AC_MSG_ERROR(Oracle-OCI8 needed libraries not found)
+AC_MSG_ERROR([Oracle (OCI8) required libraries not found])
   fi
   AC_MSG_RESULT($OCI8_VERSION)
 ]) 

   
 
-PHP_ARG_WITH(oci8, for Oracle-OCI8 support,
-[  --with-oci8[=DIR]   Include Oracle-oci8 support. Default DIR is 
ORACLE_HOME.])
+AC_DEFUN(AC_OCI8IC_VERSION,[
+  AC_MSG_CHECKING([Oracle Instant Client version])
+  if test -f $PHP_OCI8_INSTANT_CLIENT/libociei.$SHLIB_SUFFIX_NAME; then
+if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
+  if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then
+AC_MSG_ERROR([Link from 
$PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to 
libclntsh.$SHLIB_SUFFIX_NAME.10.1 not found])
+  fi
+  OCI8_VERSION=10.1
+else
+  AC_MSG_ERROR([Oracle Instant Client library version not supported])
+fi
+  else
+AC_MSG_ERROR([Oracle Instant Client libraries not found])
+  fi
+  AC_MSG_RESULT([$OCI8_VERSION])
+])
+
+PHP_ARG_WITH(oci8, for Oracle (OCI8) support using ORACLE_HOME installation,
+[  --with-oci8[=DIR]   Include Oracle (OCI8) support using an ORACLE_HOME
+  install. The default DIR is ORACLE_HOME])
+
+PHP_ARG_WITH(oci8-instant-client, for Oracle (OCI8) support using Oracle 
Instant Client,
+[  --with-oci8-instant-client[=DIR]
+  Include Oracle (OCI8) support using
+  Oracle Instant Client. DIR is the directory with the
+  Instant Client libraries. On Linux it will default to
+  /usr/lib/oracle//client/lib
+  Other platforms will need to have it explicitly 
specified.])
 
 if test "$PHP_OCI8" != "no"; then
-  AC_MSG_CHECKING([Oracle Install-Dir])
+
+  if test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then
+AC_MSG_ERROR([--with-oci8 and --with-oci8-instant-client are mutually 
exclusive])
+  fi
+
+  AC_MSG_CHECKING([Oracle Install Directory])
   if test "$PHP_OCI8" = "yes"; then
 OCI8_DIR=$ORACLE_HOME
   else
@@ -116,14 +147,18 @@
 -L$OCI8_DIR/lib $OCI8_SHARED_LIBADD
   ])
   ;;
+
 10.1)
   PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
   PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
   AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])
   AC_DEFINE(HAVE_OCI_9_2,1,[ ])
+  AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
+  AC_DEFINE(PHP_OCI8_HAVE_COLLECTIONS,1,[ ])
   ;;
+
 *)
-  AC_MSG_ERROR(Unsupported Oracle version!)
+  AC_MSG_ERROR([Unsupported Oracle version])
   ;;
   esac
 
@@ -145,10 +180,88 @@
 -L$OCI8_DIR/lib $OCI8_SHARED_LIBADD
   ])
 
+  dnl
+  dnl Check if we have collections
+  dnl
+  PHP_CHECK_LIBRARY(clntsh, OCICollAssign,
+  [
+AC_DEFINE(PHP_OCI8_HAVE_COLLECTIONS,1,[ ])
+  ], [], [
+-L$OCI8_DIR/lib $OCI8_SHARED_LIBADD
+  ])
+
+
   PHP_NEW_EXTENSION(oci8, oci8.c, $ext_shared)
   AC_DEFINE(HAVE_OCI8,1,[ ])
 
   PHP_SUBST_OLD(OCI8_SHARED_LIBADD)
   PHP_SUBST_OLD(OCI8_DIR)
   PHP_SUBST_OLD(OCI8_VERSION)
+
+elif test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then
+
+  AC_MSG_CHECKING([Oracle Instant Client directory])
+  if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
+dnl Generally the Instant Client can be anywhere so the user must pass in the
+dnl directory to the libraries.  But on Linux we default to the most recent
+dnl version in /usr/lib
+PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client/lib  2> /dev/null 
| tail -1`
+if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
+  AC_MSG_ERROR([Oracle Instant Client directory not found. Try 
--with-oci8-instant-client=DIR])
+fi
+  fi
+  AC_MSG_RESULT($PHP_OCI8_INSTANT_CLIENT)
+
+  OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
+
+  AC_MSG_CHECKING([Oracle Instant Client SDK header directory])
+
+dnl Header directory for Instant Client SDK RPM install
+  OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | sed -e 
's!^/usr/lib/oracle/\(.*\)/client/lib[[/]]*$!/usr/include/oracle/\1/client!'`
+
+dnl Header directory for Insta

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/oci8 config.m4

2004-12-23 Thread Antony Dovgal

tony2001Thu Dec 23 11:21:59 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/oci8   config.m4 
  Log:
  MFH: add Oracle Instant Client support (initial patch by cjbj at hotmail dot 
com)
  
  
http://cvs.php.net/diff.php/php-src/ext/oci8/config.m4?r1=1.50&r2=1.50.2.1&ty=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.50 php-src/ext/oci8/config.m4:1.50.2.1
--- php-src/ext/oci8/config.m4:1.50 Tue Feb  3 09:21:09 2004
+++ php-src/ext/oci8/config.m4  Thu Dec 23 11:21:58 2004
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.50 2004/02/03 14:21:09 tony2001 Exp $
+dnl $Id: config.m4,v 1.50.2.1 2004/12/23 16:21:58 tony2001 Exp $
 dnl
 
 AC_DEFUN(PHP_OCI_IF_DEFINED,[
@@ -38,16 +38,47 @@
   OCI8_VERSION=8.1
 fi
   else
-AC_MSG_ERROR(Oracle-OCI8 needed libraries not found)
+AC_MSG_ERROR([Oracle (OCI8) required libraries not found])
   fi
   AC_MSG_RESULT($OCI8_VERSION)
 ]) 

   
 
-PHP_ARG_WITH(oci8, for Oracle-OCI8 support,
-[  --with-oci8[=DIR]   Include Oracle-oci8 support. Default DIR is 
ORACLE_HOME.])
+AC_DEFUN(AC_OCI8IC_VERSION,[
+  AC_MSG_CHECKING([Oracle Instant Client version])
+  if test -f $PHP_OCI8_INSTANT_CLIENT/libociei.$SHLIB_SUFFIX_NAME; then
+if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
+  if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then
+AC_MSG_ERROR([Link from 
$PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to 
libclntsh.$SHLIB_SUFFIX_NAME.10.1 not found])
+  fi
+  OCI8_VERSION=10.1
+else
+  AC_MSG_ERROR([Oracle Instant Client library version not supported])
+fi
+  else
+AC_MSG_ERROR([Oracle Instant Client libraries not found])
+  fi
+  AC_MSG_RESULT([$OCI8_VERSION])
+])
+
+PHP_ARG_WITH(oci8, for Oracle (OCI8) support using ORACLE_HOME installation,
+[  --with-oci8[=DIR]   Include Oracle (OCI8) support using an ORACLE_HOME
+  install. The default DIR is ORACLE_HOME])
+
+PHP_ARG_WITH(oci8-instant-client, for Oracle (OCI8) support using Oracle 
Instant Client,
+[  --with-oci8-instant-client[=DIR]
+  Include Oracle (OCI8) support using
+  Oracle Instant Client. DIR is the directory with the
+  Instant Client libraries. On Linux it will default to
+  /usr/lib/oracle//client/lib
+  Other platforms will need to have it explicitly 
specified.])
 
 if test "$PHP_OCI8" != "no"; then
-  AC_MSG_CHECKING([Oracle Install-Dir])
+
+  if test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then
+AC_MSG_ERROR([--with-oci8 and --with-oci8-instant-client are mutually 
exclusive])
+  fi
+
+  AC_MSG_CHECKING([Oracle Install Directory])
   if test "$PHP_OCI8" = "yes"; then
 OCI8_DIR=$ORACLE_HOME
   else
@@ -116,15 +147,18 @@
 -L$OCI8_DIR/lib $OCI8_SHARED_LIBADD
   ])
   ;;
-  
+
 10.1)
   PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
   PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
   AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])
   AC_DEFINE(HAVE_OCI_9_2,1,[ ])
+  AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
+  AC_DEFINE(PHP_OCI8_HAVE_COLLECTIONS,1,[ ])
   ;;
+
 *)
-  AC_MSG_ERROR(Unsupported Oracle version!)
+  AC_MSG_ERROR([Unsupported Oracle version])
   ;;
   esac
 
@@ -163,5 +197,71 @@
   PHP_SUBST_OLD(OCI8_SHARED_LIBADD)
   PHP_SUBST_OLD(OCI8_DIR)
   PHP_SUBST_OLD(OCI8_VERSION)
-  
+
+elif test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then
+
+  AC_MSG_CHECKING([Oracle Instant Client directory])
+  if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
+dnl Generally the Instant Client can be anywhere so the user must pass in the
+dnl directory to the libraries.  But on Linux we default to the most recent
+dnl version in /usr/lib
+PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client/lib  2> /dev/null 
| tail -1`
+if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
+  AC_MSG_ERROR([Oracle Instant Client directory not found. Try 
--with-oci8-instant-client=DIR])
+fi
+  fi
+  AC_MSG_RESULT($PHP_OCI8_INSTANT_CLIENT)
+
+  OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
+
+  AC_MSG_CHECKING([Oracle Instant Client SDK header directory])
+
+dnl Header directory for Instant Client SDK RPM install
+  OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | sed -e 
's!^/usr/lib/oracle/\(.*\)/client/lib[[/]]*$!/usr/include/oracle/\1/client!'`
+
+dnl Header directory for Instant Client SDK zip file install
+  OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include
+
+  if test -f "$OCISDKRPMINC/oci.h"; then
+AC_MSG_RESULT($OCISDKRPMINC)
+PHP_ADD_INCLUDE($OCISDKRPMINC)
+OCI8INCDIR=$OCISDKRPMINC
+  elif test -f "$OCISDKZIPINC/oci.h"; then
+AC_MSG_RESULT($OCISDKZIPINC)
+PHP_ADD_INCLUDE($OCISDK

Re: [PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard streamsfuncs.c

2004-12-23 Thread Wez Furlong

Doh... will fix it when I get into work...
Marcus Boerger wrote:
   if (peername) {
   zval_dtor(peername);
-   ZVAL_STRING(peername, NULL, 0);
+   ZVAL_STRING(peername, "", 0);
How can that be ", 0" ?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard streamsfuncs.c

2004-12-23 Thread Marcus Boerger

Hello Wez,

Thursday, December 23, 2004, 7:02:54 AM, you wrote:

> wez Thu Dec 23 01:02:54 2004 EDT

>   Modified files:  (Branch: PHP_5_0)
> /php-src/ext/standard   streamsfuncs.c 
>   Log:
>   MFH: don't crash
  
  
> http://cvs.php.net/diff.php/php-src/ext/standard/streamsfuncs.c?r1=1.35.2.5&r2=1.35.2.6&ty=u
> Index: php-src/ext/standard/streamsfuncs.c
> diff -u php-src/ext/standard/streamsfuncs.c:1.35.2.5
> php-src/ext/standard/streamsfuncs.c:1.35.2.6
> --- php-src/ext/standard/streamsfuncs.c:1.35.2.5Mon Oct 11 14:32:59 
> 2004
> +++ php-src/ext/standard/streamsfuncs.c Thu Dec 23 01:02:54 2004
> @@ -17,7 +17,7 @@
>   
> +--+
>  */
 
> -/* $Id: streamsfuncs.c,v 1.35.2.5 2004/10/11 18:32:59 iliaa Exp $ */
> +/* $Id: streamsfuncs.c,v 1.35.2.6 2004/12/23 06:02:54 wez Exp $ */
 
>  #include "php.h"
>  #include "php_globals.h"
> @@ -217,7 +217,7 @@
 
> if (peername) {
> zval_dtor(peername);
> -   ZVAL_STRING(peername, NULL, 0);
> +   ZVAL_STRING(peername, "", 0);

How can that be ", 0" ?
> }
 
> if (0 == php_stream_xport_accept(stream, &clistream,




-- 
Best regards,
 Marcusmailto:[EMAIL PROTECTED]

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard streamsfuncs.c

[PHP-CVS] cvs: php-src /ext/standard streamsfuncs.c

[PHP-CVS] cvs: php-src /ext/fbsql php_fbsql.c

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/fbsql php_fbsql.c

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/fbsql php_fbsql.c

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/swf swf.c

[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/swf swf.c

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard array.c

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard array.c

[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS

[PHP-CVS] cvs: php-src /ext/standard array.c

[PHP-CVS] cvs: php-src /ext/oci8 config.m4

[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/oci8 config.m4

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/oci8 config.m4

Re: [PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard streamsfuncs.c

Re: [PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard streamsfuncs.c

17 matches

Site Navigation

Mail list logo

Footer information