[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2004-12-29 Thread changelog 
changelog   Wed Dec 29 20:34:41 2004 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1847r2=1.1848ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.1847 php-src/ChangeLog:1.1848
--- php-src/ChangeLog:1.1847Tue Dec 28 20:37:10 2004
+++ php-src/ChangeLog   Wed Dec 29 20:34:40 2004
@@ -1,3 +1,48 @@
+2004-12-29  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* ext/imap/php_imap.c
+  ext/imap/php_imap.c:
+  Fixed typo.
+
+* ext/gd/gd.c:
+  Fixed compiler warnings.
+
+* ext/imap/php_imap.c:
+  Fixed memory leaks.
+
+* ext/imap/php_imap.c:
+  MFB: don't perform pointless operations.
+
+* (PHP_4_3)
+  ext/imap/php_imap.c:
+  Don't perform pointless operations (MFH5).
+
+* (PHP_5_0)
+  ext/imap/php_imap.c:
+  MFH: Fixed bug #31142 (imap_mail_compose() fails to generate correct
+  output).
+
+* ext/gd/gd.c:
+  Don't forget to unload t1lib.
+
+2004-12-29  Frank M. Kromann  [EMAIL PROTECTED]
+
+* ext/fbsql/php_fbsql.c:
+  Fix typo
+
+2004-12-29  Georg Richter  [EMAIL PROTECTED]
+
+* (PHP_5_0)
+  ext/mysqli/mysqli_prop.c:
+  MFH: Added property 'id' to retrieve statement id (required by PEAR DB, 
to
+  support
+  mysqli prepared statements)
+
+* ext/mysqli/mysqli_prop.c:
+  added property 'id' to retrieve statement id (required by PEAR DB, to
+  support
+  mysqli prepared statements)
+
 2004-12-28  Derick Rethans  [EMAIL PROTECTED]
 
 * scripts/Makefile.frag:
@@ -14865,7 +14910,7 @@
 2004-03-18  Pierre-Alain Joye  [EMAIL PROTECTED]
 
 * ext/gd/tests/bug27582_2.phpt:
-  - Fix the test description and $Id: ChangeLog,v 1.1847 2004/12/29 
01:37:10 changelog Exp $
+  - Fix the test description and $Id: ChangeLog,v 1.1848 2004/12/30 
01:34:40 changelog Exp $
 
 2004-03-18  Derick Rethans  [EMAIL PROTECTED]

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

2004-12-29 Thread Georg Richter 
georg   Wed Dec 29 06:47:03 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/mysqli mysqli_prop.c 
  Log:
  MFH: Added property 'id' to retrieve statement id (required by PEAR DB, to 
support
  mysqli prepared statements)
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.14.2.3r2=1.14.2.4ty=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.14.2.3 
php-src/ext/mysqli/mysqli_prop.c:1.14.2.4
--- php-src/ext/mysqli/mysqli_prop.c:1.14.2.3   Mon Dec  6 00:15:36 2004
+++ php-src/ext/mysqli/mysqli_prop.cWed Dec 29 06:47:03 2004
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli_prop.c,v 1.14.2.3 2004/12/06 05:15:36 georg Exp $ 
+  $Id: mysqli_prop.c,v 1.14.2.4 2004/12/29 11:47:03 georg Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -200,6 +200,26 @@
 MYSQLI_MAP_PROPERTY_FUNC_LONG(result_num_rows_read, mysql_num_rows, 
MYSQLI_GET_RESULT(), my_ulonglong);
 
 /* statement properties */
+
+/* {{{ property stmt_id_read */
+int stmt_id_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+{
+   MY_STMT *p;
+
+   ALLOC_ZVAL(*retval); 
+   CHECK_OBJECT();
+
+   p = (MY_STMT*)((MYSQLI_RESOURCE *)(obj-ptr))-ptr;
+
+   if (!p) {
+   ZVAL_NULL(*retval);
+   } else {
+   ZVAL_LONG(*retval, p-stmt-stmt_id);
+   }
+   return SUCCESS;
+}
+/* }}} */
+
 MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_affected_rows_read, 
mysql_stmt_affected_rows, MYSQLI_GET_STMT(), my_ulonglong);
 MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_insert_id_read, mysql_stmt_insert_id, 
MYSQLI_GET_STMT(), my_ulonglong);
 MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_num_rows_read, mysql_stmt_num_rows, 
MYSQLI_GET_STMT(), my_ulonglong);
@@ -244,15 +264,11 @@
{insert_id, stmt_insert_id_read, NULL},
{num_rows, stmt_num_rows_read, NULL},
{param_count, stmt_param_count_read, NULL},
-
-/*  TODO: stmt-field_count doesn't work currently, remove comments until 
mysqli_stmt_field_count
-is implemented in client library
-*/
{field_count, stmt_field_count_read, NULL},
-
{errno, stmt_errno_read, NULL},
{error, stmt_error_read, NULL},
{sqlstate, stmt_sqlstate_read, NULL},
+   {id, stmt_id_read, NULL},
{NULL, NULL, NULL}
 };
 

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

[PHP-CVS] cvs: php-src /ext/mysqli mysqli_prop.c

2004-12-29 Thread Georg Richter 
georg   Wed Dec 29 06:46:14 2004 EDT

  Modified files:  
/php-src/ext/mysqli mysqli_prop.c 
  Log:
  added property 'id' to retrieve statement id (required by PEAR DB, to support
  mysqli prepared statements)
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.17r2=1.18ty=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.17 
php-src/ext/mysqli/mysqli_prop.c:1.18
--- php-src/ext/mysqli/mysqli_prop.c:1.17   Mon Dec  6 00:15:03 2004
+++ php-src/ext/mysqli/mysqli_prop.cWed Dec 29 06:46:13 2004
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli_prop.c,v 1.17 2004/12/06 05:15:03 georg Exp $ 
+  $Id: mysqli_prop.c,v 1.18 2004/12/29 11:46:13 georg Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -196,6 +196,26 @@
 MYSQLI_MAP_PROPERTY_FUNC_LONG(result_num_rows_read, mysql_num_rows, 
MYSQLI_GET_RESULT(), my_ulonglong);
 
 /* statement properties */
+
+/* {{{ property stmt_id_read */
+int stmt_id_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+{
+   MY_STMT *p;
+
+   ALLOC_ZVAL(*retval); 
+   CHECK_OBJECT();
+
+   p = (MY_STMT*)((MYSQLI_RESOURCE *)(obj-ptr))-ptr;
+
+   if (!p) {
+   ZVAL_NULL(*retval);
+   } else {
+   ZVAL_LONG(*retval, p-stmt-stmt_id);
+   }
+   return SUCCESS;
+}
+/* }}} */
+
 MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_affected_rows_read, 
mysql_stmt_affected_rows, MYSQLI_GET_STMT(), my_ulonglong);
 MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_insert_id_read, mysql_stmt_insert_id, 
MYSQLI_GET_STMT(), my_ulonglong);
 MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_num_rows_read, mysql_stmt_num_rows, 
MYSQLI_GET_STMT(), my_ulonglong);
@@ -240,15 +260,11 @@
{insert_id, stmt_insert_id_read, NULL},
{num_rows, stmt_num_rows_read, NULL},
{param_count, stmt_param_count_read, NULL},
-
-/*  TODO: stmt-field_count doesn't work currently, remove comments until 
mysqli_stmt_field_count
-is implemented in client library
-*/
{field_count, stmt_field_count_read, NULL},
-
{errno, stmt_errno_read, NULL},
{error, stmt_error_read, NULL},
{sqlstate, stmt_sqlstate_read, NULL},
+   {id, stmt_id_read, NULL},
{NULL, NULL, NULL}
 };
 

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

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

