date:20030108

[PHP-CVS] cvs: functable / version4.tags

2003-01-08 Thread Hartmut Holzgraefe

hholzgraWed Jan  8 05:55:04 2003 EDT

  Modified files:  
/functable  version4.tags 
  Log:
  4.3 added
  
  
Index: functable/version4.tags
diff -u functable/version4.tags:1.12 functable/version4.tags:1.13
--- functable/version4.tags:1.12Fri Sep 20 07:18:22 2002
+++ functable/version4.tags Wed Jan  8 05:55:03 2003
@@ -12,3 +12,4 @@
 php_4_2_1
 php_4_2_2
 php_4_2_3
+php_4_3_0



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

[PHP-CVS] cvs: php4 /ext/mysql php_mysql.c

2003-01-08 Thread Georg Richter

georg   Wed Jan  8 06:00:08 2003 EDT

  Modified files:  
/php4/ext/mysql php_mysql.c 
  Log:
  fixed bug #21498
  
  
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.181 php4/ext/mysql/php_mysql.c:1.182
--- php4/ext/mysql/php_mysql.c:1.181Mon Jan  6 09:13:47 2003
+++ php4/ext/mysql/php_mysql.c  Wed Jan  8 06:00:06 2003
@@ -18,7 +18,7 @@
+--+
 */
  
-/* $Id: php_mysql.c,v 1.181 2003/01/06 14:13:47 georg Exp $ */
+/* $Id: php_mysql.c,v 1.182 2003/01/08 11:00:06 georg Exp $ */
 
 /* TODO:
  *
@@ -663,11 +663,6 @@
/* ensure that the link did not die */
 #if MYSQL_VERSION_ID > 32230 /* Use mysql_ping to ensure link is alive (and to 
reconnect if needed) */
if (mysql_ping(le->ptr)) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"Link to server lost, unable to reconnect");
-   zend_hash_del(&EG(persistent_list), 
hashed_details, hashed_details_length+1);
-   efree(hashed_details);
-   MYSQL_DO_CONNECT_RETURN_FALSE();
-   }
 #else  /* Use mysql_stat() to check if server is alive */
handler=signal(SIGPIPE, SIG_IGN);
 #if defined(HAVE_MYSQL_ERRNO) && defined(CR_SERVER_GONE_ERROR)
@@ -677,6 +672,7 @@
if (!strcasecmp(mysql_stat(le->ptr), "mysql server has gone 
away")) { /* the link died */
 #endif
signal(SIGPIPE, handler);
+#endif /* end mysql_ping */
 #if MYSQL_VERSION_ID > 32199 /* this lets us set the port number */
if (mysql_real_connect(le->ptr, host, user, passwd, 
NULL, port, socket, client_flags)==NULL) {
 #else
@@ -688,8 +684,9 @@
MYSQL_DO_CONNECT_RETURN_FALSE();
}
}
+#if MYSQL_VERSION_ID < 32231
signal(SIGPIPE, handler);
-#endif /* end Use mysql_ping ... */
+#endif
 
mysql = (php_mysql_conn *) le->ptr;
}



-- 
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/mysql php_mysql.c

2003-01-08 Thread Georg Richter

georg   Wed Jan  8 06:15:14 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/mysql php_mysql.c 
  Log:
  fixed bug 21498
  
  
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.174.2.7 php4/ext/mysql/php_mysql.c:1.174.2.8
--- php4/ext/mysql/php_mysql.c:1.174.2.7Mon Jan  6 09:12:40 2003
+++ php4/ext/mysql/php_mysql.c  Wed Jan  8 06:15:12 2003
@@ -18,7 +18,7 @@
+--+
 */
  
-/* $Id: php_mysql.c,v 1.174.2.7 2003/01/06 14:12:40 georg Exp $ */
+/* $Id: php_mysql.c,v 1.174.2.8 2003/01/08 11:15:12 georg Exp $ */
 
 /* TODO:
  *
@@ -663,11 +663,6 @@
/* ensure that the link did not die */
 #if MYSQL_VERSION_ID > 32230 /* Use mysql_ping to ensure link is alive (and to 
reconnect if needed) */
if (mysql_ping(le->ptr)) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"Link to server lost, unable to reconnect");
-   zend_hash_del(&EG(persistent_list), 
hashed_details, hashed_details_length+1);
-   efree(hashed_details);
-   MYSQL_DO_CONNECT_RETURN_FALSE();
-   }
 #else  /* Use mysql_stat() to check if server is alive */
handler=signal(SIGPIPE, SIG_IGN);
 #if defined(HAVE_MYSQL_ERRNO) && defined(CR_SERVER_GONE_ERROR)
