from:"Dan Kalowsky"

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2004-08-13 Thread Dan Kalowsky

kalowskyFri Aug 13 15:33:25 2004 EDT

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  Checking in a patch by Dave Lawson ([EMAIL PROTECTED]) to correct 
  some of the behavior found in the odbc_fetch_*() functions.  This patch 
  NEEDS to be tested on MS Access before a release is done with it.  This 
  submission is to get it into the daily builds for testing.  
  
  
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.180r2=1.181ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.180 php-src/ext/odbc/php_odbc.c:1.181
--- php-src/ext/odbc/php_odbc.c:1.180   Mon Jul 19 03:19:41 2004
+++ php-src/ext/odbc/php_odbc.c Fri Aug 13 15:33:24 2004
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.180 2004/07/19 07:19:41 andi Exp $ */
+/* $Id: php_odbc.c,v 1.181 2004/08/13 19:33:24 kalowsky Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -846,7 +846,7 @@
convert_to_string_ex(pv_query);
query = Z_STRVAL_PP(pv_query);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

result-numparams = 0;

@@ -1269,7 +1269,7 @@
convert_to_string_ex(pv_query);
query = Z_STRVAL_PP(pv_query);

-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
 
rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -2797,7 +2797,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -2881,7 +2881,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -2961,7 +2961,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -3038,7 +3038,7 @@
fschema = Z_STRVAL_PP(pv_fschema);
convert_to_string_ex(pv_ftable);
ftable = Z_STRVAL_PP(pv_ftable);
-#if defined(HAVE_DBMAKER) || defined (HAVE_IBMDB2)
+#if defined(HAVE_DBMAKER) || defined(HAVE_IBMDB2)
 #define EMPTY_TO_NULL(xstr) \
if ((int)strlen((xstr)) == 0) (xstr) = NULL
 
@@ -3055,7 +3055,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -3130,7 +3130,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -3198,7 +3198,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -3276,7 +3276,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -3354,7 +3354,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -3436,7 +3436,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2004-07-15 Thread Dan Kalowsky

kalowskyThu Jul 15 11:09:12 2004 EDT

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  Bug 29058 (patch submitted by bug reporter)
  
  
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.178r2=1.179ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.178 php-src/ext/odbc/php_odbc.c:1.179
--- php-src/ext/odbc/php_odbc.c:1.178   Thu Jun 17 20:44:35 2004
+++ php-src/ext/odbc/php_odbc.c Thu Jul 15 11:09:12 2004
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.178 2004/06/18 00:44:35 iliaa Exp $ */
+/* $Id: php_odbc.c,v 1.179 2004/07/15 15:09:12 kalowsky Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -3038,7 +3038,7 @@
fschema = Z_STRVAL_PP(pv_fschema);
convert_to_string_ex(pv_ftable);
ftable = Z_STRVAL_PP(pv_ftable);
-#ifdef HAVE_DBMAKER
+#if defined(HAVE_DBMAKER) || defined (HAVE_IBMDB2)
 #define EMPTY_TO_NULL(xstr) \
if ((int)strlen((xstr)) == 0) (xstr) = NULL
 

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

[PHP-CVS] cvs: php-src / NEWS

2003-10-29 Thread Dan Kalowsky

kalowskyWed Oct 29 16:32:29 2003 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  Added in NEWS entries for the Panther updates
  
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1482 php-src/NEWS:1.1483
--- php-src/NEWS:1.1482 Tue Oct 28 14:04:38 2003
+++ php-src/NEWSWed Oct 29 16:32:28 2003
@@ -170,3 +170,5 @@
 - Fixed bug #21985 and #22064 (various mb_send_mail() issues). (Moriyoshi)
 - Fixed bug #21600 (Assign by reference function call changes variable 
   contents). (Zeev)
+- Fixed bug #25955 (Mac OS X Panther compile error). (kalowsky, markonen)
+- Added IPv6 support for Panther. (kalowsky, markonen)

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

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

2003-07-11 Thread Dan Kalowsky

kalowskyFri Jul 11 09:08:44 2003 EDT

  Modified files:  
/php-src/ext/pdfconfig.m4 
  Log:
  Patch for bug #24183
  
  
Index: php-src/ext/pdf/config.m4
diff -u php-src/ext/pdf/config.m4:1.36 php-src/ext/pdf/config.m4:1.37
--- php-src/ext/pdf/config.m4:1.36  Wed Nov 13 19:21:13 2002
+++ php-src/ext/pdf/config.m4   Fri Jul 11 09:08:44 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.36 2002/11/14 00:21:13 sniper Exp $
+dnl $Id: config.m4,v 1.37 2003/07/11 13:08:44 kalowsky Exp $
 dnl
 
 PHP_ARG_WITH(pdflib,for PDFlib support,
@@ -93,6 +93,12 @@
 
   case $PHP_PDFLIB in
 yes)
+ case $host_alias in
+   *darwin*)
+ PHP_ADD_FRAMEWORK(CoreServices)
+ PHP_ADD_FRAMEWORK(ApplicationServices)
+ ;;
+ esac
   AC_CHECK_LIB(pdf, PDF_show_boxed, [
 AC_DEFINE(HAVE_PDFLIB,1,[ ])
 PHP_ADD_LIBRARY(pdf,, PDF_SHARED_LIBADD)



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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2003-07-11 Thread Dan Kalowsky

kalowskyFri Jul 11 09:13:32 2003 EDT

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  Fix for bug #22897
  
  
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.166 php-src/ext/odbc/php_odbc.c:1.167
--- php-src/ext/odbc/php_odbc.c:1.166   Mon Jun 16 12:36:41 2003
+++ php-src/ext/odbc/php_odbc.c Fri Jul 11 09:13:32 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.166 2003/06/16 16:36:41 andrey Exp $ */
+/* $Id: php_odbc.c,v 1.167 2003/07/11 13:13:32 kalowsky Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2065,7 +2065,7 @@
 #endif
 #ifdef HAVE_OPENLINK
{
-   char dsnbuf[300];
+   char dsnbuf[1024];
short dsnbuflen;
 
rc = SQLDriverConnect((*conn)-hdbc, NULL, db, SQL_NTS,
@@ -2107,8 +2107,8 @@
}
 
if (direct) {
-   rc = SQLDriverConnect((*conn)-hdbc, NULL, ldb, strlen(ldb), 
dsnbuf, sizeof(dsnbuf),
-   dsnbuflen, 
SQL_DRIVER_NOPROMPT);
+   rc = SQLDriverConnect((*conn)-hdbc, NULL, ldb, strlen(ldb), 
dsnbuf, 
+ sizeof(dsnbuf) - 1, dsnbuflen, 
SQL_DRIVER_NOPROMPT);
} else {
rc = SQLConnect((*conn)-hdbc, db, SQL_NTS, uid, SQL_NTS, pwd, 
SQL_NTS);
}



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/odbc php_odbc.c

2003-05-29 Thread Dan Kalowsky

kalowskyThu May 29 08:34:38 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/odbc  php_odbc.c 
  Log:
  ODBC standards compliance is a good thing.  
  # Should be MFB'd, but my PHP5 is drastically different right now..
  
  
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.143.2.9 php4/ext/odbc/php_odbc.c:1.143.2.10
--- php4/ext/odbc/php_odbc.c:1.143.2.9  Thu May  1 20:40:35 2003
+++ php4/ext/odbc/php_odbc.cThu May 29 08:34:38 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.143.2.9 2003/05/02 00:40:35 sniper Exp $ */
+/* $Id: php_odbc.c,v 1.143.2.10 2003/05/29 12:34:38 kalowsky Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2113,7 +2113,7 @@
  * #ifdef HAVE_EMPRESS */
{
int direct = 0;
-   chardsnbuf[300];
+   chardsnbuf[1024];
short   dsnbuflen;
char*ldb = 0;
int ldb_len = 0;
@@ -2131,7 +2131,7 @@
}
 