2004-12-29 Thread Antony Dovgal 
tony2001Wed Dec 29 08:52:34 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/splspl_iterators.c 
  Log:
  fix typos in protos
  
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.38.2.5r2=1.38.2.6ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.38.2.5 
php-src/ext/spl/spl_iterators.c:1.38.2.6
--- php-src/ext/spl/spl_iterators.c:1.38.2.5Thu Nov 25 15:28:37 2004
+++ php-src/ext/spl/spl_iterators.c Wed Dec 29 08:52:34 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_iterators.c,v 1.38.2.5 2004/11/25 20:28:37 zeev Exp $ */
+/* $Id: spl_iterators.c,v 1.38.2.6 2004/12/29 13:52:34 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -1229,7 +1229,7 @@
 } /* }}} */
 
 /* {{{ proto boolean CachingIterator::hasNext()
-   Cehck whether the inner iterator has a valid next element */
+   Check whether the inner iterator has a valid next element */
 SPL_METHOD(CachingIterator, hasNext)
 {
spl_dual_it_object   *intern;
@@ -1284,7 +1284,7 @@
 } /* }}} */
 
 /* {{{ proto bolean CachingRecursiveIterator::hasChildren()
-   Cehck whether the current element of the inner iterator has children */
+   Check whether the current element of the inner iterator has children */
 SPL_METHOD(CachingRecursiveIterator, hasChildren)
 {
spl_dual_it_object   *intern;

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

[PHP-CVS] cvs: php-src /ext/spl spl_iterators.c

2004-12-29 Thread Antony Dovgal 
tony2001Wed Dec 29 08:53:40 2004 EDT

  Modified files:  
/php-src/ext/splspl_iterators.c 
  Log:
  MFB: fix typos
  
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.59r2=1.60ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.59 
php-src/ext/spl/spl_iterators.c:1.60
--- php-src/ext/spl/spl_iterators.c:1.59Thu Nov 11 14:36:27 2004
+++ php-src/ext/spl/spl_iterators.c Wed Dec 29 08:53:40 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_iterators.c,v 1.59 2004/11/11 19:36:27 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.60 2004/12/29 13:53:40 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -1339,7 +1339,7 @@
 } /* }}} */
 
 /* {{{ proto boolean CachingIterator::hasNext()
-   Cehck whether the inner iterator has a valid next element */
+   Check whether the inner iterator has a valid next element */
 SPL_METHOD(CachingIterator, hasNext)
 {
spl_dual_it_object   *intern;
@@ -1394,7 +1394,7 @@
 } /* }}} */
 
 /* {{{ proto bolean CachingRecursiveIterator::hasChildren()
-   Cehck whether the current element of the inner iterator has children */
+   Check whether the current element of the inner iterator has children */
 SPL_METHOD(CachingRecursiveIterator, hasChildren)
 {
spl_dual_it_object   *intern;

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

[PHP-CVS] cvs: php-src /ext/spl spl_iterators.c

2004-12-29 Thread Antony Dovgal 
tony2001Wed Dec 29 11:11:43 2004 EDT

  Modified files:  
/php-src/ext/splspl_iterators.c 
  Log:
  more typos
  
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.60r2=1.61ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.60 
php-src/ext/spl/spl_iterators.c:1.61
--- php-src/ext/spl/spl_iterators.c:1.60Wed Dec 29 08:53:40 2004
+++ php-src/ext/spl/spl_iterators.c Wed Dec 29 11:11:42 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_iterators.c,v 1.60 2004/12/29 13:53:40 tony2001 Exp $ */
+/* $Id: spl_iterators.c,v 1.61 2004/12/29 16:11:42 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -1350,7 +1350,7 @@
 } /* }}} */
 
 /* {{{ proto string CachingIterator::__toString()
-   Retrun the string representation of the current element */
+   Return the string representation of the current element */
 SPL_METHOD(CachingIterator, __toString)
 {
spl_dual_it_object   *intern;
@@ -1405,7 +1405,7 @@
 } /* }}} */
 
 /* {{{ proto CachingRecursiveIterator CachingRecursiveIterator::getChildren()
-  Return the inenr iteraor's children as a CachingRecursiveIterator */
+  Return the inner iterator's children as a CachingRecursiveIterator */
 SPL_METHOD(CachingRecursiveIterator, getChildren)
 {
spl_dual_it_object   *intern;

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

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

2004-12-29 Thread Antony Dovgal 
tony2001Wed Dec 29 11:12:56 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/splspl_iterators.c 
  Log:
  MFH: more typos
  
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.38.2.6r2=1.38.2.7ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.38.2.6 
php-src/ext/spl/spl_iterators.c:1.38.2.7
--- php-src/ext/spl/spl_iterators.c:1.38.2.6Wed Dec 29 08:52:34 2004
+++ php-src/ext/spl/spl_iterators.c Wed Dec 29 11:12:55 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_iterators.c,v 1.38.2.6 2004/12/29 13:52:34 tony2001 Exp $ */
+/* $Id: spl_iterators.c,v 1.38.2.7 2004/12/29 16:12:55 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -1240,7 +1240,7 @@
 } /* }}} */
 
 /* {{{ proto string CachingIterator::__toString()
-   Retrun the string representation of the current element */
+   Return the string representation of the current element */
 SPL_METHOD(CachingIterator, __toString)
 {
spl_dual_it_object   *intern;
@@ -1295,7 +1295,7 @@
 } /* }}} */
 
 /* {{{ proto CachingRecursiveIterator CachingRecursiveIterator::getChildren()
-  Return the inenr iteraor's children as a CachingRecursiveIterator */
+  Return the inner iterator's children as a CachingRecursiveIterator */
 SPL_METHOD(CachingRecursiveIterator, getChildren)
 {
spl_dual_it_object   *intern;

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

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

2004-12-29 Thread Frank M. Kromann 
fmk Wed Dec 29 15:18:35 2004 EDT

  Modified files:  
/php-src/ext/fbsql  php_fbsql.c 
  Log:
  Fix typo
  
http://cvs.php.net/diff.php/php-src/ext/fbsql/php_fbsql.c?r1=1.108r2=1.109ty=u
Index: php-src/ext/fbsql/php_fbsql.c
diff -u php-src/ext/fbsql/php_fbsql.c:1.108 php-src/ext/fbsql/php_fbsql.c:1.109
--- php-src/ext/fbsql/php_fbsql.c:1.108 Thu Dec 23 14:29:12 2004
+++ php-src/ext/fbsql/php_fbsql.c   Wed Dec 29 15:18:34 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_fbsql.c,v 1.108 2004/12/23 19:29:12 iliaa Exp $ */
+/* $Id: php_fbsql.c,v 1.109 2004/12/29 20:18:34 fmk Exp $ */
 
 /* TODO:
  *
@@ -849,7 +849,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid locking 
type.);
RETURN_FALSE;
}
-   if (Z_LVAL_PP(strIsolation)  0 || Z_LVAL_PP(Isolation)  4) {
+   if (Z_LVAL_PP(Isolation)  0 || Z_LVAL_PP(Isolation)  4) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid isolation 
type.);
RETURN_FALSE;
}

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

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

2004-12-29 Thread Frank M. Kromann 
fmk Wed Dec 29 15:19:52 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/fbsql  php_fbsql.c 
  Log:
  MFH: Fix typo
  
http://cvs.php.net/diff.php/php-src/ext/fbsql/php_fbsql.c?r1=1.105.2.1r2=1.105.2.2ty=u
Index: php-src/ext/fbsql/php_fbsql.c
diff -u php-src/ext/fbsql/php_fbsql.c:1.105.2.1 
php-src/ext/fbsql/php_fbsql.c:1.105.2.2
--- php-src/ext/fbsql/php_fbsql.c:1.105.2.1 Thu Dec 23 14:29:24 2004
+++ php-src/ext/fbsql/php_fbsql.c   Wed Dec 29 15:19:52 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_fbsql.c,v 1.105.2.1 2004/12/23 19:29:24 iliaa Exp $ */
+/* $Id: php_fbsql.c,v 1.105.2.2 2004/12/29 20:19:52 fmk Exp $ */
 
 /* TODO:
  *
@@ -843,7 +843,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid locking 
type.);
RETURN_FALSE;
}
-   if (Z_LVAL_PP(strIsolation)  0 || Z_LVAL_PP(Isolation)  4) {
+   if (Z_LVAL_PP(Isolation)  0 || Z_LVAL_PP(Isolation)  4) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid isolation 
type.);
RETURN_FALSE;
}

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

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

2004-12-29 Thread Frank M. Kromann 
fmk Wed Dec 29 15:20:52 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/fbsql  php_fbsql.c 
  Log:
  MFH: Fix typo
  
http://cvs.php.net/diff.php/php-src/ext/fbsql/php_fbsql.c?r1=1.86.2.10r2=1.86.2.11ty=u
Index: php-src/ext/fbsql/php_fbsql.c
diff -u php-src/ext/fbsql/php_fbsql.c:1.86.2.10 
php-src/ext/fbsql/php_fbsql.c:1.86.2.11
--- php-src/ext/fbsql/php_fbsql.c:1.86.2.10 Thu Dec 23 14:29:36 2004
+++ php-src/ext/fbsql/php_fbsql.c   Wed Dec 29 15:20:52 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_fbsql.c,v 1.86.2.10 2004/12/23 19:29:36 iliaa Exp $ */
+/* $Id: php_fbsql.c,v 1.86.2.11 2004/12/29 20:20:52 fmk Exp $ */
 
 /* TODO:
  *
@@ -825,7 +825,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid locking 
type.);
RETURN_FALSE;
}
-   if (Z_LVAL_PP(strIsolation)  0 || Z_LVAL_PP(Isolation)  4) {
+   if (Z_LVAL_PP(Isolation)  0 || Z_LVAL_PP(Isolation)  4) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid isolation 
type.);
RETURN_FALSE;
}

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

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

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 16:07:59 2004 EDT

  Modified files:  
/php-src/ext/gd gd.c 
  Log:
  Don't forget to unload t1lib.
  
  
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.299r2=1.300ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.299 php-src/ext/gd/gd.c:1.300
--- php-src/ext/gd/gd.c:1.299   Tue Nov  2 11:41:41 2004
+++ php-src/ext/gd/gd.c Wed Dec 29 16:07:59 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.299 2004/11/02 16:41:41 iliaa Exp $ */
+/* $Id: gd.c,v 1.300 2004/12/29 21:07:59 iliaa Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -335,7 +335,7 @@
gd,
gd_functions,
PHP_MINIT(gd),
-   NULL,
+   PHP_MSHUTDOWN(gd),
NULL,
 #if HAVE_LIBGD20  HAVE_GD_STRINGFT
PHP_RSHUTDOWN(gd),
@@ -373,6 +373,18 @@
 }
 /* }}} */
 
+/* {{{ PHP_MSHUTDOWN_FUNCTION
+ */
+PHP_MSHUTDOWN_FUNCTION(gd)
+{
+#if HAVE_LIBT1
+   T1_CloseLib();
+#endif
+   return SUCCESS;
+}
+/* }}} */
+
+
 /* {{{ PHP_MINIT_FUNCTION
  */
 PHP_MINIT_FUNCTION(gd)

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

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

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 16:08:16 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/gd gd.c 
  Log:
  MFH: Don't forget to unload t1lib.
  
  
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.294.2.4r2=1.294.2.5ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.294.2.4 php-src/ext/gd/gd.c:1.294.2.5
--- php-src/ext/gd/gd.c:1.294.2.4   Tue Nov  2 11:41:26 2004
+++ php-src/ext/gd/gd.c Wed Dec 29 16:08:16 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.294.2.4 2004/11/02 16:41:26 iliaa Exp $ */
+/* $Id: gd.c,v 1.294.2.5 2004/12/29 21:08:16 iliaa Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -335,7 +335,7 @@
gd,
gd_functions,
PHP_MINIT(gd),
-   NULL,
+   PHP_MSHUTDOWN(gd),
NULL,
 #if HAVE_LIBGD20  HAVE_GD_STRINGFT
PHP_RSHUTDOWN(gd),
@@ -373,6 +373,18 @@
 }
 /* }}} */
 
+/* {{{ PHP_MSHUTDOWN_FUNCTION
+ */
+PHP_MSHUTDOWN_FUNCTION(gd)
+{
+#if HAVE_LIBT1
+   T1_CloseLib();
+#endif
+   return SUCCESS;
+}
+/* }}} */
+
+
 /* {{{ PHP_MINIT_FUNCTION
  */
 PHP_MINIT_FUNCTION(gd)

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

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

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 16:08:42 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/gd gd.c 
  Log:
  MFH: Don't forget to unload t1lib.
  
  
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.221.2.46r2=1.221.2.47ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.221.2.46 php-src/ext/gd/gd.c:1.221.2.47
--- php-src/ext/gd/gd.c:1.221.2.46  Tue Nov  2 11:42:13 2004
+++ php-src/ext/gd/gd.c Wed Dec 29 16:08:42 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.221.2.46 2004/11/02 16:42:13 iliaa Exp $ */
+/* $Id: gd.c,v 1.221.2.47 2004/12/29 21:08:42 iliaa Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, 
Cold Spring Harbor Labs. */
@@ -287,7 +287,7 @@
gd,
gd_functions,
PHP_MINIT(gd),
-   NULL,
+   PHP_MSHUTDOWN(gd),
NULL,
 #if HAVE_LIBGD20  HAVE_GD_STRINGFT
PHP_RSHUTDOWN(gd),
@@ -324,6 +324,18 @@
 }
 /* }}} */
 
+/* {{{ PHP_MSHUTDOWN_FUNCTION
+ */
+PHP_MSHUTDOWN_FUNCTION(gd)
+{
+#if HAVE_LIBT1
+   T1_CloseLib();
+#endif
+   return SUCCESS;
+}
+/* }}} */
+
+
 /* {{{ PHP_MINIT_FUNCTION
  */
 PHP_MINIT_FUNCTION(gd)

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

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

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 16:23:11 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/imap   php_imap.c 
  Log:
  MFH: Fixed bug #31142 (imap_mail_compose() fails to generate correct output).
  
  
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.184.2.5r2=1.184.2.6ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.184.2.5 
php-src/ext/imap/php_imap.c:1.184.2.6
--- php-src/ext/imap/php_imap.c:1.184.2.5   Tue Dec 21 10:47:27 2004
+++ php-src/ext/imap/php_imap.c Wed Dec 29 16:23:11 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.184.2.5 2004/12/21 15:47:27 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.184.2.6 2004/12/29 21:23:11 iliaa Exp $ */
 
 #define IMAP41
 
@@ -3168,37 +3168,29 @@
 
bod=part-body;
 
-   
tempstring=emalloc(strlen(bod-contents.text.data)+strlen(CRLF)+strlen(mystring)+1);
-   strcpy(tempstring, mystring);
+   tempstring = 
emalloc(strlen(bod-contents.text.data)+strlen(CRLF)+strlen(mystring)+1);
+   sprintf(tempstring, %s%s%s, mystring, 
bod-contents.text.data, CRLF);
efree(mystring);
-   mystring=tempstring;
-   sprintf(mystring, %s%s%s, mystring, 
bod-contents.text.data, CRLF);
-
+   mystring = tempstring;
} while ((part = part-next)); /* until done */
 
/* output trailing cookie */
sprintf(tmp, --%s--, cookie);
-   
tempstring=emalloc(strlen(tmp)+strlen(CRLF)+strlen(mystring)+1);
-   strcpy(tempstring, mystring);
+   tempstring = 
emalloc(strlen(tmp)+strlen(CRLF)+strlen(mystring)+1);
+   sprintf(tempstring, %s%s%s, mystring, tmp, CRLF);
efree(mystring);
-   mystring=tempstring;
-   sprintf(mystring, %s%s%s, mystring, tmp, CRLF);
-
+   mystring = tempstring;
} else if (bod) {
-
-   
tempstring=emalloc(strlen(bod-contents.text.data)+strlen(CRLF)+strlen(mystring)+1);
-   strcpy(tempstring, mystring);
+   tempstring = 
emalloc(strlen(bod-contents.text.data)+strlen(CRLF)+strlen(mystring)+1);
+   sprintf(tempstring, %s%s%s, mystring, 
bod-contents.text.data, CRLF);
efree(mystring);
-   mystring=tempstring;
-   sprintf(mystring, %s%s%s, mystring, 
bod-contents.text.data, CRLF);
-
+   mystring = tempstring;
} else {
efree(mystring);
RETURN_FALSE;
}
 