@@ -677,6 +672,7 @@
if (!strcasecmp(mysql_stat(le->ptr), "mysql server has gone 
away")) { /* the link died */
 #endif
signal(SIGPIPE, handler);
+#endif /* end mysql_ping */
 #if MYSQL_VERSION_ID > 32199 /* this lets us set the port number */
if (mysql_real_connect(le->ptr, host, user, passwd, 
NULL, port, socket, client_flags)==NULL) {
 #else
@@ -688,8 +684,9 @@
MYSQL_DO_CONNECT_RETURN_FALSE();
}
}
+#if MYSQL_VERSION_ID < 32231
signal(SIGPIPE, handler);
-#endif /* end Use mysql_ping ... */
+#endif
 
mysql = (php_mysql_conn *) le->ptr;
}



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

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

2003-01-08 Thread Zeev Suraski

zeevWed Jan  8 08:28:16 2003 EDT

  Modified files:  
/php4/ext/session   session.c 
  Log:
  Fix UMR
  
  
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.343 php4/ext/session/session.c:1.344
--- php4/ext/session/session.c:1.343Fri Jan  3 09:24:07 2003
+++ php4/ext/session/session.c  Wed Jan  8 08:28:16 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: session.c,v 1.343 2003/01/03 14:24:07 hyanantha Exp $ */
+/* $Id: session.c,v 1.344 2003/01/08 13:28:16 zeev Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1604,6 +1604,7 @@
 
PS(module_number) = module_number; /* if we really need this var we need to 
init it in zts mode as well! */
 
+   PS(session_status) = php_session_none;
REGISTER_INI_ENTRIES();
 
 #ifdef HAVE_LIBMM



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

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

2003-01-08 Thread Ilia Alshanetsky

iliaa   Wed Jan  8 10:02:02 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   NEWS 
  Log:
  Bug fixing news.
  
  
Index: php4/NEWS
diff -u php4/NEWS:1.1247.2.46 php4/NEWS:1.1247.2.47
--- php4/NEWS:1.1247.2.46   Tue Jan  7 10:28:13 2003
+++ php4/NEWS   Wed Jan  8 10:01:59 2003
@@ -9,6 +9,13 @@
   . Disallow linkage of Berkeley db submodules against libraries with
 different major version.
   . Disallow configuring of more than one Berkeley db handler. 
+- Fixed bug #21498 (mysql_pconnect connection problems). (Georg)
+- Fixed bug #21443 (improper handling of ? surrounded by spaces in
+  get_browser()). (Ilia)
+- Fixed bug #21297 (in CLI/CGI sapis on the #! it would leave a \n when the
+  the code encounters \r\n). (Ilia)
+- Fixed bug #21453 (improper handling of non-terminated < by strip_tags()).
+  (Ilia)
 - Fixed bug #17098 (make Apache2 aware that PHP scripts represent dynamic data
   and should not be cached). (Ilia)
 - Fixed bug #21445 (gd unable to open fonts). (Ilia)



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

[PHP-CVS] cvs: php4 /ext/gd gd.c /ext/gd/libgd gd_io_dp.c

2003-01-08 Thread Ilia Alshanetsky

iliaa   Wed Jan  8 13:11:41 2003 EDT

  Modified files:  
/php4/ext/gdgd.c 
/php4/ext/gd/libgd  gd_io_dp.c 
  Log:
  Fixed bug #21518.
  Fixed memory in leak ImageCreateFromString().
  Fixed a bug that prevented proper identification of WBMP images and thus
  prevented ImageCreateFromString() from working on those images.
  
  
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.242 php4/ext/gd/gd.c:1.243
--- php4/ext/gd/gd.c:1.242  Tue Jan  7 17:34:00 2003
+++ php4/ext/gd/gd.cWed Jan  8 13:11:40 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.242 2003/01/07 22:34:00 pajoye Exp $ */
+/* $Id: gd.c,v 1.243 2003/01/08 18:11:40 iliaa Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, 
Cold Spring Harbor Labs. */
@@ -1212,9 +1212,9 @@
 static int _php_image_type (char data[8])
 {
 #ifdef HAVE_LIBGD15
-   /* Based on ext/standard/images.c */
+   /* Based on ext/standard/image.c */
 
-   if (data == NULL || strlen(data) <= 0)
+   if (data == NULL)
return -1;
 
if (!memcmp(data, php_sig_gd2, 3))
@@ -1273,7 +1273,11 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Passed data is not in 
'%s' format", tn);
return NULL;
}
-
+#if HAVE_LIBGD204
+   io_ctx->gd_free(io_ctx);
+#else
+   io_ctx->free(io_ctx);
+#endif 
return im;
 }
 /* }}} */
Index: php4/ext/gd/libgd/gd_io_dp.c
diff -u php4/ext/gd/libgd/gd_io_dp.c:1.2 php4/ext/gd/libgd/gd_io_dp.c:1.3
--- php4/ext/gd/libgd/gd_io_dp.c:1.2Tue Oct 29 18:08:01 2002
+++ php4/ext/gd/libgd/gd_io_dp.cWed Jan  8 13:11:40 2003
@@ -145,13 +145,6 @@
 
   gdFree (ctx);
 