if (direct)
-   rc = SQLDriverConnect((*conn)-hdbc, NULL, ldb, strlen(ldb), 
dsnbuf, 300,
+   rc = SQLDriverConnect((*conn)-hdbc, NULL, ldb, strlen(ldb), 
dsnbuf, sizeof(dsnbuf),
dsnbuflen, 
SQL_DRIVER_NOPROMPT);
else
rc = SQLConnect((*conn)-hdbc, db, SQL_NTS, uid, SQL_NTS, pwd, 
SQL_NTS);



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/odbc php_odbc.c

2003-02-06 Thread Dan Kalowsky

kalowskyThu Feb  6 21:58:31 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/odbc  php_odbc.c 
  Log:
  Patch for Bug #21279 submitted by [EMAIL PROTECTED]
  
  
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.143.2.3 php4/ext/odbc/php_odbc.c:1.143.2.4
--- php4/ext/odbc/php_odbc.c:1.143.2.3  Fri Jan 24 17:49:22 2003
+++ php4/ext/odbc/php_odbc.cThu Feb  6 21:58:31 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.143.2.3 2003/01/24 22:49:22 kalowsky Exp $ */
+/* $Id: php_odbc.c,v 1.143.2.4 2003/02/07 02:58:31 kalowsky Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1455,7 +1455,7 @@
if (rc == SQL_SUCCESS_WITH_INFO) {
Z_STRLEN_P(tmp) = result-longreadlen;
} else if (result-values[i].vallen == SQL_NULL_DATA) {
-   Z_STRVAL_P(tmp) = empty_string;
+   ZVAL_NULL(tmp);
break;
} else {
Z_STRLEN_P(tmp) = result-values[i].vallen;
@@ -1465,7 +1465,7 @@
 
default:
if (result-values[i].vallen == SQL_NULL_DATA) {
-   Z_STRVAL_P(tmp) = empty_string;
+   ZVAL_NULL(tmp);
break;
}
Z_STRLEN_P(tmp) = result-values[i].vallen;



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

[PHP-CVS] cvs: php4 /ext/odbc php_odbc.c

2003-02-06 Thread Dan Kalowsky

kalowskyThu Feb  6 21:59:16 2003 EDT

  Modified files:  
/php4/ext/odbc  php_odbc.c 
  Log:
  MFB
  
  
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.153 php4/ext/odbc/php_odbc.c:1.154
--- php4/ext/odbc/php_odbc.c:1.153  Fri Jan 24 17:40:38 2003
+++ php4/ext/odbc/php_odbc.cThu Feb  6 21:59:16 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.153 2003/01/24 22:40:38 kalowsky Exp $ */
+/* $Id: php_odbc.c,v 1.154 2003/02/07 02:59:16 kalowsky Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1589,7 +1589,7 @@
if (rc == SQL_SUCCESS_WITH_INFO) {
Z_STRLEN_P(tmp) = result-longreadlen;
} else if (result-values[i].vallen == SQL_NULL_DATA) {
-   Z_STRVAL_P(tmp) = IS_NULL;
+   ZVAL_NULL(tmp);
break;
} else {
Z_STRLEN_P(tmp) = result-values[i].vallen;
@@ -1599,7 +1599,7 @@
 
default:
if (result-values[i].vallen == SQL_NULL_DATA) {
-   Z_STRVAL_P(tmp) = IS_NULL;
+   ZVAL_NULL(tmp);
break;
}
Z_STRLEN_P(tmp) = result-values[i].vallen;



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/odbc php_odbc.c

2003-01-24 Thread Dan Kalowsky

kalowskyFri Jan 24 17:43:43 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/odbc  php_odbc.c 
  Log:
  Patch for bug #21844
  
  
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.143.2.1 php4/ext/odbc/php_odbc.c:1.143.2.2
--- php4/ext/odbc/php_odbc.c:1.143.2.1  Tue Dec 31 11:35:04 2002
+++ php4/ext/odbc/php_odbc.cFri Jan 24 17:43:42 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.143.2.1 2002/12/31 16:35:04 sebastian Exp $ */
+/* $Id: php_odbc.c,v 1.143.2.2 2003/01/24 22:43:42 kalowsky Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2921,6 +2921,11 @@
efree(result);
RETURN_FALSE;
}
+
+   /* 
+* Needed to make MS Access happy
+*/
+   if (table  strlen(table)  schema  !strlen(schema)) schema = NULL;
 
rc = SQLColumns(result-stmt, 
cat, cat_len,



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/odbc php_odbc.c

2003-01-24 Thread Dan Kalowsky

kalowskyFri Jan 24 17:49:22 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/odbc  php_odbc.c 
  Log:
  busted by the style police...
  
  
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.143.2.2 php4/ext/odbc/php_odbc.c:1.143.2.3
--- php4/ext/odbc/php_odbc.c:1.143.2.2  Fri Jan 24 17:43:42 2003
+++ php4/ext/odbc/php_odbc.cFri Jan 24 17:49:22 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.143.2.2 2003/01/24 22:43:42 kalowsky Exp $ */
+/* $Id: php_odbc.c,v 1.143.2.3 2003/01/24 22:49:22 kalowsky Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2925,7 +2925,9 @@
/* 
 * Needed to make MS Access happy
 */
-   if (table  strlen(table)  schema  !strlen(schema)) schema = NULL;
+   if (table  strlen(table)  schema  !strlen(schema)) {
+   schema = NULL;
+   }
 
rc = SQLColumns(result-stmt, 
cat, cat_len,



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

[PHP-CVS] cvs: php4 /ext/odbc php_odbc.c php_odbc.h

2003-01-16 Thread Dan Kalowsky

kalowskyThu Jan 16 11:27:31 2003 EDT

  Modified files:  
/php4/ext/odbc  php_odbc.c php_odbc.h 
  Log:
  Adding in test ability for WIndows to fetch_objects
  
  
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.149 php4/ext/odbc/php_odbc.c:1.150
--- php4/ext/odbc/php_odbc.c:1.149  Tue Jan  7 19:38:36 2003
+++ php4/ext/odbc/php_odbc.cThu Jan 16 11:27:30 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.149 2003/01/08 00:38:36 iliaa Exp $ */
+/* $Id: php_odbc.c,v 1.150 2003/01/16 16:27:30 kalowsky Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -84,7 +84,7 @@
PHP_FE(odbc_error, NULL)
PHP_FE(odbc_errormsg, NULL)
PHP_FE(odbc_exec, NULL)
-#ifdef HAVE_DBMAKER
+#if defined(HAVE_DBMAKER) || defined(PHP_WIN32)
PHP_FE(odbc_fetch_array, NULL)
PHP_FE(odbc_fetch_object, NULL)
 #endif
@@ -1346,7 +1346,7 @@
 }
 /* }}} */
 
-#ifdef HAVE_DBMAKER
+#if defined(HAVE_DBMAKER) || defined(PHP_WIN32)
 #define ODBC_NUM  1
 #define ODBC_OBJECT  2
 
Index: php4/ext/odbc/php_odbc.h
diff -u php4/ext/odbc/php_odbc.h:1.49 php4/ext/odbc/php_odbc.h:1.50
--- php4/ext/odbc/php_odbc.h:1.49   Tue Dec 31 11:07:09 2002
+++ php4/ext/odbc/php_odbc.hThu Jan 16 11:27:31 2003
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: php_odbc.h,v 1.49 2002/12/31 16:07:09 sebastian Exp $ */
+/* $Id: php_odbc.h,v 1.50 2003/01/16 16:27:31 kalowsky Exp $ */
 
 #ifndef PHP_ODBC_H
 #define PHP_ODBC_H
@@ -54,7 +54,7 @@
 PHP_FUNCTION(odbc_do);
 PHP_FUNCTION(odbc_exec);
 PHP_FUNCTION(odbc_execute);
-#ifdef HAVE_DBMAKER
+#if defined(HAVE_DBMAKER) || deifned(PHP_WIN32)
 PHP_FUNCTION(odbc_fetch_array);
 PHP_FUNCTION(odbc_fetch_object);
 #endif



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

[PHP-CVS] cvs: php4 /ext/odbc php_odbc.h

2003-01-16 Thread Dan Kalowsky

kalowskyThu Jan 16 11:42:25 2003 EDT

  Modified files:  
/php4/ext/odbc  php_odbc.h 
  Log:
  typo corrected
  
  
Index: php4/ext/odbc/php_odbc.h
diff -u php4/ext/odbc/php_odbc.h:1.50 php4/ext/odbc/php_odbc.h:1.51
--- php4/ext/odbc/php_odbc.h:1.50   Thu Jan 16 11:27:31 2003
+++ php4/ext/odbc/php_odbc.hThu Jan 16 11:42:25 2003
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: php_odbc.h,v 1.50 2003/01/16 16:27:31 kalowsky Exp $ */
+/* $Id: php_odbc.h,v 1.51 2003/01/16 16:42:25 kalowsky Exp $ */
 
 #ifndef PHP_ODBC_H
 #define PHP_ODBC_H
@@ -54,7 +54,7 @@
 PHP_FUNCTION(odbc_do);
 PHP_FUNCTION(odbc_exec);
 PHP_FUNCTION(odbc_execute);
-#if defined(HAVE_DBMAKER) || deifned(PHP_WIN32)
+#if defined(HAVE_DBMAKER) || defined(PHP_WIN32)
 PHP_FUNCTION(odbc_fetch_array);
 PHP_FUNCTION(odbc_fetch_object);
 #endif



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

[PHP-CVS] cvs: php4 /ext/odbc php_odbc.c

2003-01-07 Thread Dan Kalowsky

kalowskyTue Jan  7 18:00:13 2003 EDT

  Modified files:  
/php4/ext/odbc  php_odbc.c 
  Log:
  Version tag for future move to PECL
  
  
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.147 php4/ext/odbc/php_odbc.c:1.148
--- php4/ext/odbc/php_odbc.c:1.147  Tue Jan  7 17:56:58 2003
+++ php4/ext/odbc/php_odbc.cTue Jan  7 18:00:11 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.147 2003/01/07 22:56:58 kalowsky Exp $ */
+/* $Id: php_odbc.c,v 1.148 2003/01/07 23:00:11 kalowsky Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -141,7 +141,7 @@
PHP_RINIT(odbc), 
PHP_RSHUTDOWN(odbc), 
PHP_MINFO(odbc), 
-   NO_VERSION_YET,
+   1.0,
STANDARD_MODULE_PROPERTIES
 };
 /* }}} */



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

[PHP-CVS] cvs: php4 /ext/odbc config.m4 php_odbc.c

2003-01-07 Thread Dan Kalowsky

kalowskyTue Jan  7 17:56:58 2003 EDT

  Modified files:  
/php4/ext/odbc  config.m4 php_odbc.c 
  Log:
  Reverting last change as it really doesn't fix longreadlen problems in all
  cases.
  
  
Index: php4/ext/odbc/config.m4
diff -u php4/ext/odbc/config.m4:1.55 php4/ext/odbc/config.m4:1.56
--- php4/ext/odbc/config.m4:1.55Tue Nov 12 12:31:39 2002
+++ php4/ext/odbc/config.m4 Tue Jan  7 17:56:58 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.55 2002/11/12 17:31:39 sniper Exp $
+dnl $Id: config.m4,v 1.56 2003/01/07 22:56:58 kalowsky Exp $
 dnl
 
 dnl
@@ -373,6 +373,7 @@
 ODBC_LFLAGS=-L$withval/lib
 ODBC_LIBS=-liodbc
 AC_DEFINE(HAVE_IODBC,1,[ ])
+AC_DEFINE(HAVE_ODBC2,1,[ ])
 AC_MSG_RESULT(yes)
   else
 AC_MSG_RESULT(no)
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.146 php4/ext/odbc/php_odbc.c:1.147
--- php4/ext/odbc/php_odbc.c:1.146  Mon Jan  6 13:23:55 2003
+++ php4/ext/odbc/php_odbc.cTue Jan  7 17:56:58 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.146 2003/01/06 18:23:55 kalowsky Exp $ */
+/* $Id: php_odbc.c,v 1.147 2003/01/07 22:56:58 kalowsky Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -609,24 +609,19 @@
WRONG_PARAM_COUNT;
 
convert_to_long_ex(pv_flag);
-   ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, ODBC result, 
le_result);

-   /* if (Z_LVAL_PP(pv_res)) { */
+   if (Z_LVAL_PP(pv_res)) {
+   ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, ODBC result, 
+le_result);
 if (mode)
 result-longreadlen = Z_LVAL_PP(pv_flag);  
 else
 result-binmode = Z_LVAL_PP(pv_flag);
-/*
- * According to the documentation there is no possible way for you to run these 
functions 
- * without having a result set.  
- *
} else {
 if (mode)
 ODBCG(defaultlrl) = Z_LVAL_PP(pv_flag);
 else
 ODBCG(defaultbinmode) = Z_LVAL_PP(pv_flag);
}
-*/
RETURN_TRUE;
 }
 /* }}} */
@@ -1830,7 +1825,7 @@
NULL, 0, NULL, 
fieldsize);
}
/* For char data, the length of the returned string will be 
longreadlen - 1 */
-   fieldsize = (result-longreadlen = 0) ? ODBCG(defaultlrl) : 
result-longreadlen;
+   fieldsize = (result-longreadlen = 0) ? 4096 : 
+result-longreadlen;
field = emalloc(fieldsize);
if (!field) {
php_error(E_WARNING, Out of memory);
@@ -1875,7 +1870,7 @@
 /* If we come here, output unbound LONG and/or BINARY column data to the client */

/* We emalloc 1 byte more for SQL_C_CHAR (trailing \0) */
-   fieldsize = (sql_c_type == SQL_C_CHAR) ? ODBCG(defaultlrl)+1: 
ODBCG(defaultlrl);
+   fieldsize = (sql_c_type == SQL_C_CHAR) ? 4096 : 4095;
if ((field = emalloc(fieldsize)) == NULL) {
php_error(E_WARNING,Out of memory);
RETURN_FALSE;
@@ -1897,7 +1892,7 @@
RETURN_FALSE;
}
/* chop the trailing \0 by outputing only 4095 bytes */
-   PHPWRITE(field,(rc == SQL_SUCCESS_WITH_INFO) ? ODBCG(defaultlrl) :
+   PHPWRITE(field,(rc == SQL_SUCCESS_WITH_INFO) ? 4095 :
   result-values[field_ind].vallen);
 
if (rc == SQL_SUCCESS) { /* no more data avail */



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

[PHP-CVS] cvs: php4 /ext/odbc php_odbc.c

2003-01-06 Thread Dan Kalowsky

kalowskyMon Jan  6 13:23:56 2003 EDT

  Modified files:  
/php4/ext/odbc  php_odbc.c 
  Log:
  Patch for bug #19349
  
  
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.145 php4/ext/odbc/php_odbc.c:1.146
--- php4/ext/odbc/php_odbc.c:1.145  Mon Jan  6 13:10:06 2003
+++ php4/ext/odbc/php_odbc.cMon Jan  6 13:23:55 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.145 2003/01/06 18:10:06 kalowsky Exp $ */
+/* $Id: php_odbc.c,v 1.146 2003/01/06 18:23:55 kalowsky Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -609,19 +609,24 @@
WRONG_PARAM_COUNT;
 
convert_to_long_ex(pv_flag);
+   ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, ODBC result, 
+le_result);

-   if (Z_LVAL_PP(pv_res)) {
-   ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, ODBC result, 
le_result);
+   /* if (Z_LVAL_PP(pv_res)) { */
 if (mode)
 result-longreadlen = Z_LVAL_PP(pv_flag);  
 else
 result-binmode = Z_LVAL_PP(pv_flag);
+/*
+ * According to the documentation there is no possible way for you to run these 
+functions 
+ * without having a result set.  
+ *
} else {
 if (mode)
 ODBCG(defaultlrl) = Z_LVAL_PP(pv_flag);
 else
 ODBCG(defaultbinmode) = Z_LVAL_PP(pv_flag);
}
+*/
RETURN_TRUE;
 }
 /* }}} */
@@ -1825,7 +1830,7 @@
NULL, 0, NULL, 
fieldsize);
}
/* For char data, the length of the returned string will be 
longreadlen - 1 */
-   fieldsize = (result-longreadlen = 0) ? 4096 : 
result-longreadlen;
+   fieldsize = (result-longreadlen = 0) ? ODBCG(defaultlrl) : 
+result-longreadlen;
field = emalloc(fieldsize);
if (!field) {
php_error(E_WARNING, Out of memory);
@@ -1870,7 +1875,7 @@
 /* If we come here, output unbound LONG and/or BINARY column data to the client */

/* We emalloc 1 byte more for SQL_C_CHAR (trailing \0) */
-   fieldsize = (sql_c_type == SQL_C_CHAR) ? 4096 : 4095;
+   fieldsize = (sql_c_type == SQL_C_CHAR) ? ODBCG(defaultlrl)+1: 
+ODBCG(defaultlrl);
if ((field = emalloc(fieldsize)) == NULL) {
php_error(E_WARNING,Out of memory);
RETURN_FALSE;
@@ -1892,7 +1897,7 @@
RETURN_FALSE;
}
/* chop the trailing \0 by outputing only 4095 bytes */
-   PHPWRITE(field,(rc == SQL_SUCCESS_WITH_INFO) ? 4095 :
+   PHPWRITE(field,(rc == SQL_SUCCESS_WITH_INFO) ? ODBCG(defaultlrl) :
   result-values[field_ind].vallen);
 
if (rc == SQL_SUCCESS) { /* no more data avail */



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

[PHP-CVS] cvs: php4 /ext/java README

2002-11-02 Thread Dan Kalowsky

kalowskySat Nov  2 15:18:09 2002 EDT

  Modified files:  
/php4/ext/java  README 
  Log:
  Bug #20148 suggested work around for now.
  
  
Index: php4/ext/java/README
diff -u php4/ext/java/README:1.13 php4/ext/java/README:1.14
--- php4/ext/java/README:1.13   Tue Apr 23 19:30:19 2002
+++ php4/ext/java/READMESat Nov  2 15:18:09 2002
 -241,3 +241,7 
 
If all else fails, man dlopen on Unix systems will give more insight on 
what the system is trying to do internally.
+
+   There have been some issues where users need to create a symbolic link 
+   from java.so to libphp_java.so.  If you notice a large number of unexplained 
+   crashes in your webserver log file, try doing this.  



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

[PHP-CVS] cvs: php4 /ext/odbc php_odbc.c

2002-10-30 Thread Dan Kalowsky

kalowskyWed Oct 30 21:57:07 2002 EDT

  Modified files:  
/php4/ext/odbc  php_odbc.c 
  Log:
  Patch for windows DSN less connection #20086 (by [EMAIL PROTECTED])
  
  
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.142 php4/ext/odbc/php_odbc.c:1.143
--- php4/ext/odbc/php_odbc.c:1.142  Thu Oct 24 09:14:41 2002
+++ php4/ext/odbc/php_odbc.cWed Oct 30 21:57:06 2002
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.142 2002/10/24 13:14:41 sas Exp $ */
+/* $Id: php_odbc.c,v 1.143 2002/10/31 02:57:06 kalowsky Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2107,7 +2107,7 @@
}
 /*  Possible fix for bug #10250
  *  Needs testing on UnixODBC  2.0.5 though. */
-#if defined(HAVE_EMPRESS) || defined(HAVE_UNIXODBC)
+#if defined(HAVE_EMPRESS) || defined(HAVE_UNIXODBC) || defined(PHP_WIN32)
 /* *  Uncomment the line above, and comment line below to fully test 
  * #ifdef HAVE_EMPRESS */
{



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

[PHP-CVS] cvs: php4 / EXTENSIONS

2002-09-26 Thread Dan Kalowsky


kalowskyThu Sep 26 22:09:35 2002 EDT

  Modified files:  
/php4   EXTENSIONS 
  Log:
  They seem to be working... 
  
  
Index: php4/EXTENSIONS
diff -u php4/EXTENSIONS:1.46 php4/EXTENSIONS:1.47
--- php4/EXTENSIONS:1.46Thu Sep 26 03:55:41 2002
+++ php4/EXTENSIONS Thu Sep 26 22:09:35 2002
@@ -174,7 +174,7 @@
 PRIMARY MAINTAINER:  Daniel R. Kalowsky [EMAIL PROTECTED]
 MAINTENANCE: Maintained
 STATUS:  Working
-COMMENT: Working except for persistent connections
+COMMENT: Working 
 ---
 EXTENSION:   oracle
 PRIMARY MAINTAINER:  Thies C. Arntzen [EMAIL PROTECTED]



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

[PHP-CVS] cvs: php4 /ext/dba config.m4

2002-09-11 Thread Dan Kalowsky


kalowskyWed Sep 11 11:05:06 2002 EDT

  Modified files:  
/php4/ext/dba   config.m4 
  Log:
  Patch for Bug #19341 submitted by [EMAIL PROTECTED]
  
  
Index: php4/ext/dba/config.m4
diff -u php4/ext/dba/config.m4:1.19 php4/ext/dba/config.m4:1.20
--- php4/ext/dba/config.m4:1.19 Thu Apr 18 08:30:18 2002
+++ php4/ext/dba/config.m4  Wed Sep 11 11:05:06 2002
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.19 2002/04/18 12:30:18 derick Exp $
+dnl $Id: config.m4,v 1.20 2002/09/11 15:05:06 kalowsky Exp $
 dnl
 
 AC_DEFUN(PHP_TEMP_LDFLAGS,[
@@ -152,10 +152,19 @@
 [  --with-db3[=DIR]Include Berkeley DB3 support],[
   if test $withval != no; then
 for i in /usr/local /usr /usr/local/BerkeleyDB.3.0 $withval; do
-  if test -f $i/include/db3/db.h; then
+  if test -f $i/db3/db.h; then
+THIS_PREFIX=$i
+DB3_EXTRA=db3
+  elif test -f $i/include/db3/db.h; then
 THIS_PREFIX=$i
 DB3_EXTRA=db3/db.h
-  elif test -f $i/include/db.h ; then
+  elif test -f $i/include/db/db3.h; then
+THIS_PREFIX=$i
+DB3_EXTRA=db/db3.h
+  elif test -f $i/include/db3.h; then
+THIS_PREFIX=$i
+DB3_EXTRA=db3.h
+  elif test -f $i/include/db.h ; 
 THIS_PREFIX=$i
 DB3_EXTRA=db.h
   fi



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

[PHP-CVS] cvs: php4(PHP_4_2_0) /ext/imap php_imap.c

2002-09-09 Thread Dan Kalowsky


kalowskyMon Sep  9 16:59:17 2002 EDT

  Modified files:  (Branch: PHP_4_2_0)
/php4/ext/imap  php_imap.c 
  Log:
  Now this is correct for bug #15630
  
  
Index: php4/ext/imap/php_imap.c
diff -u php4/ext/imap/php_imap.c:1.112.2.6 php4/ext/imap/php_imap.c:1.112.2.7
--- php4/ext/imap/php_imap.c:1.112.2.6  Mon Sep  9 16:54:01 2002
+++ php4/ext/imap/php_imap.cMon Sep  9 16:59:17 2002
@@ -25,7 +25,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.112.2.6 2002/09/09 20:54:01 kalowsky Exp $ */
+/* $Id: php_imap.c,v 1.112.2.7 2002/09/09 20:59:17 kalowsky Exp $ */
 
 #define IMAP41
 
@@ -2200,7 +2200,7 @@
/* author: Andrew Skalski [EMAIL PROTECTED] */
zval **arg;
const unsigned char *in, *inp, *endp;
-   unsigned char *out, *outp;
+   unsigned char *out, *outp, c;
int inlen, outlen;
enum {
ST_NORMAL,  /* printable text */
@@ -2302,13 +2302,15 @@
break;
case ST_DECODE1:
outp[1] = UNB64(*inp);
-   *outp++ |= outp[1]  4;
+   c = outp[1]  4;
+   *outp++ |= c;
*outp = 4;
state = ST_DECODE2;
break;
case ST_DECODE2:
outp[1] = UNB64(*inp);
-   *outp++ |= outp[1]  2;
+   c = outpp[1]  2;
+   *outp++ |= c;
*outp = 6;
state = ST_DECODE3;
break;
@@ -2341,7 +2343,7 @@
/* author: Andrew Skalski [EMAIL PROTECTED] */
zval **arg;
const unsigned char *in, *inp, *endp;
-   unsigned char *out, *outp;
+   unsigned char *out, *outp, c;
int inlen, outlen;
enum {
ST_NORMAL,  /* printable text */
@@ -2412,7 +2414,8 @@
} else if (inp == endp || !SPECIAL(*inp)) {
/* flush overflow and terminate region */
if (state != ST_ENCODE0) {
-   *outp++ = B64(*outp);
+   c = B64(*outp);
+   *outp++ = c;
}
*outp++ = '-';
state = ST_NORMAL;
@@ -2425,12 +2428,14 @@
state = ST_ENCODE1;
break;
case ST_ENCODE1:
-   *outp++ = B64(*outp | *inp  4);
+   c = B64(*outp | *inp  4);
+   *outp++ = c;
*outp = *inp++  2;
state = ST_ENCODE2;
break;
case ST_ENCODE2:
-   *outp++ = B64(*outp | *inp  6);
+   c = B64(*outp | *inp  6);
+   *outp++ = c;
*outp++ = B64(*inp++);
state = ST_ENCODE0;
case ST_NORMAL:



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

[PHP-CVS] cvs: php4 /sapi/nsapi config.m4

2002-09-08 Thread Dan Kalowsky


kalowskySun Sep  8 14:13:57 2002 EDT

  Modified files:  
/php4/sapi/nsapiconfig.m4 
  Log:
  Fix for bug #19290 
  # Untested
  
  
Index: php4/sapi/nsapi/config.m4
diff -u php4/sapi/nsapi/config.m4:1.14 php4/sapi/nsapi/config.m4:1.15
--- php4/sapi/nsapi/config.m4:1.14  Tue Aug 20 19:04:53 2002
+++ php4/sapi/nsapi/config.m4   Sun Sep  8 14:13:56 2002
 -1,5 +1,5 
 dnl
-dnl $Id: config.m4,v 1.14 2002/08/20 23:04:53 kalowsky Exp $
+dnl $Id: config.m4,v 1.15 2002/09/08 18:13:56 kalowsky Exp $
 dnl
 
 AC_MSG_CHECKING(for NSAPI support)
 -22,9 +22,11 
 AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h])
   fi
   if test -d $PHP_NSAPI/plugins/include ; then
-NSAPI_INCLUDE=$NSAPI_INCLUDE -I$PHP_NSAPI/plugins/include
+NSAPI_INC_DIR=$NSAPI_INCLUDE
+NSAPI_INCLUDE=$PHP_NSAPI/plugins/include
 AC_MSG_RESULT(iPlanet/4.x style)
 AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h])
+NSAPI_INCLUDE=$NSAPI_INC_DIR -I$NSAPI_INCLUDE
   fi
   if test $NSAPI_INCLUDE = ; then
 AC_MSG_ERROR(Please check you have nsapi.h in either $PHP_NSAPI/include or 
$PHP_NSAPI/plugins/include)



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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

[PHP-CVS] cvs: php-src / NEWS

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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

[PHP-CVS] cvs: php4(PHP_4_3) /ext/odbc php_odbc.c

[PHP-CVS] cvs: php4(PHP_4_3) /ext/odbc php_odbc.c

[PHP-CVS] cvs: php4 /ext/odbc php_odbc.c

[PHP-CVS] cvs: php4(PHP_4_3) /ext/odbc php_odbc.c

[PHP-CVS] cvs: php4(PHP_4_3) /ext/odbc php_odbc.c

[PHP-CVS] cvs: php4 /ext/odbc php_odbc.c php_odbc.h

[PHP-CVS] cvs: php4 /ext/odbc php_odbc.h

[PHP-CVS] cvs: php4 /ext/odbc php_odbc.c

[PHP-CVS] cvs: php4 /ext/odbc config.m4 php_odbc.c

[PHP-CVS] cvs: php4 /ext/odbc php_odbc.c

[PHP-CVS] cvs: php4 /ext/java README

[PHP-CVS] cvs: php4 /ext/odbc php_odbc.c

[PHP-CVS] cvs: php4 / EXTENSIONS

[PHP-CVS] cvs: php4 /ext/dba config.m4

[PHP-CVS] cvs: php4(PHP_4_2_0) /ext/imap php_imap.c

[PHP-CVS] cvs: php4 /sapi/nsapi config.m4

21 matches

Site Navigation

Mail list logo

Footer information