-   RETVAL_STRINGL(mystring, strlen(mystring), 1);  
-   efree(tempstring);
+   RETVAL_STRING(tempstring, 0);  
 }
 /* }}} */
 

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

[PHP-CVS] cvs: php-src /ext/imap php_imap.c

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 16:25:00 2004 EDT

  Modified files:  
/php-src/ext/imap   php_imap.c 
  Log:
  MFB: don't perform pointless operations.
  
  
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.190r2=1.191ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.190 php-src/ext/imap/php_imap.c:1.191
--- php-src/ext/imap/php_imap.c:1.190   Wed Dec 22 12:27:39 2004
+++ php-src/ext/imap/php_imap.c Wed Dec 29 16:25:00 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.190 2004/12/22 17:27:39 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.191 2004/12/29 21:25:00 iliaa Exp $ */
 
 #define IMAP41
 
@@ -3191,8 +3191,7 @@
RETURN_FALSE;
}
 
-   RETVAL_STRINGL(mystring, strlen(mystring), 1);  
-   efree(tempstring);
+   RETVAL_STRINGL(tempstring, 0);  
 }
 /* }}} */
 

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

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

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 16:24:01 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/imap   php_imap.c 
  Log:
  Don't perform pointless operations (MFH5).
  
  
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.142.2.30r2=1.142.2.31ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.142.2.30 
php-src/ext/imap/php_imap.c:1.142.2.31
--- php-src/ext/imap/php_imap.c:1.142.2.30  Wed Dec 22 12:29:14 2004
+++ php-src/ext/imap/php_imap.c Wed Dec 29 16:24:00 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.142.2.30 2004/12/22 17:29:14 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.142.2.31 2004/12/29 21:24:00 iliaa Exp $ */
 
 #define IMAP41
 
@@ -3161,8 +3161,7 @@
RETURN_FALSE;
}
 
-   RETVAL_STRINGL(mystring, strlen(mystring), 1);  
-   efree(tempstring);
+   RETVAL_STRINGL(tempstring, 0);  
 }
 /* }}} */
 

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

[PHP-CVS] cvs: php-src /ext/imap php_imap.c

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 16:33:04 2004 EDT

  Modified files:  
/php-src/ext/imap   php_imap.c 
  Log:
  Fixed memory leaks.
  
  
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.191r2=1.192ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.191 php-src/ext/imap/php_imap.c:1.192
--- php-src/ext/imap/php_imap.c:1.191   Wed Dec 29 16:25:00 2004
+++ php-src/ext/imap/php_imap.c Wed Dec 29 16:33:03 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.191 2004/12/29 21:25:00 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.192 2004/12/29 21:33:03 iliaa Exp $ */
 
 #define IMAP41
 
@@ -3188,10 +3188,14 @@
mystring=tempstring;
} else {
efree(mystring);
-   RETURN_FALSE;
+   RETVAL_FALSE;
+   goto done;
}
 
-   RETVAL_STRINGL(tempstring, 0);  
+   RETVAL_STRINGL(tempstring, 0);
+done:
+   mail_free_body(topbod);
+   mail_free_envelope(env);
 }
 /* }}} */
 

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

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

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 16:33:12 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/imap   php_imap.c 
  Log:
  MFH: Fixed memory leaks.
  
  
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.184.2.6r2=1.184.2.7ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.184.2.6 
php-src/ext/imap/php_imap.c:1.184.2.7
--- php-src/ext/imap/php_imap.c:1.184.2.6   Wed Dec 29 16:23:11 2004
+++ php-src/ext/imap/php_imap.c Wed Dec 29 16:33:12 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.184.2.6 2004/12/29 21:23:11 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.184.2.7 2004/12/29 21:33:12 iliaa Exp $ */
 
 #define IMAP41
 
@@ -3187,10 +3187,14 @@
mystring = tempstring;
} else {
efree(mystring);
-   RETURN_FALSE;
+   RETVAL_FALSE;
+   goto done;
}
 
RETVAL_STRING(tempstring, 0);  
+done:
+   mail_free_body(topbod);
+   mail_free_envelope(env);
 }
 /* }}} */
 

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

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

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 16:34:09 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/imap   php_imap.c 
  Log:
  MFH: Fixed memory leaks.
  
  
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.142.2.31r2=1.142.2.32ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.142.2.31 
php-src/ext/imap/php_imap.c:1.142.2.32
--- php-src/ext/imap/php_imap.c:1.142.2.31  Wed Dec 29 16:24:00 2004
+++ php-src/ext/imap/php_imap.c Wed Dec 29 16:34:09 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.142.2.31 2004/12/29 21:24:00 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.142.2.32 2004/12/29 21:34:09 iliaa Exp $ */
 
 #define IMAP41
 