-  /* clean up the data block and return it */
-  if (dp->data != NULL)
-{
-  gdFree (dp->data);
-  dp->data = NULL;
-}
-
   dp->realSize = 0;
   dp->logicalSize = 0;
 



-- 
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/gd gd.c /ext/gd/libgd gd_io_dp.c

2003-01-08 Thread Ilia Alshanetsky

iliaa   Wed Jan  8 13:11:59 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/gdgd.c 
/php4/ext/gd/libgd  gd_io_dp.c 
  Log:
  MFH
  
  
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.221.2.9 php4/ext/gd/gd.c:1.221.2.10
--- php4/ext/gd/gd.c:1.221.2.9  Tue Dec 31 11:34:35 2002
+++ php4/ext/gd/gd.cWed Jan  8 13:11:58 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.221.2.9 2002/12/31 16:34:35 sebastian Exp $ */
+/* $Id: gd.c,v 1.221.2.10 2003/01/08 18:11:58 iliaa Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, 
Cold Spring Harbor Labs. */
@@ -1129,9 +1129,9 @@
 static int _php_image_type (char data[8])
 {
 #ifdef HAVE_LIBGD15
-   /* Based on ext/standard/images.c */
+   /* Based on ext/standard/image.c */
 
-   if (data == NULL || strlen(data) <= 0)
+   if (data == NULL)
return -1;
 
if (!memcmp(data, php_sig_gd2, 3))
@@ -1190,7 +1190,11 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Passed data is not in 
'%s' format", tn);
return NULL;
}
-
+#if HAVE_LIBGD204
+   io_ctx->gd_free(io_ctx);
+#else
+   io_ctx->free(io_ctx);
+#endif 
return im;
 }
 /* }}} */
Index: php4/ext/gd/libgd/gd_io_dp.c
diff -u php4/ext/gd/libgd/gd_io_dp.c:1.2 php4/ext/gd/libgd/gd_io_dp.c:1.2.2.1
--- php4/ext/gd/libgd/gd_io_dp.c:1.2Tue Oct 29 18:08:01 2002
+++ php4/ext/gd/libgd/gd_io_dp.cWed Jan  8 13:11:58 2003
@@ -145,13 +145,6 @@
 
   gdFree (ctx);
 
-  /* clean up the data block and return it */
-  if (dp->data != NULL)
-{
-  gdFree (dp->data);
-  dp->data = NULL;
-}
-
   dp->realSize = 0;
   dp->logicalSize = 0;
 



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

[PHP-CVS] cvs: CVSROOT / avail

2003-01-08 Thread Andrei Zmievski

andrei  Wed Jan  8 13:29:40 2003 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  Give karma for php-gtk-doc to Richy Black.
  
  
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.572 CVSROOT/avail:1.573
--- CVSROOT/avail:1.572 Tue Jan  7 18:14:31 2003
+++ CVSROOT/avail   Wed Jan  8 13:29:39 2003
@@ -60,7 +60,7 @@
 # The PHP-GTK Documentation Group has access to the PHP-GTK
 # documentation.
 
-avail|jmoore,sfox,pgod,henning,manu,pablo,cortesi,rambik,hirokawa,thomasgm,jstarkey,fernandoc|php-gtk-doc
+avail|jmoore,sfox,pgod,henning,manu,pablo,cortesi,rambik,hirokawa,thomasgm,jstarkey,fernandoc,richy|php-gtk-doc
 
 # The PHP-GTK Web Group has access to the PHP-GTK website.
 



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

[PHP-CVS] cvs: php4 /ext/standard image.c php_image.h

2003-01-08 Thread Ilia Alshanetsky

iliaa   Wed Jan  8 15:36:03 2003 EDT

  Modified files:  
/php4/ext/standard  image.c php_image.h 
  Log:
  Added support for WBMP images.
  
  
Index: php4/ext/standard/image.c
diff -u php4/ext/standard/image.c:1.80 php4/ext/standard/image.c:1.81
--- php4/ext/standard/image.c:1.80  Tue Dec 31 11:07:42 2002
+++ php4/ext/standard/image.c   Wed Jan  8 15:36:03 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: image.c,v 1.80 2002/12/31 16:07:42 sebastian Exp $ */
+/* $Id: image.c,v 1.81 2003/01/08 20:36:03 iliaa Exp $ */
 
 #include "php.h"
 #include 
@@ -84,6 +84,7 @@
REGISTER_LONG_CONSTANT("IMAGETYPE_SWC", IMAGE_FILETYPE_SWC, CONST_CS | 
CONST_PERSISTENT);
 #endif 
REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT("IMAGETYPE_WBMP",IMAGE_FILETYPE_WBMP,CONST_CS | 
+CONST_PERSISTENT);
return SUCCESS;
 }
 /* }}} */
@@ -786,6 +787,78 @@
 }
 /* }}} */
 
