date:20030107

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

2003-01-07 Thread Derick Rethans

On Mon, 6 Jan 2003, Edin Kadribasic wrote:

 edink Sun Jan  5 20:26:14 2003 EDT
 
   Modified files:  
 /php4/ext/mcrypt  mcrypt.c 
   Log:
   Comment out non ANSI C standard comliant code. Fixes win32 build.

bah, stupid windows :I

Derick

-- 

-
 Derick Rethans http://derickrethans.nl/ 
 PHP Magazine - PHP Magazine for Professionals   http://php-mag.net/
-



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

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

2003-01-07 Thread Sascha Schumann

sas Tue Jan  7 04:49:08 2003 EDT

  Modified files:  
/php4/ext/mysql config.m4 
  Log:
  tell user which header files could not be found
  
  
Index: php4/ext/mysql/config.m4
diff -u php4/ext/mysql/config.m4:1.54 php4/ext/mysql/config.m4:1.55
--- php4/ext/mysql/config.m4:1.54   Sun Oct 20 22:46:12 2002
+++ php4/ext/mysql/config.m4Tue Jan  7 04:49:08 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.54 2002/10/21 02:46:12 sniper Exp $
+dnl $Id: config.m4,v 1.55 2003/01/07 09:49:08 sas Exp $
 dnl
 
 sinclude(ext/mysql/libmysql/acinclude.m4)
@@ -108,7 +108,7 @@
   done
 
   if test -z $MYSQL_DIR; then
-AC_MSG_ERROR(Cannot find header files under $PHP_MYSQL)
+AC_MSG_ERROR(Cannot find MySQL header files under $PHP_MYSQL)
   fi
 
   MYSQL_MODULE_TYPE=external



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

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

2003-01-07 Thread Wez Furlong

I don't think this makes much sense and would prefer it to default to
all filters if there is a good reason to keep the option.

--Wez.

On Tue, 7 Jan 2003, Sara Golemon wrote:

 pollita   Mon Jan  6 20:02:30 2003 EDT

   Modified files:
 /php4/ext/standarduser_filters.c
   Log:
   Add option to stream_get_filters() user-defined fiters vs. all filters, default to 