@@ -3158,10 +3158,14 @@
mystring=tempstring;
} else {
efree(mystring);
-   RETURN_FALSE;
+   RETVAL_FALSE;
+   goto done;
}
 
RETVAL_STRINGL(tempstring, 0);  
+done:
+   mail_free_body(topbod);
+   mail_free_envelope(env);
 }
 /* }}} */
 

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

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

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 16:40:34 2004 EDT

  Modified files:  
/php-src/ext/gd gd.c 
  Log:
  Fixed compiler warnings.
  
  
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.300r2=1.301ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.300 php-src/ext/gd/gd.c:1.301
--- php-src/ext/gd/gd.c:1.300   Wed Dec 29 16:07:59 2004
+++ php-src/ext/gd/gd.c Wed Dec 29 16:40:34 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.300 2004/12/29 21:07:59 iliaa Exp $ */
+/* $Id: gd.c,v 1.301 2004/12/29 21:40:34 iliaa Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -3491,7 +3491,7 @@
 #else
if (_fg  0 || _fg  gdImageColorsTotal(bg_img)) {
 #endif
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Foreground color 
index %d out of range, _fg);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Foreground color 
index %ld out of range, _fg);
RETURN_FALSE;
}
 
@@ -3500,7 +3500,7 @@
 #else
if (_bg  0 || _bg  gdImageColorsTotal(bg_img)) {
 #endif
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Background color 
index %d out of range, _bg);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Background color 
index %ld out of range, _bg);
RETURN_FALSE;
}
 
@@ -3542,7 +3542,7 @@
T1_AASetLevel(T1_AA_HIGH);
break;
default:
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid 
value %d as number of steps for antialiasing, aa_steps);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid 
value %ld as number of steps for antialiasing, aa_steps);
RETURN_FALSE;
}
 

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

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

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 16:40:42 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/gd gd.c 
  Log:
  MFH: Fixed compiler warnings.
  
  
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.294.2.5r2=1.294.2.6ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.294.2.5 php-src/ext/gd/gd.c:1.294.2.6
--- php-src/ext/gd/gd.c:1.294.2.5   Wed Dec 29 16:08:16 2004
+++ php-src/ext/gd/gd.c Wed Dec 29 16:40:42 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.294.2.5 2004/12/29 21:08:16 iliaa Exp $ */
+/* $Id: gd.c,v 1.294.2.6 2004/12/29 21:40:42 iliaa Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -3491,7 +3491,7 @@
 #else
if (_fg  0 || _fg  gdImageColorsTotal(bg_img)) {
 #endif
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Foreground color 
index %d out of range, _fg);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Foreground color 
index %ld out of range, _fg);
RETURN_FALSE;
}
 
@@ -3500,7 +3500,7 @@
 #else
if (_bg  0 || _bg  gdImageColorsTotal(bg_img)) {
 #endif
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Background color 
index %d out of range, _bg);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Background color 
index %ld out of range, _bg);
RETURN_FALSE;
}
 
@@ -3542,7 +3542,7 @@
T1_AASetLevel(T1_AA_HIGH);
break;
default:
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid 
value %d as number of steps for antialiasing, aa_steps);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid 
value %ld as number of steps for antialiasing, aa_steps);
RETURN_FALSE;
}
 

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

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

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 16:41:07 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/gd gd.c 
  Log:
  MFH: Fixed compiler warnings.
  
  
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.221.2.47r2=1.221.2.48ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.221.2.47 php-src/ext/gd/gd.c:1.221.2.48
--- php-src/ext/gd/gd.c:1.221.2.47  Wed Dec 29 16:08:42 2004
+++ php-src/ext/gd/gd.c Wed Dec 29 16:41:07 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.221.2.47 2004/12/29 21:08:42 iliaa Exp $ */
+/* $Id: gd.c,v 1.221.2.48 2004/12/29 21:41:07 iliaa Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, 
Cold Spring Harbor Labs. */
@@ -3376,7 +3376,7 @@
 #else
if (_fg  0 || _fg  gdImageColorsTotal(bg_img)) {
 #endif
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Foreground color 
index %d out of range, _fg);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Foreground color 
index %ld out of range, _fg);
RETURN_FALSE;
}
 
@@ -3385,7 +3385,7 @@
 #else
if (_bg  0 || _bg  gdImageColorsTotal(bg_img)) {
 #endif
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Background color 
index %d out of range, _bg);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Background color 
index %ld out of range, _bg);
RETURN_FALSE;
}
 
@@ -3428,7 +3428,7 @@
T1_AASetLevel(T1_AA_HIGH);
break;
default:
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid 
value %d as number of steps for antialiasing, aa_steps);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid 
value %ld as number of steps for antialiasing, aa_steps);
RETURN_FALSE;
}
 

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

[PHP-CVS] cvs: php-src /ext/imap php_imap.c

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 16:56:43 2004 EDT

  Modified files:  
/php-src/ext/imap   php_imap.c 
  Log:
  Fixed typo.
  
  
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.192r2=1.193ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.192 php-src/ext/imap/php_imap.c:1.193
--- php-src/ext/imap/php_imap.c:1.192   Wed Dec 29 16:33:03 2004
+++ php-src/ext/imap/php_imap.c Wed Dec 29 16:56:42 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.192 2004/12/29 21:33:03 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.193 2004/12/29 21:56:42 iliaa Exp $ */
 
 #define IMAP41
 
@@ -3192,7 +3192,7 @@
goto done;
}
 
-   RETVAL_STRINGL(tempstring, 0);
+   RETVAL_STRING(tempstring, 0);
 done:
mail_free_body(topbod);
mail_free_envelope(env);

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

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

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 16:56:57 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/imap   php_imap.c 
  Log:
  Fixed typo.
  
  
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.142.2.32r2=1.142.2.33ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.142.2.32 
php-src/ext/imap/php_imap.c:1.142.2.33
--- php-src/ext/imap/php_imap.c:1.142.2.32  Wed Dec 29 16:34:09 2004
+++ php-src/ext/imap/php_imap.c Wed Dec 29 16:56:57 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.142.2.32 2004/12/29 21:34:09 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.142.2.33 2004/12/29 21:56:57 iliaa Exp $ */
 
 #define IMAP41
 
@@ -3162,7 +3162,7 @@
goto done;
}
 
-   RETVAL_STRINGL(tempstring, 0);  
+   RETVAL_STRING(tempstring, 0);
 done:
mail_free_body(topbod);
mail_free_envelope(env);

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

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

2004-12-29 Thread Jani Taskinen 
sniper  Wed Dec 29 19:59:28 2004 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  cleanup..
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1827r2=1.1828ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1827 php-src/NEWS:1.1828
--- php-src/NEWS:1.1827 Sun Dec 26 08:17:03 2004
+++ php-src/NEWSWed Dec 29 19:59:28 2004
@@ -1,23 +1,23 @@
 PHPNEWS
 |||
 ?? ??? 2004, PHP 5.1.0
-- Added constructors for mysqli_stmt and mysqli_result classes. (Georg)
-- Made request start time be available via $_SERVER['REQUEST_TIME']. (Ilia)
-- Allow gettimeofday() return a float if optional argument is specified. (Ilia)
+- Changed stream_filter_(ap|pre)pend() to return resource. (Sara)
+- Removed garbage manager in Zend Engine which results in more aggressive
+  freeing of data. (Dmitry, Andi)
 - Improved performance of:
   . general execution/compilation. (Andi, Thies, Sterling, Dmitry, Marcus)
-  . switch statement. (Dmitry)
+  . switch() statement. (Dmitry)
   . several array functions. (Marcus)
   . virtual path handling by adding a realpath() cache. (Andi)
   . variable fetches. (Andi)
   . magic method invocations. (Marcus)
-- Removed garbage manager in Zend Engine which results in more aggressive
-  freeing of data. (Dmitry, Andi)
-- Implemented access to INI variables from within .ini file. (Andrei)
-- PHP will now respect extension dependencies when initializing. (Wez)
+- Added possibility to access INI variables from within .ini file. (Andrei)
+- Added constructors for mysqli_stmt and mysqli_result classes. (Georg)
+- Added variable $_SERVER['REQUEST_TIME'] containing request start time. (Ilia)
+- Added optional float parameter to gettimeofday(). (Ilia)
 - Added apache_reset_timeout() Apache1 function. (Rasmus)
 - Added sqlite_fetch_column_types() 3rd argument for arrays. (Ilia)
-- Added optional offset parameter to stream_get_contents() and 
+- Added optional offset parameter to stream_get_contents() and
   file_get_contents(). (Ilia)
 - Added SAPI hook to get the current request time. (Rasmus)
 - Added new functions:
@@ -46,7 +46,8 @@
 - Added HTTP/1.1 and chunked encoding support to http:// wrapper. (Sara)
 - Added support of parameter=value arrays to
   xsl_xsltprocessor_set_parameter(). (Tony)
-- Changed stream_filter_(ap|pre)pend() to return resource. (Sara)
+- Fixed extension initialization to respect dependancies between extensions.
+  (Wez)
 - Fixed a problem with SPL iterators aggregating the innner iterator. (Marcus)
 - Fixed bug with raw_post_data not getting set. (Brian)
 - Fixed bug in mysql::client_version(). (Georg)

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

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

2004-12-29 Thread Jani Taskinen 
sniper  Wed Dec 29 19:59:49 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS 
  Log:
  BFN
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.172r2=1.1760.2.173ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.172 php-src/NEWS:1.1760.2.173
--- php-src/NEWS:1.1760.2.172   Mon Dec 27 06:54:08 2004
+++ php-src/NEWSWed Dec 29 19:59:49 2004
@@ -2,8 +2,8 @@
 |||
 ?? ??? 2005, PHP 5.0.4
 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