+/* {{{ php_get_wbmp
+ * int WBMP file format type
+ * byte Header Type
+ * byte Extended Header
+ * byte Header Data (type 00 = multibyte)
+ * byte Header Data (type 11 = name/pairs)
+ * int Number of columns
+ * int Number of rows
+ */
+static int php_get_wbmp(php_stream *stream, struct gfxinfo **result, int check 
+TSRMLS_DC)
+{
+   int i, width = 0, height = 0;
+
+   if (php_stream_rewind(stream)) {
+   return 0;
+   }
+
+   /* get type */
+   if (php_stream_getc(stream) != 0) {
+   return 0;
+   }
+
+   /* skip header */
+   do {
+   i = php_stream_getc(stream);
+   if (i < 0) {
+   return 0;
+   }
+   } while (i & 0x80);
+
+   /* get width */
+   do {
+   i = php_stream_getc(stream);
+   if (i < 0) {
+   return 0;
+   }
+   width = (width << 7) | (i & 0x7f);
+   } while (i & 0x80);
+   
+   /* get height */
+   do {
+   i = php_stream_getc(stream);
+   if (i < 0) {
+   return 0;
+   }
+   height = (height << 7) | (i & 0x7f);
+   } while (i & 0x80);
+   
+   if (!check) {
+   (*result)->width = width;
+   (*result)->height = height;
+   }
+
+   return IMAGE_FILETYPE_WBMP;
+}
+/* }}} */
+
+/* {{{ php_handle_wbmp
+*/
+static struct gfxinfo *php_handle_wbmp(php_stream * stream TSRMLS_DC)
+{
+   struct gfxinfo *result = (struct gfxinfo *) ecalloc(1, sizeof(struct gfxinfo));
+
+   if (!php_get_wbmp(stream, &result, 0 TSRMLS_CC)) {
+   efree(result);
+   return NULL;
+   }
+
+   return result;
+}
+/* }}} */
+
 /* {{{ php_image_type_to_mime_type
  * Convert internal image_type to mime type */
 PHPAPI const char * php_image_type_to_mime_type(int image_type)
@@ -810,6 +883,8 @@
return "image/tiff";
case IMAGE_FILETYPE_IFF:
return "image/iff";
+   case IMAGE_FILETYPE_WBMP:
+   return "image/vnd.wap.wbmp";
default:
case IMAGE_FILETYPE_UNKNOWN:
return "application/octet-stream"; /* suppose binary format */
@@ -878,6 +953,9 @@
if (!memcmp(filetype, php_sig_iff, 4)) {
return IMAGE_FILETYPE_IFF;
}
+   if (php_get_wbmp(stream, NULL, 1 TSRMLS_DC)) {
+   return IMAGE_FILETYPE_WBMP;
+   }
 
return IMAGE_FILETYPE_UNKNOWN;
 }
@@ -966,6 +1044,10 @@
break;
case IMAGE_FILETYPE_IFF:
result = php_handle_iff(stream TSRMLS_CC);
+   break;
+   case IMAGE_FILETYPE_WBMP:
+   result = php_handle_wbmp(stream TSRMLS_CC);
+   break;
default:
case IMAGE_FILETYPE_UNKNOWN:
break;
Index: php4/ext/standard/php_image.h
diff -u php4/ext/standard/php_image.h:1.20 php4/ext/standard/php_image.h:1.21
--- php4/ext/standard/php_image.h:1.20  Tue Dec 31 11:07:51 2002
+++ php4/ext/standard/php_image.h   Wed Jan  8 15:36:03 2003
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: php_image.h,v 1.20 2002/12/31 16:07:51 sebastian Exp $ */
+/* $Id: php_image.h,v 1.21 2003/01/08 20:36:03 iliaa Exp $ */
 
 #ifndef PHP_IMAGE_H
 #define PHP_IMAGE_H
@@ -46,6 +46,7 @@
   IMAGE_FILETYPE_JB2,
   IMAGE_FILETYPE_SWC,
   IMAGE_FILETYPE_IFF,
+  IMAGE_FILETYPE_WBMP,
 /* WHEN EXTENDING: PLEASE ALSO REGISTER IN image.c:PHP_MINIT_FUNCTION(imagetypes) */
 } image_filetype;
 /* }}} */



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

[PHP-CVS] cvs: php4 /ext/fbsql php_fbsql.h

2003-01-08 Thread Frank M. Kromann

fmk Wed Jan  8 18:18:54 2003 EDT

  Modified files:  
/php4/ext/fbsql php_fbsql.h 
  Log:
  Changed global data type to avoid problems with initialization
  
Index: php4/ext/fbsql/php_fbsql.h
diff -u php4/ext/fbsql/php_fbsql.h:1.22 php4/ext/fbsql/php_fbsql.h:1.23
--- php4/ext/fbsql/php_fbsql.h:1.22 Tue Dec 31 11:06:35 2002
+++ php4/ext/fbsql/php_fbsql.h  Wed Jan  8 18:18:54 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_fbsql.h,v 1.22 2002/12/31 16:06:35 sebastian Exp $ */
+/* $Id: php_fbsql.h,v 1.23 2003/01/08 23:18:54 fmk Exp $ */
 
 #define HAVE_FBSQL 1
 