user only


 Index: php4/ext/standard/user_filters.c
 diff -u php4/ext/standard/user_filters.c:1.6 php4/ext/standard/user_filters.c:1.7
 --- php4/ext/standard/user_filters.c:1.6  Sun Jan  5 23:06:40 2003
 +++ php4/ext/standard/user_filters.c  Mon Jan  6 20:02:29 2003
 @@ -17,7 +17,7 @@
 +--+
  */

 -/* $Id: user_filters.c,v 1.6 2003/01/06 04:06:40 pollita Exp $ */
 +/* $Id: user_filters.c,v 1.7 2003/01/07 01:02:29 pollita Exp $ */

  #include php.h
  #include php_globals.h
 @@ -411,21 +411,27 @@
  {
  }

 -/* {{{ proto array stream_get_filters()
 +/* {{{ proto array stream_get_filters([bool system])
 Returns a list of registered filters */
  PHP_FUNCTION(stream_get_filters)
  {
   char *filter_name;
   int key_flags, filter_name_len = 0;
 + zend_bool return_system = 0;
   HashTable *filters_hash;

 - if (ZEND_NUM_ARGS() != 0) {
 - WRONG_PARAM_COUNT;
 + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |b, return_system) == 
FAILURE) {
 + RETURN_FALSE;
   }

   array_init(return_value);

 - filters_hash = php_get_stream_filters_hash();
 + /* TODO: Bug #21487 */
 +
 + if (return_system)
 + filters_hash = php_get_stream_filters_hash();
 + else
 + filters_hash = BG(user_filter_map);

   if (filters_hash) {
   for(zend_hash_internal_pointer_reset(filters_hash);



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





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

[PHP-CVS] cvs: php4 /ext/ftp ftp.c ftp.h php_ftp.c

2003-01-07 Thread Ilia Alshanetsky

iliaa   Tue Jan  7 08:02:43 2003 EDT

  Modified files:  
/php4/ext/ftp   ftp.c ftp.h php_ftp.c 
  Log:
  ZTS cleanup.
  
  
Index: php4/ext/ftp/ftp.c
diff -u php4/ext/ftp/ftp.c:1.72 php4/ext/ftp/ftp.c:1.73
--- php4/ext/ftp/ftp.c:1.72 Mon Jan  6 22:44:12 2003
+++ php4/ext/ftp/ftp.c  Tue Jan  7 08:02:43 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: ftp.c,v 1.72 2003/01/07 03:44:12 iliaa Exp $ */
+/* $Id: ftp.c,v 1.73 2003/01/07 13:02:43 iliaa Exp $ */
 
 #include php.h
 
@@ -680,14 +680,13 @@
 /* {{{ ftp_get
  */
 int
-ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t type, int 
resumepos)
+ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t type, int 
+resumepos TSRMLS_DC)
 {
databuf_t   *data = NULL;
char*ptr;
int lastch;
size_t  rcvd;
chararg[11];
-   TSRMLS_FETCH();
 
if (ftp == NULL) {
return 0;
@@ -767,14 +766,13 @@
 /* {{{ ftp_put
  */
 int
-ftp_put(ftpbuf_t *ftp, const char *path, php_stream *instream, ftptype_t type, int 
startpos)
+ftp_put(ftpbuf_t *ftp, const char *path, php_stream *instream, ftptype_t type, int 
+startpos TSRMLS_DC)
 {
databuf_t   *data = NULL;
int size;
char*ptr;
int ch;
chararg[11];
-   TSRMLS_FETCH();
 
if (ftp == NULL) {
return 0;
@@ -1652,7 +1650,7 @@
ftp-lastch = 0;
ftp-nb = 1;
 
-   return (ftp_nb_continue_read(ftp));
+   return (ftp_nb_continue_read(ftp TSRMLS_CC));
 
 bail:
data_close(ftp, data);
@@ -1663,14 +1661,13 @@
 /* {{{ ftp_nb_continue_read
  */
 int
-ftp_nb_continue_read(ftpbuf_t *ftp)
+ftp_nb_continue_read(ftpbuf_t *ftp TSRMLS_DC)
 {
databuf_t   *data = NULL;
char*ptr;
int lastch;
size_t  rcvd;
ftptype_t   type;
-   TSRMLS_FETCH();
 
data = ftp-data;
 
@@ -1769,7 +1766,7 @@
ftp-lastch = 0;
ftp-nb = 1;
 
-   return (ftp_nb_continue_write(ftp));
+   return (ftp_nb_continue_write(ftp TSRMLS_CC));
 
 bail:
data_close(ftp, data);
@@ -1781,12 +1778,11 @@
 /* {{{ ftp_nb_continue_write
  */
 int
-ftp_nb_continue_write(ftpbuf_t *ftp)
+ftp_nb_continue_write(ftpbuf_t *ftp TSRMLS_DC)
 {
int size;
char*ptr;
int ch;
-   TSRMLS_FETCH();
 
/* check if we can write more data */
if (!data_writeable(ftp, ftp-data-fd)) {
Index: php4/ext/ftp/ftp.h
diff -u php4/ext/ftp/ftp.h:1.32 php4/ext/ftp/ftp.h:1.33
--- php4/ext/ftp/ftp.h:1.32 Mon Jan  6 22:44:12 2003
+++ php4/ext/ftp/ftp.h  Tue Jan  7 08:02:43 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: ftp.h,v 1.32 2003/01/07 03:44:12 iliaa Exp $ */
+/* $Id: ftp.h,v 1.33 2003/01/07 13:02:43 iliaa Exp $ */
 
 #ifndefFTP_H
 #defineFTP_H
@@ -156,13 +156,12 @@
 /* retrieves a file and saves its contents to outfp
  * returns true on success, false on error
  */
-intftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path,
-   ftptype_t type, int resumepos);
+intftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, 
+ftptype_t type, int resumepos TSRMLS_DC);
 
 /* stores the data from a file, socket, or process as a file on the remote server
  * returns true on success, false on error
  */
-intftp_put(ftpbuf_t *ftp, const char *path, php_stream *instream, 
ftptype_t type, int startpos);
+intftp_put(ftpbuf_t *ftp, const char *path, php_stream *instream, 
+ftptype_t type, int startpos TSRMLS_DC);
 
 /* returns the size of the given file, or -1 on error */
 intftp_size(ftpbuf_t *ftp, const char *path);
@@ -191,11 +190,11 @@
 
 /* continues a previous nb_(f)get command
  */
-intftp_nb_continue_read(ftpbuf_t *ftp);
+intftp_nb_continue_read(ftpbuf_t *ftp TSRMLS_DC);
 
 /* continues a previous nb_(f)put command
  */
-intftp_nb_continue_write(ftpbuf_t *ftp);
+intftp_nb_continue_write(ftpbuf_t *ftp TSRMLS_DC);
 
 
 #endif
Index: php4/ext/ftp/php_ftp.c
diff -u php4/ext/ftp/php_ftp.c:1.78 php4/ext/ftp/php_ftp.c:1.79
--- php4/ext/ftp/php_ftp.c:1.78 Mon Jan  6 22:44:12 2003
+++ php4/ext/ftp/php_ftp.c  Tue Jan  7 08:02:43 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php_ftp.c,v 1.78 2003/01/07 03:44:12 iliaa Exp $ */
+/* $Id: php_ftp.c,v 1.79 2003/01/07 13:02:43 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -494,7 +494,7 @@

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

2003-01-07 Thread Ilia Alshanetsky

iliaa   Tue Jan  7 09:34:42 2003 EDT

  Modified files:  
/php4/ext/domxmlphp_domxml.c 
  Log:
  Fixed ZTS build with ZE2.
  
  
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.230 php4/ext/domxml/php_domxml.c:1.231
--- php4/ext/domxml/php_domxml.c:1.230  Mon Jan  6 04:59:53 2003
+++ php4/ext/domxml/php_domxml.cTue Jan  7 09:34:41 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_domxml.c,v 1.230 2003/01/06 09:59:53 chregu Exp $ */
+/* $Id: php_domxml.c,v 1.231 2003/01/07 14:34:41 iliaa Exp $ */
 
 /* TODO
  * - Support Notation Nodes
@@ -782,7 +782,7 @@
return obj;
 }
 
-static void php_xsltstylesheet_set_object(zval *wrapper, void *obj, int rsrc_type)
+static void php_xsltstylesheet_set_object(zval *wrapper, void *obj, int rsrc_type 
+TSRMLS_DC)
 {
zval *handle, *addr;
 
@@ -4992,7 +4992,7 @@
 
object_init_ex(wrapper, domxsltstylesheet_class_entry);
rsrc_type = le_domxsltstylesheetp;
-   php_xsltstylesheet_set_object(wrapper, (void *) obj, rsrc_type);
+   php_xsltstylesheet_set_object(wrapper, (void *) obj, rsrc_type TSRMLS_CC);
 
return (wrapper);
 }



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

[PHP-CVS] cvs: php4(PHP_4_3) /sapi/apache2filter sapi_apache2.c

2003-01-07 Thread Edin Kadribasic

edink   Tue Jan  7 10:23:46 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/sapi/apache2filtersapi_apache2.c 
  Log:
  MFH:
  Fixed bug #17098 (make Apache aware that PHP scripts represent dynamic data
  and should not be cached). Fix suggested by [EMAIL PROTECTED]
  
  
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.91.2.3 
php4/sapi/apache2filter/sapi_apache2.c:1.91.2.4
--- php4/sapi/apache2filter/sapi_apache2.c:1.91.2.3 Tue Dec 31 11:27:02 2002
+++ php4/sapi/apache2filter/sapi_apache2.c  Tue Jan  7 10:23:45 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.91.2.3 2002/12/31 16:27:02 sebastian Exp $ */
+/* $Id: sapi_apache2.c,v 1.91.2.4 2003/01/07 15:23:45 edink Exp $ */
 
 #include fcntl.h
 
@@ -261,6 +261,17 @@
}
 }
 
+static int
+php_apache_disable_caching(ap_filter_t *f)
+{
+   /* Identify PHP scripts as non-cacheable, thus preventing 
+* Apache from sending a 304 status when the browser sends
+* If-Modified-Since header.
+*/
+   f-r-no_local_copy = 1;
+   
+   return OK;
+}
 
 extern zend_module_entry php_apache_module;
 
@@ -630,8 +641,8 @@
ap_hook_post_config(php_apache_server_startup, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_insert_filter(php_insert_filter, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_post_read_request(php_post_read_request, NULL, NULL, APR_HOOK_MIDDLE);
-   ap_register_output_filter(PHP, php_output_filter, NULL, AP_FTYPE_RESOURCE);
-   ap_register_input_filter(PHP, php_input_filter, NULL, AP_FTYPE_RESOURCE);
+   ap_register_output_filter(PHP, php_output_filter, 
+php_apache_disable_caching, AP_FTYPE_RESOURCE);
+   ap_register_input_filter(PHP, php_input_filter, php_apache_disable_caching, 
+AP_FTYPE_RESOURCE);
 }
 
 AP_MODULE_DECLARE_DATA module php4_module = {



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

[PHP-CVS] cvs: php4 / NEWS

2003-01-07 Thread Edin Kadribasic

edink   Tue Jan  7 10:27:28 2003 EDT

  Modified files:  
/php4   NEWS 
  Log:
  #17098 was MFH'ed
  
Index: php4/NEWS
diff -u php4/NEWS:1.1304 php4/NEWS:1.1305
--- php4/NEWS:1.1304Mon Jan  6 20:46:38 2003
+++ php4/NEWS   Tue Jan  7 10:27:27 2003
@@ -12,8 +12,6 @@
 - Removed support for libmcrypt 2.2.x to allow cleaner code. Another reason
   to upgrade libmcrypt to a 2.5.x series as the older ones have too many bugs
   to be safely used with PHP. (Derick)
-- Fixed bug #17098 (make Apache2 aware that PHP scripts represent dynamic data
-  and should not be cached). (Ilia)
 - Fixed bug #20442 (upgraded bundled expat to 1.95.5). (Ilia)
 - Made uniqid() parameters to be optional and allow any prefix length. (Marcus)
 - Improved array_search() so that it can accept objects as a needle under



-- 
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-07 Thread Edin Kadribasic

edink   Tue Jan  7 10:28:14 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   NEWS 
  Log:
  Bugfix #17098 in the branch
  
Index: php4/NEWS
diff -u php4/NEWS:1.1247.2.45 php4/NEWS:1.1247.2.46
--- php4/NEWS:1.1247.2.45   Tue Jan  7 06:26:03 2003
+++ php4/NEWS   Tue Jan  7 10:28:13 2003
@@ -9,6 +9,8 @@
   . Disallow linkage of Berkeley db submodules against libraries with
 different major version.
   . Disallow configuring of more than one Berkeley db handler. 
+- 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)
 - Fixed bug #20503 (imagesetbrush() not available on Windows). (Edin)
 - Fixed bug #21169 (Compile Failure, and lots of warnings on UnixWare).



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

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

2003-01-07 Thread Levi Dixon

ldixon  Tue Jan  7 10:56:00 2003 EDT

  Modified files:  
/php4/ext/oci8  config.m4 oci8.c 
  Log:
  Added support for Shared Data Mode for OCI8_VERSION = 8.1, which will provide 
memory savings by sharing common statement data
  
  
Index: php4/ext/oci8/config.m4
diff -u php4/ext/oci8/config.m4:1.39 php4/ext/oci8/config.m4:1.40
--- php4/ext/oci8/config.m4:1.39Fri Dec  6 13:25:39 2002
+++ php4/ext/oci8/config.m4 Tue Jan  7 10:55:59 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.39 2002/12/06 18:25:39 moriyoshi Exp $
+dnl $Id: config.m4,v 1.40 2003/01/07 15:55:59 ldixon Exp $
 dnl
 
 AC_DEFUN(AC_OCI8_VERSION,[
@@ -74,6 +74,7 @@
   PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
   AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
   AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])
+  AC_DEFINE(HAVE_OCI8_SHARED_MODE,1,[ ])
   ;;
 
 9.0)
@@ -84,6 +85,7 @@
   PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
   AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
   AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])