-- Added length and charsetnr for field array and object. (Georg)
-- Fixed a bug in mysql_stmt_execute (type conversion with NULL values). (Georg)
+- Added length and charsetnr for field array and object in mysqli. (Georg)
+- Fixed a bug in mysqli_stmt_execute() (type conversion with NULL values). 
(Georg)
 - Fixed bug #31142 (imap_mail_compose() fails to generate correct output). 
(Ilia)
 - Fixed bug #31139 (XML Parser Functions seem to drop amp; when parsing). 
(Rob)
 - Fixed bug #3 (Compile failure of zend_strtod.c). (Derick)

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

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

2004-12-29 Thread Jani Taskinen 
sniper  Wed Dec 29 20:01:55 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
  Log:
  BFN
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.788r2=1.1247.2.789ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.788 php-src/NEWS:1.1247.2.789
--- php-src/NEWS:1.1247.2.788   Thu Dec 23 13:04:09 2004
+++ php-src/NEWSWed Dec 29 20:01:54 2004
@@ -8,9 +8,7 @@
 - Fixed bug #31142 (imap_mail_compose() fails to generate correct output). 
(Ilia)
 - Fixed bug #31120 (mssql_query returns false on successfull inserts and 
   stored procedures). (Frank)
-- Fixed bug #3 (Linux/Sparc: Compile failure of zend_strtod.c). (Derick)
-- Fixed bug #31110 (PHP 4.3.10 does not compile on Tru64 UNIX 5.1B). (Derick)
-- Fixed bug #31107 (Compile failure on Solaris 9 (Intel) and gcc 3.4.3). 
(Derick)
+- Fixed bugs #31107, #31110, #3 (Compile failure of zend_strtod.c). (Jani)
 - Fixed bug #31106 (Fixed crash in overloaded objects). (Stas)
 - Fixed bug #31103 (Better error message when c-client cannot be found). (Ilia)
 - Fixed bug #31072 (var_export() does not output an array element with an empty

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

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

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 20:23:44 2004 EDT

  Modified files:  
/php-src/ext/standard   microtime.c 
  Log:
  Fixed proto.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/microtime.c?r1=1.49r2=1.50ty=u
Index: php-src/ext/standard/microtime.c
diff -u php-src/ext/standard/microtime.c:1.49 
php-src/ext/standard/microtime.c:1.50
--- php-src/ext/standard/microtime.c:1.49   Wed Oct 27 19:12:05 2004
+++ php-src/ext/standard/microtime.cWed Dec 29 20:23:44 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: microtime.c,v 1.49 2004/10/27 23:12:05 iliaa Exp $ */
+/* $Id: microtime.c,v 1.50 2004/12/30 01:23:44 iliaa Exp $ */
 
 #include php.h
 
@@ -93,7 +93,7 @@
 }
 /* }}} */
 
-/* {{{ proto array gettimeofday(void)
+/* {{{ proto array gettimeofday([bool get_as_float])
Returns the current time as array */
 PHP_FUNCTION(gettimeofday)
 {

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/imap/tests bug31142_1.phpt

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 23:11:11 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/imap/tests bug31142_1.phpt 
  Log:
  Fixed test case.
  
  
http://cvs.php.net/diff.php/php-src/ext/imap/tests/bug31142_1.phpt?r1=1.1.2.1r2=1.1.2.2ty=u
Index: php-src/ext/imap/tests/bug31142_1.phpt
diff -u php-src/ext/imap/tests/bug31142_1.phpt:1.1.2.1 
php-src/ext/imap/tests/bug31142_1.phpt:1.1.2.2
--- php-src/ext/imap/tests/bug31142_1.phpt:1.1.2.1  Wed Dec 22 12:28:28 2004
+++ php-src/ext/imap/tests/bug31142_1.phpt  Wed Dec 29 23:11:09 2004
@@ -41,14 +41,14 @@
 MIME-Version: 1.0
 Content-Type: MULTIPART/mixed; BOUNDARY=%s
 
%s
+--%s
 Content-Type: APPLICATION/octet-stream
 Content-Transfer-Encoding: BASE64
 Content-Description: some file
 
 QUJD
 
%s
+--%s
 Content-Type: TEXT/plain; CHARSET=US-ASCII
 Content-Description: description3
 
@@ -56,4 +56,4 @@
 
 

%s--
\ No newline at end of file
+--%s--

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

[PHP-CVS] cvs: php-src /ext/imap/tests bug31142_1.phpt

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 23:11:33 2004 EDT

  Modified files:  
/php-src/ext/imap/tests bug31142_1.phpt 
  Log:
  MFB: fixed test case
  
  
http://cvs.php.net/diff.php/php-src/ext/imap/tests/bug31142_1.phpt?r1=1.1r2=1.2ty=u
Index: php-src/ext/imap/tests/bug31142_1.phpt
diff -u php-src/ext/imap/tests/bug31142_1.phpt:1.1 
php-src/ext/imap/tests/bug31142_1.phpt:1.2
--- php-src/ext/imap/tests/bug31142_1.phpt:1.1  Wed Dec 22 12:27:39 2004
+++ php-src/ext/imap/tests/bug31142_1.phpt  Wed Dec 29 23:11:33 2004
@@ -41,14 +41,14 @@
 MIME-Version: 1.0
 Content-Type: MULTIPART/mixed; BOUNDARY=%s
 
%s
+--%s
 Content-Type: APPLICATION/octet-stream
 Content-Transfer-Encoding: BASE64
 Content-Description: some file
 
 QUJD
 
%s
+--%s
 Content-Type: TEXT/plain; CHARSET=US-ASCII
 Content-Description: description3
 
@@ -56,4 +56,4 @@
 
 

%s--
\ No newline at end of file
+--%s--

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

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/imap/tests bug31142_1.phpt

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 23:11:57 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/imap/tests bug31142_1.phpt 
  Log:
  Fixed test case.
  
  
http://cvs.php.net/diff.php/php-src/ext/imap/tests/bug31142_1.phpt?r1=1.1.4.1r2=1.1.4.2ty=u
Index: php-src/ext/imap/tests/bug31142_1.phpt
diff -u php-src/ext/imap/tests/bug31142_1.phpt:1.1.4.1 
php-src/ext/imap/tests/bug31142_1.phpt:1.1.4.2
--- php-src/ext/imap/tests/bug31142_1.phpt:1.1.4.1  Wed Dec 22 12:29:14 2004
+++ php-src/ext/imap/tests/bug31142_1.phpt  Wed Dec 29 23:11:56 2004
@@ -41,14 +41,14 @@
 MIME-Version: 1.0
 Content-Type: MULTIPART/mixed; BOUNDARY=%s
 
%s
+--%s
 Content-Type: APPLICATION/octet-stream
 Content-Transfer-Encoding: BASE64
 Content-Description: some file
 
 QUJD
 
%s
+--%s
 Content-Type: TEXT/plain; CHARSET=US-ASCII
 Content-Description: description3
 
@@ -56,4 +56,4 @@
 
 

%s--
\ No newline at end of file
+--%s--

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

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

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 23:38:41 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/imap   php_imap.c 
  Log:
  A leak is better(?) then a crash.
  
  
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.142.2.33r2=1.142.2.34ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.142.2.33 
php-src/ext/imap/php_imap.c:1.142.2.34
--- php-src/ext/imap/php_imap.c:1.142.2.33  Wed Dec 29 16:56:57 2004
+++ php-src/ext/imap/php_imap.c Wed Dec 29 23:38:40 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.142.2.33 2004/12/29 21:56:57 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.142.2.34 2004/12/30 04:38:40 iliaa Exp $ */
 
 #define IMAP41
 
@@ -3164,7 +3164,9 @@
 
RETVAL_STRING(tempstring, 0);
 done:
+#if ilia_0 /* this should be done, otherwise we leak memory. Unfortunately 
this seems to cause a crash in some cases */
mail_free_body(topbod);
+#endif
mail_free_envelope(env);
 }
 /* }}} */

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

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

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 23:39:05 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/imap   php_imap.c 
  Log:
  MFB: A leak is better(?) then a crash.
  
  
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.184.2.7r2=1.184.2.8ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.184.2.7 
php-src/ext/imap/php_imap.c:1.184.2.8
--- php-src/ext/imap/php_imap.c:1.184.2.7   Wed Dec 29 16:33:12 2004
+++ php-src/ext/imap/php_imap.c Wed Dec 29 23:39:05 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.184.2.7 2004/12/29 21:33:12 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.184.2.8 2004/12/30 04:39:05 iliaa Exp $ */
 
 #define IMAP41
 
@@ -3193,7 +3193,9 @@
 
RETVAL_STRING(tempstring, 0);  
 done:
+#if ilia_0 /* this should be done, otherwise we leak memory. Unfortunately 
this seems to cause a crash in some cases */
mail_free_body(topbod);
+#endif
mail_free_envelope(env);
 }
 /* }}} */

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

[PHP-CVS] cvs: php-src /ext/imap php_imap.c

2004-12-29 Thread Ilia Alshanetsky 
iliaa   Wed Dec 29 23:39:17 2004 EDT

  Modified files:  
/php-src/ext/imap   php_imap.c 
  Log:
  MFH: A leak is better(?) then a crash.
  
  
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.193r2=1.194ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.193 php-src/ext/imap/php_imap.c:1.194
--- php-src/ext/imap/php_imap.c:1.193   Wed Dec 29 16:56:42 2004
+++ php-src/ext/imap/php_imap.c Wed Dec 29 23:39:17 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.193 2004/12/29 21:56:42 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.194 2004/12/30 04:39:17 iliaa Exp $ */
 
 #define IMAP41
 