@@ -105,9 +105,9 @@
 static void php_fbsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent);
 
 ZEND_BEGIN_MODULE_GLOBALS(fbsql)
-   long allowPersistent;
-   long generateWarnings;
-   long autoCommit;
+   zend_bool allowPersistent;
+   zend_bool generateWarnings;
+   zend_bool autoCommit;
long maxPersistent;
long maxLinks;
long maxConnections;



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

[PHP-CVS] cvs: php4 /ext/mssql php_mssql.c php_mssql.h

2003-01-08 Thread Frank M. Kromann

fmk Wed Jan  8 18:19:54 2003 EDT

  Modified files:  
/php4/ext/mssql php_mssql.c php_mssql.h 
  Log:
  Changed global data type to avoid problems with initialization
  
Index: php4/ext/mssql/php_mssql.c
diff -u php4/ext/mssql/php_mssql.c:1.92 php4/ext/mssql/php_mssql.c:1.93
--- php4/ext/mssql/php_mssql.c:1.92 Tue Dec 31 11:07:01 2002
+++ php4/ext/mssql/php_mssql.c  Wed Jan  8 18:19:53 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mssql.c,v 1.92 2002/12/31 16:07:01 sebastian Exp $ */
+/* $Id: php_mssql.c,v 1.93 2003/01/08 23:19:53 fmk Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -446,7 +446,7 @@
DBMSGHANDLE(mssql.login, (MHANDLEFUNC) php_mssql_message_handler);
 
 #ifndef HAVE_FREETDS
-   if (MS_SQL_G(secure_connection) == 1){
+   if (MS_SQL_G(secure_connection)){
DBSETLSECURE(mssql.login);
}
else {
Index: php4/ext/mssql/php_mssql.h
diff -u php4/ext/mssql/php_mssql.h:1.27 php4/ext/mssql/php_mssql.h:1.28
--- php4/ext/mssql/php_mssql.h:1.27 Tue Dec 31 11:07:02 2002
+++ php4/ext/mssql/php_mssql.h  Wed Jan  8 18:19:54 2003
@@ -17,7 +17,7 @@
  */
 
 
-/* $Id: php_mssql.h,v 1.27 2002/12/31 16:07:02 sebastian Exp $ */
+/* $Id: php_mssql.h,v 1.28 2003/01/08 23:19:54 fmk Exp $ */
 
 #ifndef PHP_MSSQL_H
 #define PHP_MSSQL_H
@@ -149,17 +149,18 @@
long default_link;
long num_links,num_persistent;
long max_links,max_persistent;
-   long allow_persistent;
+   zend_bool allow_persistent;
char *appname;
char *server_message;
long min_error_severity, min_message_severity;
long cfg_min_error_severity, cfg_min_message_severity;
-   long compatability_mode, connect_timeout, timeout;
+   long connect_timeout, timeout;
+   zend_bool compatability_mode;
void (*get_column_content)(mssql_link *mssql_ptr,int offset,pval *result,int 
column_type  TSRMLS_DC);
long textsize, textlimit, batchsize;
-   long datetimeconvert;
+   zend_bool datetimeconvert;
HashTable *resource_list, *resource_plist;
-   long secure_connection;
+   zend_bool secure_connection;
long max_procs;
 ZEND_END_MODULE_GLOBALS(mssql)
 



-- 
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/mssql php_mssql.c php_mssql.h

2003-01-08 Thread Frank M. Kromann

fmk Wed Jan  8 18:20:42 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/mssql php_mssql.c php_mssql.h 
  Log:
  MFH
  
Index: php4/ext/mssql/php_mssql.c
diff -u php4/ext/mssql/php_mssql.c:1.86.2.6 php4/ext/mssql/php_mssql.c:1.86.2.7
--- php4/ext/mssql/php_mssql.c:1.86.2.6 Tue Dec 31 11:34:58 2002
+++ php4/ext/mssql/php_mssql.c  Wed Jan  8 18:20:42 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mssql.c,v 1.86.2.6 2002/12/31 16:34:58 sebastian Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.7 2003/01/08 23:20:42 fmk Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -446,7 +446,7 @@
DBMSGHANDLE(mssql.login, (MHANDLEFUNC) php_mssql_message_handler);
 
 #ifndef HAVE_FREETDS