+  AC_DEFINE(HAVE_OCI8_SHARED_MODE,1,[ ])
   AC_DEFINE(HAVE_OCI9,1,[ ])
   ;;
 
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.197 php4/ext/oci8/oci8.c:1.198
--- php4/ext/oci8/oci8.c:1.197  Tue Dec 31 11:07:06 2002
+++ php4/ext/oci8/oci8.cTue Jan  7 10:55:59 2003
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: oci8.c,v 1.197 2002/12/31 16:07:06 sebastian Exp $ */
+/* $Id: oci8.c,v 1.198 2003/01/07 15:55:59 ldixon Exp $ */
 
 /* TODO list:
  *
@@ -464,12 +464,24 @@
zend_class_entry oci_coll_class_entry;
 #endif
 
+#ifdef HAVE_OCI8_SHARED_MODE
+
+#ifdef WITH_COLLECTIONS
+#define PHP_OCI_INIT_MODE OCI_SHARED | OCI_OBJECT
+#else
+#define PHP_OCI_INIT_MODE OCI_SHARED
+#endif
+
+#else
+
 #ifdef WITH_COLLECTIONS
 #define PHP_OCI_INIT_MODE OCI_DEFAULT | OCI_OBJECT
 #else
 #define PHP_OCI_INIT_MODE OCI_DEFAULT
 #endif
 
+#endif
+
 #if OCI_USE_EMALLOC
OCIInitialize(PHP_OCI_INIT_MODE, NULL, ocimalloc, ocirealloc, ocifree);
 #else
@@ -628,7 +640,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.197 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.198 $);
 #ifndef PHP_WIN32
php_info_print_table_row(2, Oracle Version, PHP_OCI8_VERSION );
php_info_print_table_row(2, Compile-time ORACLE_HOME, PHP_OCI8_DIR );



-- 
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

2003-01-07 Thread Pierre-Alain Joye

pajoye  Tue Jan  7 17:34:01 2003 EDT

  Modified files:  
/php4/ext/gdgd.c 
  Log:
  Fix line drawed twice (L. Atkinson)
  
  
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.241 php4/ext/gd/gd.c:1.242
--- php4/ext/gd/gd.c:1.241  Tue Dec 31 11:06:39 2002
+++ php4/ext/gd/gd.cTue Jan  7 17:34:00 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.241 2002/12/31 16:06:39 sebastian Exp $ */
+/* $Id: gd.c,v 1.242 2003/01/07 22:34:00 pajoye Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, 
Cold Spring Harbor Labs. */
@@ -2149,8 +2149,6 @@
else 
 #endif 