@@ -3194,7 +3194,9 @@
 
RETVAL_STRING(tempstring, 0);
 done:
+#if ilia_0 /* this should be done, otherwise we leak memory. Unfortunately 
this seems to cause a crash in some cases */
mail_free_body(topbod);
+#endif
mail_free_envelope(env);
 }
 /* }}} */

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard/tests/network .cvsignore

2004-12-29 Thread Jani Taskinen 
sniper  Wed Dec 29 23:44:25 2004 EDT

  Added files: (Branch: PHP_5_0)
/php-src/ext/standard/tests/network .cvsignore 
  Log:
  missing .cvsignore file
  

http://cvs.php.net/co.php/php-src/ext/standard/tests/network/.cvsignore?r=1.1p=1
Index: php-src/ext/standard/tests/network/.cvsignore
+++ php-src/ext/standard/tests/network/.cvsignore
phpt.*
*.diff
*.log
*.exp
*.out
*.php
*.gcda
*.gcno

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

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/gd/tests bug28984.phpt

2004-12-29 Thread Jani Taskinen 
sniper  Wed Dec 29 23:44:59 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/gd/tests   bug28984.phpt 
  Log:
  - Fixed crap removal
  
  
http://cvs.php.net/diff.php/php-src/ext/gd/tests/bug28984.phpt?r1=1.1.2.1r2=1.1.2.2ty=u
Index: php-src/ext/gd/tests/bug28984.phpt
diff -u php-src/ext/gd/tests/bug28984.phpt:1.1.2.1 
php-src/ext/gd/tests/bug28984.phpt:1.1.2.2
--- php-src/ext/gd/tests/bug28984.phpt:1.1.2.1  Sat Jul  3 11:32:33 2004
+++ php-src/ext/gd/tests/bug28984.phpt  Wed Dec 29 23:44:59 2004
@@ -11,14 +11,17 @@
 ?
 --FILE--
 ?php
+$cwd = dirname(__FILE__);
+
 $im = imagecreatetruecolor(100,100);
 imagealphablending($im, false);
 #$alpha = imagecolorallocatealpha($im, 255, 0, 255,0);
 $alpha = imagecolorallocate($im, 255, 0, 0);
 imagefill($im, 2, 2, $alpha);
 #imagesavealpha($im, true);
-imagepng($im, '1.png');
+imagepng($im, $cwd . '/1.png');
 imagedestroy($im);
[EMAIL PROTECTED]($cwd . '/1.png');
 echo Done\n;
 ?
 --EXPECT--

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

[PHP-CVS] cvs: php-src /ext/imap php_imap.c

2004-12-29 Thread Jani Taskinen 
sniper  Thu Dec 30 00:31:56 2004 EDT

  Modified files:  
/php-src/ext/imap   php_imap.c 
  Log:
  - Fixed the crash and leak.
  
  
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.194r2=1.195ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.194 php-src/ext/imap/php_imap.c:1.195
--- php-src/ext/imap/php_imap.c:1.194   Wed Dec 29 23:39:17 2004
+++ php-src/ext/imap/php_imap.c Thu Dec 30 00:31:55 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.194 2004/12/30 04:39:17 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.195 2004/12/30 05:31:55 sniper Exp $ */
 
 #define IMAP41
 
@@ -2980,7 +2980,7 @@
bod-contents.text.size = Z_STRLEN_PP(pvalue);
} else {
bod-contents.text.data = (char *) fs_get(1);
-   bod-contents.text.data = ;
+   memcpy(bod-contents.text.data, , 1);
bod-contents.text.size = 0;
}
if (zend_hash_find(Z_ARRVAL_PP(data), lines, sizeof(lines), 
(void **) pvalue)== SUCCESS) {
@@ -3194,9 +3194,7 @@
 
RETVAL_STRING(tempstring, 0);
 done:
-#if ilia_0 /* this should be done, otherwise we leak memory. Unfortunately 
this seems to cause a crash in some cases */
mail_free_body(topbod);
-#endif
mail_free_envelope(env);
 }
 /* }}} */

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

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

2004-12-29 Thread Jani Taskinen 
sniper  Thu Dec 30 00:33:27 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/imap   php_imap.c 
  Log:
  MFH: Fixed crash + leak
  
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.184.2.8r2=1.184.2.9ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.184.2.8 
php-src/ext/imap/php_imap.c:1.184.2.9
--- php-src/ext/imap/php_imap.c:1.184.2.8   Wed Dec 29 23:39:05 2004
+++ php-src/ext/imap/php_imap.c Thu Dec 30 00:33:26 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.184.2.8 2004/12/30 04:39:05 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.184.2.9 2004/12/30 05:33:26 sniper Exp $ */
 
 #define IMAP41
 
@@ -2980,7 +2980,7 @@
bod-contents.text.size = Z_STRLEN_PP(pvalue);
} else {
bod-contents.text.data = (char *) fs_get(1);
-   bod-contents.text.data = ;
+   memcpy(bod-contents.text.data, , 1);
bod-contents.text.size = 0;
}
if (zend_hash_find(Z_ARRVAL_PP(data), lines, sizeof(lines), 
(void **) pvalue)== SUCCESS) {
@@ -3193,9 +3193,7 @@
 
RETVAL_STRING(tempstring, 0);  
 done:
-#if ilia_0 /* this should be done, otherwise we leak memory. Unfortunately 
this seems to cause a crash in some cases */
mail_free_body(topbod);
-#endif
mail_free_envelope(env);
 }
 /* }}} */



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

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

2004-12-29 Thread Jani Taskinen 
sniper  Thu Dec 30 00:33:54 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/imap   php_imap.c 
  Log:
  MFH: Fixed crash + leak
  
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.142.2.34r2=1.142.2.35ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.142.2.34 
php-src/ext/imap/php_imap.c:1.142.2.35
--- php-src/ext/imap/php_imap.c:1.142.2.34  Wed Dec 29 23:38:40 2004
+++ php-src/ext/imap/php_imap.c Thu Dec 30 00:33:53 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.142.2.34 2004/12/30 04:38:40 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.142.2.35 2004/12/30 05:33:53 sniper Exp $ */
 
 #define IMAP41
 
@@ -2951,7 +2951,7 @@
bod-contents.text.size = Z_STRLEN_PP(pvalue);
} else {
bod-contents.text.data = (char *) fs_get(1);
-   bod-contents.text.data = ;
+   memcpy(bod-contents.text.data, , 1);
bod-contents.text.size = 0;
}
if (zend_hash_find(Z_ARRVAL_PP(data), lines, sizeof(lines), 
(void **) pvalue)== SUCCESS) {
@@ -3164,9 +3164,7 @@
 
RETVAL_STRING(tempstring, 0);
 done:
-#if ilia_0 /* this should be done, otherwise we leak memory. Unfortunately 
this seems to cause a crash in some cases */
mail_free_body(topbod);
-#endif
mail_free_envelope(env);
 }
 /* }}} */

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

[PHP-CVS] cvs: php-src(PHP_4_3) / acinclude.m4 configure.in /ext/bcmath/libbcmath aclocal.m4 /ext/cpdf config.m4 /ext/db config.m4 /ext/dba config.m4 /ext/domxml config.m4 /ext/gd config.m4 /ext/imap config.m4 /ext/java config.m4 /ext/ldap config.m4 /ext/msql config.m4 /ext/mysql config.m4 /ext/mysql/libmysql acinclude.m4 mysql.m4 /ext/oci8 config.m4 /ext/odbc config.m4 /ext/oracle config.m4 /ext/pgsql config.m4 /ext/standard config.m4 /ext/xmlrpc/libxmlrpc acinclude.m4 xmlrpc.m4 /sapi/cgi config9.m4 /sapi/cgi/libfcgi acinclude.m4 /scripts phpize.m4 TSRM acinclude.m4 threads.m4 tsrm.m4 Zend Zend.m4 acinclude.m4

2004-12-29 Thread Jani Taskinen 
sniper  Thu Dec 30 02:02:19 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcacinclude.m4 configure.in 
/TSRM   acinclude.m4 threads.m4 tsrm.m4 
/Zend   Zend.m4 acinclude.m4 
/php-src/ext/bcmath/libbcmath   aclocal.m4 
/php-src/ext/cpdf   config.m4 
/php-src/ext/db config.m4 
/php-src/ext/dbaconfig.m4 
/php-src/ext/domxml config.m4 
/php-src/ext/gd config.m4 
/php-src/ext/imap   config.m4 
/php-src/ext/java   config.m4 
/php-src/ext/ldap   config.m4 
/php-src/ext/msql   config.m4 
/php-src/ext/mysql  config.m4 
/php-src/ext/mysql/libmysql acinclude.m4 mysql.m4 
/php-src/ext/oci8   config.m4 
/php-src/ext/odbc   config.m4 
/php-src/ext/oracle config.m4 
/php-src/ext/pgsql  config.m4 
/php-src/ext/standard   config.m4 
/php-src/ext/xmlrpc/libxmlrpc   acinclude.m4 xmlrpc.m4 
/php-src/sapi/cgi   config9.m4 
/php-src/sapi/cgi/libfcgi   acinclude.m4 
/php-src/scriptsphpize.m4 
  Log:
  - Quote macro names in AC_DEFUN()
  # Fixes also bug #29160
  # for i in `grep -r -l AC_DEFUN *`; do perl -i -pe 
s#AC_DEFUN\(([^\[])(.*)\,#AC_DEFUN([\1\2],#g $i; done;
  
  http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.218.2.41r2=1.218.2.42ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.218.2.41 php-src/acinclude.m4:1.218.2.42