-   if (MS_SQL_G(secure_connection) == 1){
+   if (MS_SQL_G(secure_connection)){
DBSETLSECURE(mssql.login);
}
else {
Index: php4/ext/mssql/php_mssql.h
diff -u php4/ext/mssql/php_mssql.h:1.23.4.3 php4/ext/mssql/php_mssql.h:1.23.4.4
--- php4/ext/mssql/php_mssql.h:1.23.4.3 Tue Dec 31 11:34:58 2002
+++ php4/ext/mssql/php_mssql.h  Wed Jan  8 18:20:42 2003
@@ -17,7 +17,7 @@
  */
 
 
-/* $Id: php_mssql.h,v 1.23.4.3 2002/12/31 16:34:58 sebastian Exp $ */
+/* $Id: php_mssql.h,v 1.23.4.4 2003/01/08 23:20:42 fmk Exp $ */
 
 #ifndef PHP_MSSQL_H
 #define PHP_MSSQL_H
@@ -149,17 +149,18 @@
long default_link;
long num_links,num_persistent;
long max_links,max_persistent;
-   long allow_persistent;
+   zend_bool allow_persistent;
char *appname;
char *server_message;
long min_error_severity, min_message_severity;
long cfg_min_error_severity, cfg_min_message_severity;
-   long compatability_mode, connect_timeout, timeout;
+   long connect_timeout, timeout;
+   zend_bool compatability_mode;
void (*get_column_content)(mssql_link *mssql_ptr,int offset,pval *result,int 
column_type  TSRMLS_DC);
long textsize, textlimit, batchsize;
-   long datetimeconvert;
+   zend_bool datetimeconvert;
HashTable *resource_list, *resource_plist;
-   long secure_connection;
+   zend_bool secure_connection;
long max_procs;
 ZEND_END_MODULE_GLOBALS(mssql)
 



-- 
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/fbsql php_fbsql.h

2003-01-08 Thread Frank M. Kromann

fmk Wed Jan  8 18:21:43 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/fbsql php_fbsql.h 
  Log:
  MFH
  
Index: php4/ext/fbsql/php_fbsql.h
diff -u php4/ext/fbsql/php_fbsql.h:1.21.2.1 php4/ext/fbsql/php_fbsql.h:1.21.2.2
--- php4/ext/fbsql/php_fbsql.h:1.21.2.1 Tue Dec 31 11:34:30 2002
+++ php4/ext/fbsql/php_fbsql.h  Wed Jan  8 18:21:42 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_fbsql.h,v 1.21.2.1 2002/12/31 16:34:30 sebastian Exp $ */
+/* $Id: php_fbsql.h,v 1.21.2.2 2003/01/08 23:21:42 fmk Exp $ */
 
 #define HAVE_FBSQL 1
 
@@ -105,9 +105,9 @@
 static void php_fbsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent);
 
 ZEND_BEGIN_MODULE_GLOBALS(fbsql)
-   long allowPersistent;
-   long generateWarnings;
-   long autoCommit;
+   zend_bool allowPersistent;
+   zend_bool generateWarnings;
+   zend_bool autoCommit;
long maxPersistent;
long maxLinks;
long maxConnections;



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

[PHP-CVS] cvs: php4 /ext/standard filters.c

2003-01-08 Thread Moriyoshi Koizumi

moriyoshi   Wed Jan  8 18:44:38 2003 EDT

  Modified files:  
/php4/ext/standard  filters.c 
  Log:
  Reimplemented base64 filter to use iconv()-like facility for flexibility.
  # I'm leaving the code dirty & ugly prior to the discussion.
  
  
  
Index: php4/ext/standard/filters.c
diff -u php4/ext/standard/filters.c:1.8 php4/ext/standard/filters.c:1.9
--- php4/ext/standard/filters.c:1.8 Tue Jan  7 17:53:42 2003
+++ php4/ext/standard/filters.c Wed Jan  8 18:44:38 2003
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: filters.c,v 1.8 2003/01/07 22:53:42 moriyoshi Exp $ */
+/* $Id: filters.c,v 1.9 2003/01/08 23:44:38 moriyoshi Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -207,14 +207,38 @@
 /* }}} */
 
 /* {{{ base64 stream filter implementation */
-typedef struct _php_base64_filter
-{
+
+typedef enum _php_conv_err_t {
+   PHP_CONV_ERR_SUCCESS = SUCCESS,
+   PHP_CONV_ERR_UNKNOWN,
+   PHP_CONV_ERR_TOO_BIG,
+   PHP_CONV_ERR_INVALID_SEQ,
+   PHP_CONV_ERR_UNEXPECTED_EOS
+} php_conv_err_t;
+
+typedef struct _php_conv php_conv;
+
+typedef php_conv_err_t (*php_conv_convert_func)(php_conv *, const char **, size_t *, 
+char **, size_t *);
+typedef void (*php_conv_dtor_func)(php_conv *);
+
+struct _php_conv {
+   php_conv_convert_func convert_op;
+   php_conv_dtor_func dtor;
+};
+
+#define php_conv_convert(a, b, c, d, e) ((php_conv *)(a))->convert_op((php_conv 
+*)(a), (b), (c), (d), (e))
+#define php_conv_dtor(a) ((php_conv *)a)->dtor((a))
+
+/* {{{ php_conv_base64_encode */
+typedef struct _php_conv_base64_encode {
+   php_conv _super;
+
unsigned char erem[3];
size_t erem_len;
-   unsigned int urem;
-   unsigned int urem_nbits;
-   unsigned int ustat;
-} php_base64_filter;
+} php_conv_base64_encode;
+
+static php_conv_err_t php_conv_base64_encode_convert(php_conv_base64_encode *inst, 
+const char **in_p, size_t *in_left, char **out_p, size_t *out_left);
+static void php_conv_base64_encode_dtor(php_conv_base64_encode *inst);
 
 static unsigned char b64_tbl_enc[256] = {
'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',
@@ -235,147 +259,252 @@
'w','x','y','z','0','1','2','3','4','5','6','7','8','9','+','/'
 };
 