gdImageLine(im, Z_LVAL_PP(x1), Z_LVAL_PP(y1), Z_LVAL_PP(x2), 
Z_LVAL_PP(y2), Z_LVAL_PP(col));
-   
-   gdImageLine(im, Z_LVAL_PP(x1), Z_LVAL_PP(y1), Z_LVAL_PP(x2), Z_LVAL_PP(y2), 
Z_LVAL_PP(col));
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 filters.c

2003-01-07 Thread Moriyoshi Koizumi

moriyoshi   Tue Jan  7 17:53:42 2003 EDT

  Modified files:  
/php4/ext/standard  filters.c 
  Log:
  Instances should not be freed in dtor()...
  
  
  
Index: php4/ext/standard/filters.c
diff -u php4/ext/standard/filters.c:1.7 php4/ext/standard/filters.c:1.8
--- php4/ext/standard/filters.c:1.7 Tue Jan  7 17:52:24 2003
+++ php4/ext/standard/filters.c Tue Jan  7 17:53:42 2003
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: filters.c,v 1.7 2003/01/07 22:52:24 moriyoshi Exp $ */
+/* $Id: filters.c,v 1.8 2003/01/07 22:53:42 moriyoshi Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -265,8 +265,7 @@
 
 static void php_base64_filter_dtor(php_base64_filter *inst)
 {
-   assert(inst != NULL);
-   efree(inst);
+   /* do nothing */
 }
 
 static size_t strfilter_base64_write(php_stream *stream, php_stream_filter 
*thisfilter,
@@ -448,6 +447,9 @@
 static void strfilter_base64_dtor(php_stream_filter *thisfilter TSRMLS_DC)
 {
php_base64_filter_dtor((php_base64_filter *)thisfilter-abstract);
+
+   assert(thisfilter-abstract != NULL);
+   efree(thisfilter-abstract);
 }
 
 static php_stream_filter_ops strfilter_base64_ops = {



-- 
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: CVSROOT / avail

2003-01-07 Thread Stig Bakken

ssb Tue Jan  7 18:14:32 2003 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  * php4/pearweb karma for nicos
  
  
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.571 CVSROOT/avail:1.572
--- CVSROOT/avail:1.571 Tue Jan  7 18:11:50 2003
+++ CVSROOT/avail   Tue Jan  7 18:14:31 2003
@@ -17,7 +17,7 @@
 # The PHP Developers have full access to the full source trees for
 # PHP and PEAR, as well as the documentation.
 
-avail|mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,shuric,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,svbegg,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jedi,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita|phpfi,php3,php4,phpdoc,pear,peardoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh
+avail|mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,shuric,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,svbegg,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jedi,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,nicos|phpfi,php3,php4,phpdoc,pear,peardoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh
 
 
 # People who work on the Engine
@@ -48,7 +48,7 @@
 
avail|moh,sterling,jon,rael,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,jeichorn,bjoern,chregu,bkelly,tfromm,subjective,cox,fireclaw,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,maehdros,jasonlotito,dallen,lsmith,timmyg,pajoye,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,floripa,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,djanubis,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,ruibarreiros,mbretter,nicos,philip,k.schroeder,xnoguer,sjr,meebey,jellybob,darkelder,max|pear,peardoc
 
 avail|cox,mj,vblavet,dickmann|php4/pear
-avail|alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal|pearweb
+avail|alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,nicos|pearweb
 
avail|alexmerz,arnaud,bjoern,chregu,dams,david,jmcastagnetto,rashid,tuupola|pearweb/weeklynews
 
 avail|sroebke|peardoc



-- 
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-07 Thread Moriyoshi Koizumi

moriyoshi   Tue Jan  7 17:52:24 2003 EDT

  Modified files:  
/php4/ext/standard  filters.c 
  Log:
  Made error msg format more consistent
  
  
Index: php4/ext/standard/filters.c
diff -u php4/ext/standard/filters.c:1.6 php4/ext/standard/filters.c:1.7
--- php4/ext/standard/filters.c:1.6 Mon Jan  6 20:41:18 2003
+++ php4/ext/standard/filters.c Tue Jan  7 17:52:24 2003
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: filters.c,v 1.6 2003/01/07 01:41:18 moriyoshi Exp $ */
+/* $Id: filters.c,v 1.7 2003/01/07 22:52:24 moriyoshi Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -375,7 +375,7 @@
 
if (!(i  0xc0)) {
if (ustat) {
-   php_error(E_WARNING, stream 
filter(stream.base64): invalid base64 sequence);
+   php_error(E_WARNING, stream filter(%s): 
+invalid base64 sequence, thisfilter-fops-label);
return 0;
}
if (6 = pack_bcnt) {
@@ -390,7 +390,7 @@
}
} else if (ustat) {
if (pack_bcnt == 8 || pack_bcnt == 2) {
-   php_error(E_WARNING, stream 
filter(stream.base64): unexpected end of stream);
+   php_error(E_WARNING, stream filter(%s): 
+unexpected end of stream, thisfilter-fops-label);
return 0;
}
}
@@ -547,7 +547,7 @@
unsigned int nbl = (*ps = 'A' ? *ps - 0x37 : *ps - 
0x30);
 
if (nbl  15) {
-   php_error(E_WARNING, stream 
filter(stream.quoted-printable): invalid character sequence); 
+   php_error(E_WARNING, stream filter(%s): 
+invalid character sequence, thisfilter-fops-label); 
return 0;
}
v = (v  4) | nbl;



-- 
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 Ilia Alshanetsky

iliaa   Tue Jan  7 19:38:36 2003 EDT

  Modified files:  
/php4/ext/odbc  php_odbc.c 
  Log:
  Version is char ;).
  
  
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.148 php4/ext/odbc/php_odbc.c:1.149
--- php4/ext/odbc/php_odbc.c:1.148  Tue Jan  7 18:00:11 2003
+++ php4/ext/odbc/php_odbc.cTue Jan  7 19:38:36 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.148 2003/01/07 23:00:11 kalowsky Exp $ */
+/* $Id: php_odbc.c,v 1.149 2003/01/08 00:38:36 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -141,7 +141,7 @@
PHP_RINIT(odbc), 
PHP_RSHUTDOWN(odbc), 
PHP_MINFO(odbc), 
-   1.0,
+   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 /sapi/cgi cgi_main.c /sapi/cli php_cli.c

2003-01-07 Thread Ilia Alshanetsky

iliaa   Tue Jan  7 19:41:53 2003 EDT

  Modified files:  
/php4/sapi/cli  php_cli.c 
/php4/sapi/cgi  cgi_main.c 
  Log:
  Fixed bug #21297. The fix also fixes miscalculation of lines numbers by 1
  due the previously mentioned bug.
  
  
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.60 php4/sapi/cli/php_cli.c:1.61
--- php4/sapi/cli/php_cli.c:1.60Sun Jan  5 11:10:35 2003
+++ php4/sapi/cli/php_cli.c Tue Jan  7 19:41:53 2003
@@ -695,6 +695,13 @@
while (c != 10  c != 13) {
c = fgetc(file_handle.handle.fp);   /* 
skip to end of line */
}
+   /* handle situations where line is terminated by \r\n 
+*/
+   if (c == 13) {
+   if (fgetc(file_handle.handle.fp) != 10) {
+   long pos = 
+ftell(file_handle.handle.fp);
+   fseek(file_handle.handle.fp, pos - 1, 
+SEEK_SET);
+   }
+   }
CG(start_lineno) = 2;
} else {
rewind(file_handle.handle.fp);
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.206 php4/sapi/cgi/cgi_main.c:1.207
--- php4/sapi/cgi/cgi_main.c:1.206  Tue Jan  7 11:33:28 2003
+++ php4/sapi/cgi/cgi_main.cTue Jan  7 19:41:53 2003
@@ -1413,6 +1413,13 @@
while (c != 10  c != 13) {
c = fgetc(file_handle.handle.fp);   /* 
skip to end of line */
}
+   /* handle situations where line is terminated by \r\n 
+*/
+   if (c == 13) {
+   if (fgetc(file_handle.handle.fp) != 10) {
+   long pos = 
+ftell(file_handle.handle.fp);
+   fseek(file_handle.handle.fp, pos - 1, 
+SEEK_SET);
+   }
+   }
CG(start_lineno) = 2;
} else {
rewind(file_handle.handle.fp);



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

[PHP-CVS] cvs: php4(PHP_4_3) /sapi/cgi cgi_main.c /sapi/cli php_cli.c

2003-01-07 Thread Ilia Alshanetsky

iliaa   Tue Jan  7 19:44:59 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/sapi/cli  php_cli.c 
/php4/sapi/cgi  cgi_main.c 
  Log:
  MFH
  
  
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.51.2.5 php4/sapi/cli/php_cli.c:1.51.2.6
--- php4/sapi/cli/php_cli.c:1.51.2.5Tue Dec 31 11:27:07 2002
+++ php4/sapi/cli/php_cli.c Tue Jan  7 19:44:58 2003
@@ -697,6 +697,13 @@
while (c != 10  c != 13) {
c = fgetc(file_handle.handle.fp);   /* 
skip to end of line */
}
+   /* handle situations where line is terminated by \r\n 
+*/
+   if (c == 13) {
+   if (fgetc(file_handle.handle.fp) != 10) {
+   long pos = 
+ftell(file_handle.handle.fp);
+   fseek(file_handle.handle.fp, pos - 1, 
+SEEK_SET);
+   }
+   }
CG(zend_lineno) = -2;
} else {
rewind(file_handle.handle.fp);
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.190.2.10 php4/sapi/cgi/cgi_main.c:1.190.2.11
--- php4/sapi/cgi/cgi_main.c:1.190.2.10 Tue Dec 31 11:27:05 2002
+++ php4/sapi/cgi/cgi_main.cTue Jan  7 19:44:58 2003
@@ -1413,6 +1413,13 @@
while (c != 10  c != 13) {
c = fgetc(file_handle.handle.fp);   /* 
skip to end of line */
}
+   /* handle situations where line is terminated by \r\n 
+*/
+   if (c == 13) {
+   if (fgetc(file_handle.handle.fp) != 10) {
+   long pos = 
+ftell(file_handle.handle.fp);
+   fseek(file_handle.handle.fp, pos - 1, 
+SEEK_SET);
+   }
+   }
CG(zend_lineno) = -2;
} else {
rewind(file_handle.handle.fp);



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

[PHP-CVS] cvs: php4 /main main.c

2003-01-07 Thread Ilia Alshanetsky

iliaa   Tue Jan  7 21:44:09 2003 EDT

  Modified files:  
/php4/main  main.c 
  Log:
  Fixed bug #21499 (more descriptive message in the event of require/include
  failure).
  
  