--- php-src/acinclude.m4:1.218.2.41 Tue Dec 21 10:40:19 2004
+++ php-src/acinclude.m4Thu Dec 30 02:02:15 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.218.2.41 2004/12/21 15:40:19 edink Exp $ -*- 
autoconf -*-
+dnl $Id: acinclude.m4,v 1.218.2.42 2004/12/30 07:02:15 sniper Exp $ -*- 
autoconf -*-
 dnl
 dnl This file contains local autoconf functions.
 
@@ -16,7 +16,7 @@
   sed -e s#\$(srcdir)#$ac_srcdir#g -e s#\$(builddir)#$ac_builddir#g $src  
 Makefile.fragments
 ])
 
-AC_DEFUN(PHP_PROG_RE2C,[
+AC_DEFUN([PHP_PROG_RE2C],[
   AC_CHECK_PROG(RE2C, re2c, re2c, [exit 0;])
 ])
 
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.144r2=1.396.2.145ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.144 php-src/configure.in:1.396.2.145
--- php-src/configure.in:1.396.2.144Mon Dec 20 20:08:09 2004
+++ php-src/configure.inThu Dec 30 02:02:16 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.144 2004/12/21 01:08:09 sniper Exp $ -*- sh 
-*-
+dnl ## $Id: configure.in,v 1.396.2.145 2004/12/30 07:02:16 sniper Exp $ -*- sh 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -45,10 +45,10 @@
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context
-AC_DEFUN(PHP_EXT_BUILDDIR,[ext/$1])dnl
-AC_DEFUN(PHP_EXT_DIR,[ext/$1])dnl
-AC_DEFUN(PHP_EXT_SRCDIR,[$abs_srcdir/ext/$1])dnl
-AC_DEFUN(PHP_ALWAYS_SHARED,[])dnl
+AC_DEFUN([PHP_EXT_BUILDDIR],[ext/$1])dnl
+AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
+AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
+AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
 
 dnl Setting up the PHP version based on the information above.
 dnl -
http://cvs.php.net/diff.php/TSRM/acinclude.m4?r1=1.1r2=1.1.16.1ty=u
Index: TSRM/acinclude.m4
diff -u TSRM/acinclude.m4:1.1 TSRM/acinclude.m4:1.1.16.1
--- TSRM/acinclude.m4:1.1   Mon Oct  4 11:22:18 1999
+++ TSRM/acinclude.m4   Thu Dec 30 02:02:16 2004
@@ -1,5 +1,5 @@
 
-AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
+AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
   LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
 ])
 
http://cvs.php.net/diff.php/TSRM/threads.m4?r1=1.12r2=1.12.2.1ty=u
Index: TSRM/threads.m4
diff -u TSRM/threads.m4:1.12 TSRM/threads.m4:1.12.2.1
--- TSRM/threads.m4:1.12Sat Oct  5 07:26:17 2002
+++ TSRM/threads.m4 Thu Dec 30 02:02:16 2004
@@ -30,7 +30,7 @@
 dnl
 dnl Set some magic defines to achieve POSIX threads conformance
 dnl