-static unsigned int b64_tbl_unenc[256] = {
-   64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-   64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-   64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 62, 64, 64, 64, 63,
-   52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 64, 64, 64,128, 64, 64,
-   64,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
-   15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 64, 64, 64, 64, 64,
-   64, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-   41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 64, 64, 64, 64,
-   64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-   64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-   64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-   64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-   64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-   64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-   64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-   64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64
-};
-
-
-static int php_base64_filter_ctor(php_base64_filter *inst)
+static php_conv_err_t php_conv_base64_encode_ctor(php_conv_base64_encode *inst)
 {
+   inst->_super.convert_op = (php_conv_convert_func) 
+php_conv_base64_encode_convert;
+   inst->_super.dtor = (php_conv_dtor_func) php_conv_base64_encode_dtor;
inst->erem_len = 0;
-   inst->urem_nbits = 0;
-   inst->ustat = 0;
return SUCCESS;
 }
 
-static void php_base64_filter_dtor(php_base64_filter *inst)
+static void php_conv_base64_encode_dtor(php_conv_base64_encode *inst)
 {
/* do nothing */
 }
 
-static size_t strfilter_base64_write(php_stream *stream, php_stream_filter 
*thisfilter,
-   const char *buf, size_t count TSRMLS_DC)
+static php_conv_err_t php_conv_base64_encode_convert(php_conv_base64_encode *inst, 
+const char **in_pp, size_t *in_left_p, char **out_pp, size_t *out_left_p)
 {
-   register size_t chunk_left, bcnt;
+   register size_t ocnt, icnt;
register unsigned char *ps, *pd;
size_t nbytes_written;
-   char chunk[1024];
-   php_base64_filter *inst = (php_base64_filter *)thisfilter->abstract;
 
-   bcnt = count;
-   ps = (unsigned char *)buf;
-   pd = chunk;
-   chunk_left = sizeof(chunk);
+   pd = (unsigned char *)(*out_pp);
+   ocnt = *out_left_p;
nbytes_written = 0;
- 
-   /* consume the remainder first */
-   switch (inst->erem_len) {
-

[PHP-CVS] cvs: php4 /ext/standard image.c

2003-01-08 Thread Jani Taskinen

sniper  Wed Jan  8 19:15:34 2003 EDT

  Modified files:  
/php4/ext/standard  image.c 
  Log:
  Fix the ZTS build.
  
Index: php4/ext/standard/image.c
diff -u php4/ext/standard/image.c:1.81 php4/ext/standard/image.c:1.82
--- php4/ext/standard/image.c:1.81  Wed Jan  8 15:36:03 2003
+++ php4/ext/standard/image.c   Wed Jan  8 19:15:33 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: image.c,v 1.81 2003/01/08 20:36:03 iliaa Exp $ */
+/* $Id: image.c,v 1.82 2003/01/09 00:15:33 sniper Exp $ */
 
 #include "php.h"
 #include 
@@ -953,7 +953,7 @@
if (!memcmp(filetype, php_sig_iff, 4)) {
return IMAGE_FILETYPE_IFF;
}
-   if (php_get_wbmp(stream, NULL, 1 TSRMLS_DC)) {
+   if (php_get_wbmp(stream, NULL, 1 TSRMLS_CC)) {
return IMAGE_FILETYPE_WBMP;
}
 



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

[PHP-CVS] cvs: php4 /ext/mssql php_mssql.c

2003-01-08 Thread Frank M. Kromann

fmk Wed Jan  8 21:44:44 2003 EDT

  Modified files:  
/php4/ext/mssql php_mssql.c 
  Log:
  changed from LVAL to RESVAL macro
  
Index: php4/ext/mssql/php_mssql.c
diff -u php4/ext/mssql/php_mssql.c:1.93 php4/ext/mssql/php_mssql.c:1.94
--- php4/ext/mssql/php_mssql.c:1.93 Wed Jan  8 18:19:53 2003
+++ php4/ext/mssql/php_mssql.c  Wed Jan  8 21:44:44 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mssql.c,v 1.93 2003/01/08 23:19:53 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.94 2003/01/09 02:44:44 fmk Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -705,7 +705,7 @@
ZEND_FETCH_RESOURCE2(mssql_ptr, mssql_link *, mssql_link_index, id, "MS 
SQL-Link", le_link, le_plink);
 
if (mssql_link_index) 
-   zend_list_delete(Z_LVAL_PP(mssql_link_index));
+   zend_list_delete(Z_RESVAL_PP(mssql_link_index));
else 
zend_list_delete(id);
 
@@ -1186,7 +1186,7 @@
if (dbdataready(result->mssql_ptr->link))
dbresults(result->mssql_ptr->link);
 #endif
-   zend_list_delete(Z_LVAL_PP(mssql_result_index));
+   zend_list_delete(Z_RESVAL_PP(mssql_result_index));
RETURN_TRUE;
 }
 



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

[PHP-CVS] cvs: php4 /ext/standard fsock.c

2003-01-08 Thread Ilia Alshanetsky

iliaa   Wed Jan  8 22:33:15 2003 EDT

  Modified files:  
/php4/ext/standard  fsock.c 
  Log:
  Fixed bug #21529 (memory corruption by fsockopen()).
  
  
Index: php4/ext/standard/fsock.c
diff -u php4/ext/standard/fsock.c:1.107 php4/ext/standard/fsock.c:1.108
--- php4/ext/standard/fsock.c:1.107 Tue Dec 31 11:07:41 2002
+++ php4/ext/standard/fsock.c   Wed Jan  8 22:33:15 2003
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: fsock.c,v 1.107 2002/12/31 16:07:41 sebastian Exp $ */
+/* $Id: fsock.c,v 1.108 2003/01/09 03:33:15 iliaa Exp $ */
 
 /* converted to PHP Streams and moved much code to main/network.c [wez] */
 
@@ -178,7 +178,7 @@
}
if (zerrstr) {
zval_dtor(zerrstr);
-   ZVAL_STRING(zerrno, "", 1);
+   ZVAL_STRING(zerrstr, "", 1);
}
 
if (port > 0)   { /* connect to a host */
@@ -261,6 +261,7 @@
char *buf = php_socket_strerror(err, NULL, 0);
 
/* no need to dup; we would only need to efree buf anyway */
+   zval_dtor(zerrstr);
ZVAL_STRING(zerrstr, buf, 0);
}
RETURN_FALSE;



-- 
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/standard fsock.c

2003-01-08 Thread Ilia Alshanetsky

iliaa   Wed Jan  8 22:33:44 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/standard  fsock.c 
  Log:
  MFH
  
  
Index: php4/ext/standard/fsock.c
diff -u php4/ext/standard/fsock.c:1.106.2.1 php4/ext/standard/fsock.c:1.106.2.2
--- php4/ext/standard/fsock.c:1.106.2.1 Tue Dec 31 11:35:28 2002
+++ php4/ext/standard/fsock.c   Wed Jan  8 22:33:44 2003
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: fsock.c,v 1.106.2.1 2002/12/31 16:35:28 sebastian Exp $ */
+/* $Id: fsock.c,v 1.106.2.2 2003/01/09 03:33:44 iliaa Exp $ */
 
 /* converted to PHP Streams and moved much code to main/network.c [wez] */
 
@@ -178,7 +178,7 @@
}
if (zerrstr) {
zval_dtor(zerrstr);
-   ZVAL_STRING(zerrno, "", 1);
+   ZVAL_STRING(zerrstr, "", 1);
}
 
if (port > 0)   { /* connect to a host */
@@ -261,6 +261,7 @@
char *buf = php_socket_strerror(err, NULL, 0);
 
/* no need to dup; we would only need to efree buf anyway */
+   zval_dtor(zerrstr);
ZVAL_STRING(zerrstr, buf, 0);
}
RETURN_FALSE;



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

[PHP-CVS] cvs: functable / version4.tags

[PHP-CVS] cvs: php4 /ext/mysql php_mysql.c

[PHP-CVS] cvs: php4(PHP_4_3) /ext/mysql php_mysql.c

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

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

[PHP-CVS] cvs: php4 /ext/gd gd.c /ext/gd/libgd gd_io_dp.c

[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd gd.c /ext/gd/libgd gd_io_dp.c

[PHP-CVS] cvs: CVSROOT / avail

[PHP-CVS] cvs: php4 /ext/standard image.c php_image.h

[PHP-CVS] cvs: php4 /ext/fbsql php_fbsql.h

[PHP-CVS] cvs: php4 /ext/mssql php_mssql.c php_mssql.h

[PHP-CVS] cvs: php4(PHP_4_3) /ext/mssql php_mssql.c php_mssql.h

[PHP-CVS] cvs: php4(PHP_4_3) /ext/fbsql php_fbsql.h

[PHP-CVS] cvs: php4 /ext/standard filters.c

[PHP-CVS] cvs: php4 /ext/standard image.c

[PHP-CVS] cvs: php4 /ext/mssql php_mssql.c

[PHP-CVS] cvs: php4 /ext/standard fsock.c

[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard fsock.c

18 matches

Site Navigation

Mail list logo

Footer information