Index: php4/main/main.c
diff -u php4/main/main.c:1.522 php4/main/main.c:1.523
--- php4/main/main.c:1.522  Sun Jan  5 11:11:10 2003
+++ php4/main/main.cTue Jan  7 21:44:09 2003
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.522 2003/01/05 16:11:10 zeev Exp $ */
+/* $Id: main.c,v 1.523 2003/01/08 02:44:09 iliaa Exp $ */
 
 /* {{{ includes
  */
@@ -752,13 +752,13 @@
case ZMSG_FAILED_INCLUDE_FOPEN: {
TSRMLS_FETCH();
 
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed 
opening '%s' for inclusion (include_path='%s'), php_strip_url_passwd((char *) data), 
STR_PRINT(PG(include_path)));
+   php_error_docref(function.include TSRMLS_CC, 
+E_WARNING, Failed opening '%s' for inclusion (include_path='%s'), 
+php_strip_url_passwd((char *) data), STR_PRINT(PG(include_path)));
}
break;
case ZMSG_FAILED_REQUIRE_FOPEN: {
TSRMLS_FETCH();
 
-   php_error_docref(NULL TSRMLS_CC, E_COMPILE_ERROR, 
Failed opening required '%s' (include_path='%s'), php_strip_url_passwd((char *) 
data), STR_PRINT(PG(include_path)));
+   php_error_docref(function.require TSRMLS_CC, 
+E_COMPILE_ERROR, Failed opening required '%s' (include_path='%s'), 
+php_strip_url_passwd((char *) data), STR_PRINT(PG(include_path)));
}
break;
case ZMSG_FAILED_HIGHLIGHT_FOPEN: {



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

[PHP-CVS] cvs: php4(PHP_4_3) /main main.c

2003-01-07 Thread Ilia Alshanetsky

iliaa   Tue Jan  7 21:44:51 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/main  main.c 
  Log:
  MFH
  
  
Index: php4/main/main.c
diff -u php4/main/main.c:1.512.2.6 php4/main/main.c:1.512.2.7
--- php4/main/main.c:1.512.2.6  Tue Dec 31 11:25:15 2002
+++ php4/main/main.cTue Jan  7 21:44:50 2003
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.512.2.6 2002/12/31 16:25:15 sebastian Exp $ */
+/* $Id: main.c,v 1.512.2.7 2003/01/08 02:44:50 iliaa Exp $ */
 
 /* {{{ includes
  */
@@ -751,13 +751,13 @@
case ZMSG_FAILED_INCLUDE_FOPEN: {
TSRMLS_FETCH();
 
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed 
opening '%s' for inclusion (include_path='%s'), php_strip_url_passwd((char *) data), 
STR_PRINT(PG(include_path)));
+   php_error_docref(function.include TSRMLS_CC, 
+E_WARNING, Failed opening '%s' for inclusion (include_path='%s'), 
+php_strip_url_passwd((char *) data), STR_PRINT(PG(include_path)));
}
break;
case ZMSG_FAILED_REQUIRE_FOPEN: {
TSRMLS_FETCH();
 
-   php_error_docref(NULL TSRMLS_CC, E_COMPILE_ERROR, 
Failed opening required '%s' (include_path='%s'), php_strip_url_passwd((char *) 
data), STR_PRINT(PG(include_path)));
+   php_error_docref(function.require TSRMLS_CC, 
+E_COMPILE_ERROR, Failed opening required '%s' (include_path='%s'), 
+php_strip_url_passwd((char *) data), STR_PRINT(PG(include_path)));
}
break;
case ZMSG_FAILED_HIGHLIGHT_FOPEN: {



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

[PHP-CVS] cvs: php4(PHP_4_3) /win32 sendmail.c

2003-01-07 Thread Edin Kadribasic

edink   Tue Jan  7 06:20:50 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/win32 sendmail.c 
  Log:
  Fixed bug #21442 (Crash of mail() on Windows when the first parameter
  is empty).
  
  