-AC_DEFUN(PTHREADS_FLAGS,[
+AC_DEFUN([PTHREADS_FLAGS],[
   if test -z $host_alias  test -n $host; then
 host_alias=$host
   fi
@@ -65,7 +65,7 @@
 dnl
 dnl Check whether the current setup can use POSIX threads calls
 dnl
-AC_DEFUN(PTHREADS_CHECK_COMPILE, [
+AC_DEFUN([PTHREADS_CHECK_COMPILE], [
 AC_TRY_RUN( [
 #include pthread.h
 #include stddef.h
@@ -100,7 +100,7 @@
 dnl  -qthreadedAIX cc V5
 dnl  -threads  gcc (HP-UX)
 dnl
-AC_DEFUN(PTHREADS_CHECK,[
+AC_DEFUN([PTHREADS_CHECK],[
 
 if test $beos_threads = 1; then
   pthreads_working=yes
@@ -154,7 +154,7 @@
 ])dnl
 dnl
 dnl
-AC_DEFUN(PTHREADS_ASSIGN_VARS,[
+AC_DEFUN([PTHREADS_ASSIGN_VARS],[
 if test -n $ac_cv_pthreads_lib; then
   LIBS=$LIBS -l$ac_cv_pthreads_lib
 fi
http://cvs.php.net/diff.php/TSRM/tsrm.m4?r1=1.14.2.1r2=1.14.2.2ty=u
Index: TSRM/tsrm.m4
diff -u TSRM/tsrm.m4:1.14.2.1 TSRM/tsrm.m4:1.14.2.2
--- TSRM/tsrm.m4:1.14.2.1   Fri Oct  3 01:25:30 2003
+++ TSRM/tsrm.m4Thu Dec 30 02:02:16 2004
@@ -1,6 +1,6 @@
 
 dnl

[PHP-CVS] cvs: php-src(PHP_5_0) / acinclude.m4 configure.in /ext/bcmath/libbcmath aclocal.m4 /ext/cpdf config.m4 /ext/dba config.m4 /ext/gd config.m4 /ext/imap config.m4 /ext/ldap config.m4 /ext/mcrypt config.m4 /ext/msql config.m4 /ext/mysql config.m4 /ext/oci8 config.m4 /ext/odbc config.m4 /ext/oracle config.m4 /ext/pgsql config.m4 /ext/standard config.m4 /ext/xmlrpc/libxmlrpc acinclude.m4 xmlrpc.m4 /sapi/cgi config9.m4 /sapi/cgi/libfcgi acinclude.m4 /scripts phpize.m4 TSRM acinclude.m4 threads.m4 tsrm.m4

2004-12-29 Thread Jani Taskinen 
sniper  Thu Dec 30 02:04:12 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcacinclude.m4 configure.in 
/TSRM   acinclude.m4 threads.m4 tsrm.m4 
/php-src/ext/bcmath/libbcmath   aclocal.m4 
/php-src/ext/cpdf   config.m4 
/php-src/ext/dbaconfig.m4 
/php-src/ext/gd config.m4 
/php-src/ext/imap   config.m4 
/php-src/ext/ldap   config.m4 
/php-src/ext/mcrypt config.m4 
/php-src/ext/msql   config.m4 
/php-src/ext/mysql  config.m4 
/php-src/ext/oci8   config.m4 
/php-src/ext/odbc   config.m4 
/php-src/ext/oracle config.m4 
/php-src/ext/pgsql  config.m4 
/php-src/ext/standard   config.m4 
/php-src/ext/xmlrpc/libxmlrpc   acinclude.m4 xmlrpc.m4 
/php-src/sapi/cgi   config9.m4 
/php-src/sapi/cgi/libfcgi   acinclude.m4 
/php-src/scriptsphpize.m4 
  Log:
  - MFB4_3: Quote macro names in AC_DEFUN()
  
  http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.271.2.6r2=1.271.2.7ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.271.2.6 php-src/acinclude.m4:1.271.2.7
--- php-src/acinclude.m4:1.271.2.6  Tue Dec 21 10:42:04 2004
+++ php-src/acinclude.m4Thu Dec 30 02:04:09 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.271.2.6 2004/12/21 15:42:04 edink Exp $ -*- autoconf 
-*-
+dnl $Id: acinclude.m4,v 1.271.2.7 2004/12/30 07:04:09 sniper Exp $ -*- 
autoconf -*-
 dnl
 dnl This file contains local autoconf functions.
 
@@ -16,7 +16,7 @@
   sed -e s#\$(srcdir)#$ac_srcdir#g -e s#\$(builddir)#$ac_builddir#g $src  
 Makefile.fragments
 ])
 
-AC_DEFUN(PHP_PROG_RE2C,[
+AC_DEFUN([PHP_PROG_RE2C],[
   AC_CHECK_PROG(RE2C, re2c, re2c, [exit 0;])
 ])
 
@@ -1912,7 +1912,7 @@
 dnl PHP_TEST_BUILD(function, action-if-ok, action-if-not-ok [, extra-libs [, 
extra-source]])
 dnl This macro checks whether build works and given function exists.
 dnl
-AC_DEFUN(PHP_TEST_BUILD, [
+AC_DEFUN([PHP_TEST_BUILD], [
   old_LIBS=$LIBS
   LIBS=$4 $LIBS
   AC_TRY_RUN([
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.28r2=1.514.2.29ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.28 php-src/configure.in:1.514.2.29
--- php-src/configure.in:1.514.2.28 Mon Dec 20 20:07:46 2004
+++ php-src/configure.inThu Dec 30 02:04:09 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.28 2004/12/21 01:07:46 sniper Exp $ -*- sh 
-*-
+dnl ## $Id: configure.in,v 1.514.2.29 2004/12/30 07:04:09 sniper Exp $ -*- sh 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -45,10 +45,10 @@
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context
-AC_DEFUN(PHP_EXT_BUILDDIR,[ext/$1])dnl
-AC_DEFUN(PHP_EXT_DIR,[ext/$1])dnl
-AC_DEFUN(PHP_EXT_SRCDIR,[$abs_srcdir/ext/$1])dnl
-AC_DEFUN(PHP_ALWAYS_SHARED,[])dnl
+AC_DEFUN([PHP_EXT_BUILDDIR],[ext/$1])dnl
+AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
+AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
+AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
 
 dnl Setting up the PHP version based on the information above.
 dnl -
http://cvs.php.net/diff.php/TSRM/acinclude.m4?r1=1.1r2=1.1.28.1ty=u
Index: TSRM/acinclude.m4
diff -u TSRM/acinclude.m4:1.1 TSRM/acinclude.m4:1.1.28.1
--- TSRM/acinclude.m4:1.1   Mon Oct  4 11:22:18 1999
+++ TSRM/acinclude.m4   Thu Dec 30 02:04:10 2004
@@ -1,5 +1,5 @@
 
-AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
+AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
   LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
 ])
 
http://cvs.php.net/diff.php/TSRM/threads.m4?r1=1.12r2=1.12.14.1ty=u
Index: TSRM/threads.m4
diff -u TSRM/threads.m4:1.12 TSRM/threads.m4:1.12.14.1
--- TSRM/threads.m4:1.12Sat Oct  5 07:26:17 2002
+++ TSRM/threads.m4 Thu Dec 30 02:04:10 2004
@@ -30,7 +30,7 @@
 dnl
 dnl Set some magic defines to achieve POSIX threads conformance
 dnl
-AC_DEFUN(PTHREADS_FLAGS,[
+AC_DEFUN([PTHREADS_FLAGS],[
   if test -z $host_alias  test -n $host; then
 host_alias=$host
   fi
@@ -65,7 +65,7 @@
 dnl
 dnl Check whether the current setup can use POSIX threads calls
 dnl
-AC_DEFUN(PTHREADS_CHECK_COMPILE, [
+AC_DEFUN([PTHREADS_CHECK_COMPILE], [
 AC_TRY_RUN( [
 #include pthread.h
 #include stddef.h
@@ -100,7 +100,7 @@
 dnl  -qthreadedAIX cc V5
 dnl  -threads  gcc (HP-UX)
 dnl
-AC_DEFUN(PTHREADS_CHECK,[
+AC_DEFUN([PTHREADS_CHECK],[
 
 if test $beos_threads = 1; then
   pthreads_working=yes
@@ -154,7 +154,7 @@
 ])dnl
 dnl
 dnl
-AC_DEFUN(PTHREADS_ASSIGN_VARS,[
+AC_DEFUN([PTHREADS_ASSIGN_VARS],[
 if test -n $ac_cv_pthreads_lib; then
   LIBS=$LIBS -l$ac_cv_pthreads_lib
 fi
http://cvs.php.net/diff.php/TSRM/tsrm.m4?r1=1.15r2=1.15.2.1ty=u
Index: TSRM/tsrm.m4
diff -u TSRM/tsrm.m4:1.15 TSRM/tsrm.m4:1.15.2.1
--- TSRM/tsrm.m4:1.15   Fri Oct  3 01:24:17 2003
+++ TSRM/tsrm.m4Thu Dec 30 02:04:10 2004
@@ -1,6 +1,6 @@
 
 dnl TSRM_CHECK_GCC_ARG(ARG,

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in /ext/bcmath/libbcmath aclocal.m4 /ext/cpdf config.m4 /ext/dba config.m4 /ext/gd config.m4 /ext/imap config.m4 /ext/ldap config.m4 /ext/mcrypt config.m4 /ext/msql config.m4 /ext/mysql config.m4 /ext/oci8 config.m4 /ext/odbc config.m4 /ext/oracle config.m4 /ext/pgsql config.m4 /ext/standard config.m4 /ext/xmlrpc/libxmlrpc acinclude.m4 xmlrpc.m4 /sapi/cgi config9.m4 /sapi/cgi/libfcgi acinclude.m4 /scripts phpize.m4 TSRM acinclude.m4 threads.m4 tsrm.m4 ZendEngine2 Zend.m4 acinclude.m4

2004-12-29 Thread Jani Taskinen 
sniper  Thu Dec 30 02:08:38 2004 EDT

  Modified files:  
/php-srcacinclude.m4 configure.in 
/TSRM   acinclude.m4 threads.m4 tsrm.m4 
/ZendEngine2Zend.m4 acinclude.m4 
/php-src/ext/bcmath/libbcmath   aclocal.m4 
/php-src/ext/cpdf   config.m4 
/php-src/ext/dbaconfig.m4 
/php-src/ext/gd config.m4 
/php-src/ext/imap   config.m4 
/php-src/ext/ldap   config.m4 
/php-src/ext/mcrypt config.m4 
/php-src/ext/msql   config.m4 
/php-src/ext/mysql  config.m4 
/php-src/ext/oci8   config.m4 
/php-src/ext/odbc   config.m4 
/php-src/ext/oracle config.m4 
/php-src/ext/pgsql  config.m4 
/php-src/ext/standard   config.m4 
/php-src/ext/xmlrpc/libxmlrpc   acinclude.m4 xmlrpc.m4 
/php-src/sapi/cgi   config9.m4 
/php-src/sapi/cgi/libfcgi   acinclude.m4 
/php-src/scriptsphpize.m4 
  Log:
  MFB_4_3: Quote macro names in AC_DEFUN()
  http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.282r2=1.283ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.282 php-src/acinclude.m4:1.283
--- php-src/acinclude.m4:1.282  Tue Dec 21 10:41:22 2004
+++ php-src/acinclude.m4Thu Dec 30 02:08:35 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.282 2004/12/21 15:41:22 edink Exp $
+dnl $Id: acinclude.m4,v 1.283 2004/12/30 07:08:35 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -16,7 +16,7 @@
   sed -e s#\$(srcdir)#$ac_srcdir#g -e s#\$(builddir)#$ac_builddir#g $src  
 Makefile.fragments
 ])
 
-AC_DEFUN(PHP_PROG_RE2C,[
+AC_DEFUN([PHP_PROG_RE2C],[
   AC_CHECK_PROG(RE2C, re2c, re2c, [exit 0;])
 ])
 
@@ -1909,7 +1909,7 @@
 dnl PHP_TEST_BUILD(function, action-if-ok, action-if-not-ok [, extra-libs [, 
extra-source]])
 dnl This macro checks whether build works and given function exists.
 dnl
-AC_DEFUN(PHP_TEST_BUILD, [
+AC_DEFUN([PHP_TEST_BUILD], [
   old_LIBS=$LIBS
   LIBS=$4 $LIBS
   AC_TRY_RUN([
@@ -1937,14 +1937,14 @@
 dnl $3 = optional: if true, it's ok for $2 to have not been configured
 dnl default is false and should halt the build.
 dnl See ADD_EXTENSION_DEP in win32 build 
-AC_DEFUN(PHP_ADD_EXTENSION_DEP, [])
+AC_DEFUN([PHP_ADD_EXTENSION_DEP], [])
 
 
 dnl PHP_CHECK_64BIT([do if 32], [do if 64])
 dnl This macro is used to detect if we're at 64-bit platform or not.
 dnl It could be useful for those external libs, that have different 
precompiled 
 dnl versions in different directories.
-AC_DEFUN(PHP_CHECK_64BIT,[
+AC_DEFUN([PHP_CHECK_64BIT],[
   AC_CHECK_SIZEOF(int)
   AC_MSG_CHECKING([checking if we're at 64-bit platform])
   if test $ac_cv_sizeof_int = 4 ; then
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.532r2=1.533ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.532 php-src/configure.in:1.533
--- php-src/configure.in:1.532  Mon Dec 20 20:07:24 2004
+++ php-src/configure.inThu Dec 30 02:08:35 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.532 2004/12/21 01:07:24 sniper Exp $ -*- autoconf 
-*-
+dnl ## $Id: configure.in,v 1.533 2004/12/30 07:08:35 sniper Exp $ -*- autoconf 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -47,10 +47,10 @@
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context
-AC_DEFUN(PHP_EXT_BUILDDIR,[ext/$1])dnl
-AC_DEFUN(PHP_EXT_DIR,[ext/$1])dnl
-AC_DEFUN(PHP_EXT_SRCDIR,[$abs_srcdir/ext/$1])dnl
-AC_DEFUN(PHP_ALWAYS_SHARED,[])dnl
+AC_DEFUN([PHP_EXT_BUILDDIR],[ext/$1])dnl
+AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
+AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
+AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
 
 dnl Setting up the PHP version based on the information above.
 dnl -
http://cvs.php.net/diff.php/TSRM/acinclude.m4?r1=1.1r2=1.2ty=u
Index: TSRM/acinclude.m4
diff -u TSRM/acinclude.m4:1.1 TSRM/acinclude.m4:1.2
--- TSRM/acinclude.m4:1.1   Mon Oct  4 11:22:18 1999
+++ TSRM/acinclude.m4   Thu Dec 30 02:08:36 2004
@@ -1,5 +1,5 @@
 
-AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
+AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
   LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
 ])
 
http://cvs.php.net/diff.php/TSRM/threads.m4?r1=1.12r2=1.13ty=u
Index: TSRM/threads.m4
diff -u TSRM/threads.m4:1.12 TSRM/threads.m4:1.13
--- TSRM/threads.m4:1.12Sat Oct  5 07:26:17 2002
+++ TSRM/threads.m4 Thu Dec 30 02:08:36 2004
@@ -30,7 +30,7 @@
 dnl
 dnl Set some magic defines to achieve POSIX threads conformance
 dnl
-AC_DEFUN(PTHREADS_FLAGS,[
+AC_DEFUN([PTHREADS_FLAGS],[
   if test -z $host_alias  test -n $host; then
 host_alias=$host
   fi
@@ -65,7 +65,7 @@
 dnl
 dnl Check whether the current setup can use POSIX threads calls
 dnl
-AC_DEFUN(PTHREADS_CHECK_COMPILE, [
+AC_DEFUN([PTHREADS_CHECK_COMPILE], [
 AC_TRY_RUN( [
 #include pthread.h
 #include stddef.h
@@ -100,7 +100,7 @@
 dnl  -qthreadedAIX cc V5
 dnl  -threads