Index: php4/win32/sendmail.c
diff -u php4/win32/sendmail.c:1.47.2.2 php4/win32/sendmail.c:1.47.2.3
--- php4/win32/sendmail.c:1.47.2.2  Fri Dec  6 17:57:47 2002
+++ php4/win32/sendmail.c   Tue Jan  7 06:20:50 2003
@@ -17,7 +17,7 @@
  *
  */
 
-/* $Id: sendmail.c,v 1.47.2.2 2002/12/06 22:57:47 fmk Exp $ */
+/* $Id: sendmail.c,v 1.47.2.3 2003/01/07 11:20:50 edink Exp $ */
 
 #include php.h   /*php specific */
 #include stdio.h
@@ -548,12 +548,16 @@
}
 
if ((res = Post(DATA\r\n)) != SUCCESS) {
-   efree(stripped_header);
+   if (stripped_header) {
+   efree(stripped_header);
+   }
return (res);
}
if ((res = Ack(server_response)) != SUCCESS) {
SMTP_ERROR_RESPONSE(server_response);
-   efree(stripped_header);
+   if (stripped_header) {
+   efree(stripped_header);
+   }
return (res);
}
 



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

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

2003-01-07 Thread Zeev Suraski

zeevTue Jan  7 06:37:09 2003 EDT

  Modified files:  
/php4/ext/standard  basic_functions.c 
  Log:
  whitespace
  
  
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.555 
php4/ext/standard/basic_functions.c:1.556
--- php4/ext/standard/basic_functions.c:1.555   Mon Jan  6 00:59:17 2003
+++ php4/ext/standard/basic_functions.c Tue Jan  7 06:37:09 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.555 2003/01/06 05:59:17 hyanantha Exp $ */
+/* $Id: basic_functions.c,v 1.556 2003/01/07 11:37:09 zeev Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -1029,38 +1029,38 @@
register_html_constants(INIT_FUNC_ARGS_PASSTHRU);
register_string_constants(INIT_FUNC_ARGS_PASSTHRU);
 
-   PHP_MINIT(regex) (INIT_FUNC_ARGS_PASSTHRU);
-   PHP_MINIT(file) (INIT_FUNC_ARGS_PASSTHRU);
-   PHP_MINIT(pack) (INIT_FUNC_ARGS_PASSTHRU);
-   PHP_MINIT(browscap) (INIT_FUNC_ARGS_PASSTHRU);
-   PHP_MINIT(standard_filters) (INIT_FUNC_ARGS_PASSTHRU);
-   PHP_MINIT(user_filters) (INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(regex)(INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(file)(INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(pack)(INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(browscap)(INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(standard_filters)(INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(user_filters)(INIT_FUNC_ARGS_PASSTHRU);
 
 #if defined(HAVE_LOCALECONV)  defined(ZTS)
-   PHP_MINIT(localeconv) (INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(localeconv)(INIT_FUNC_ARGS_PASSTHRU);
 #endif
 
 #if defined(HAVE_NL_LANGINFO)
-   PHP_MINIT(nl_langinfo) (INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(nl_langinfo)(INIT_FUNC_ARGS_PASSTHRU);
 #endif
 
 #if HAVE_CRYPT
-   PHP_MINIT(crypt) (INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(crypt)(INIT_FUNC_ARGS_PASSTHRU);
 #endif
 
-   PHP_MINIT(lcg) (INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(lcg)(INIT_FUNC_ARGS_PASSTHRU);
 
-   PHP_MINIT(dir) (INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(dir)(INIT_FUNC_ARGS_PASSTHRU);
 #ifdef HAVE_SYSLOG_H
-   PHP_MINIT(syslog) (INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(syslog)(INIT_FUNC_ARGS_PASSTHRU);
 #endif
-   PHP_MINIT(array) (INIT_FUNC_ARGS_PASSTHRU);
-   PHP_MINIT(assert) (INIT_FUNC_ARGS_PASSTHRU);
-   PHP_MINIT(url_scanner_ex) (INIT_FUNC_ARGS_PASSTHRU);
-   PHP_MINIT(proc_open) (INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(array)(INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(assert)(INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(url_scanner_ex)(INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(proc_open)(INIT_FUNC_ARGS_PASSTHRU);
 
-   PHP_MINIT(user_streams) (INIT_FUNC_ARGS_PASSTHRU);
-   PHP_MINIT(imagetypes) (INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(user_streams)(INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(imagetypes)(INIT_FUNC_ARGS_PASSTHRU);
 
php_register_url_stream_wrapper(php, php_stream_php_wrapper TSRMLS_CC);
 #ifndef PHP_CURL_URL_WRAPPERS
@@ -1074,7 +1074,7 @@
 
 #if HAVE_RES_SEARCH  !(defined(__BEOS__)||defined(PHP_WIN32) || defined(NETWARE))
 # if HAVE_DNS_FUNCS
-   PHP_MINIT(dns) (INIT_FUNC_ARGS_PASSTHRU);
+   PHP_MINIT(dns)(INIT_FUNC_ARGS_PASSTHRU);
 # endif
 #endif
 
@@ -1102,15 +1102,15 @@
 
UNREGISTER_INI_ENTRIES();
 
-   PHP_MSHUTDOWN(regex) (SHUTDOWN_FUNC_ARGS_PASSTHRU);
-   PHP_MSHUTDOWN(browscap) (SHUTDOWN_FUNC_ARGS_PASSTHRU);
-   PHP_MSHUTDOWN(array) (SHUTDOWN_FUNC_ARGS_PASSTHRU);
-   PHP_MSHUTDOWN(assert) (SHUTDOWN_FUNC_ARGS_PASSTHRU);
-   PHP_MSHUTDOWN(url_scanner_ex) (SHUTDOWN_FUNC_ARGS_PASSTHRU);
-   PHP_MSHUTDOWN(file) (SHUTDOWN_FUNC_ARGS_PASSTHRU);
-   PHP_MSHUTDOWN(standard_filters) (SHUTDOWN_FUNC_ARGS_PASSTHRU);
+   PHP_MSHUTDOWN(regex)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
+   PHP_MSHUTDOWN(browscap)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
+   PHP_MSHUTDOWN(array)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
+   PHP_MSHUTDOWN(assert)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
+   PHP_MSHUTDOWN(url_scanner_ex)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
+   PHP_MSHUTDOWN(file)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
+   PHP_MSHUTDOWN(standard_filters)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
 #if defined(HAVE_LOCALECONV)  defined(ZTS)
-   PHP_MSHUTDOWN(localeconv) (SHUTDOWN_FUNC_ARGS_PASSTHRU);
+   PHP_MSHUTDOWN(localeconv)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
 #endif
 
return SUCCESS;
@@ -1144,17 +1144,17 @@
BG(user_shutdown_function_names) = NULL;
 
 #if HAVE_CRYPT
-   PHP_RINIT(crypt) (INIT_FUNC_ARGS_PASSTHRU);
+   PHP_RINIT(crypt)(INIT_FUNC_ARGS_PASSTHRU);
 #endif
 
-   PHP_RINIT(lcg) (INIT_FUNC_ARGS_PASSTHRU);
+   PHP_RINIT(lcg)(INIT_FUNC_ARGS_PASSTHRU);
 
-   PHP_RINIT(filestat) (INIT_FUNC_ARGS_PASSTHRU);
+   PHP_RINIT(filestat)(INIT_FUNC_ARGS_PASSTHRU);
 #ifdef HAVE_SYSLOG_H
-   PHP_RINIT(syslog) (INIT_FUNC_ARGS_PASSTHRU);
+

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

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

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

[PHP-CVS] cvs: php4 /ext/ftp ftp.c ftp.h php_ftp.c

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

[PHP-CVS] cvs: php4(PHP_4_3) /sapi/apache2filter sapi_apache2.c

[PHP-CVS] cvs: php4 / NEWS

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

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

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

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

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

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

[PHP-CVS] cvs: CVSROOT / avail

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

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

[PHP-CVS] cvs: php4 /sapi/cgi cgi_main.c /sapi/cli php_cli.c

[PHP-CVS] cvs: php4(PHP_4_3) /sapi/cgi cgi_main.c /sapi/cli php_cli.c

[PHP-CVS] cvs: php4 /main main.c

[PHP-CVS] cvs: php4(PHP_4_3) /main main.c

[PHP-CVS] cvs: php4(PHP_4_3) /win32 sendmail.c

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

22 matches

Site Navigation

Mail list logo

Footer information