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

2005-02-23 Thread changelog 
changelog   Wed Feb 23 20:34:59 2005 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1903r2=1.1904ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.1903 php-src/ChangeLog:1.1904
--- php-src/ChangeLog:1.1903Tue Feb 22 20:35:55 2005
+++ php-src/ChangeLog   Wed Feb 23 20:34:57 2005
@@ -1,3 +1,101 @@
+2005-02-23  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* ext/standard/image.c:
+  Additional safety checks.
+
+2005-02-23  Marcus Boerger  [EMAIL PROTECTED]
+
+* ext/standard/image.c:
+  - Slightly redesign
+
+2005-02-23  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_5_0)
+  main/streams/mmap.c:
+  MFH: Increase maximum mmapable file size to 2mb from 1mb.
+
+* main/streams/mmap.c:
+  Increase maximum mmapable file size to 2mb from 1mb.
+
+* (PHP_4_3)
+  TODO_SEGFAULTS:
+  pack() issues were resolved.
+
+2005-02-23  Ard Biesheuvel  [EMAIL PROTECTED]
+
+* ext/interbase/interbase.c:
+  Fixed bug #31597: ibase_connect() - incorrect warning
+
+2005-02-23  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* ext/standard/dir.c:
+  Fixed compiler warning.
+
+* (PHP_5_0)
+  ext/bz2/bz2.c:
+  MFB_4_3: Fixed bug #29521 (compress.bzip2 returns error when used with 
http
+  wrapper)
+
+* ext/bz2/bz2.c:
+  MFB_4_3: Fixed bug #29521 (compress.bzip2 returns error when used with 
http
+  wrapper).
+
+2005-02-23  Stefan Esser  [EMAIL PROTECTED]
+
+* ext/standard/var_unserializer.c
+  ext/standard/var_unserializer.re:
+  Correcting bounds check before someone uses this code
+
+2005-02-23  Derick Rethans  [EMAIL PROTECTED]
+
+* (PHP_5_0)
+  NEWS
+  ZendEngine2/zend_reflection_api.c:
+  - MFH: fixed bug #32076 (ReflectionMethod :: isDestructor() always return
+true).
+
+* ZendEngine2/zend_reflection_api.c:
+  - Fixed bug #32076 (ReflectionMethod :: isDestructor() always return 
true)
+(Patch by Antony Dogval)
+
+2005-02-23  Stanislav Malyshev  [EMAIL PROTECTED]
+
+* ext/standard/var.c
+  ext/standard/var_unserializer.c
+  ext/standard/var_unserializer.re:
+  Custom object serializer infrastructure - PHP implementation
+
+* ZendEngine2/zend.h
+  ZendEngine2/zend_compile.c:
+  Custom object serializer infrastructure
+
+2005-02-23  Anantha Kesari H Y  [EMAIL PROTECTED]
+
+* main/php_syslog.h:
+  NetWare can make use of Autoconf generated header file
+
+* main/php_open_temporary_file.c:
+  NetWare LibC has mkstemp implementation
+
+* main/php_compat.h:
+  NetWare can make use autoconf generated header file
+
+* main/fopen_wrappers.c:
+  NetWare LibC has pwd.h
+
+2005-02-23  Jani Taskinen  [EMAIL PROTECTED]
+
+* ZendEngine2/Zend.m4:
+  Hack the planet
+
+2005-02-23  Marcus Boerger  [EMAIL PROTECTED]
+
+* run-tests.php:
+  - Use PHP not C semantics
+
+* ZendEngine2/zend_interfaces.c:
+  - Allow to convert Traversable into Aggregate
+
 2005-02-22  Ilia Alshanetsky  [EMAIL PROTECTED]
 
 * (PHP_4_3)
@@ -582,7 +680,7 @@
   ext/session/mod_mm.h
   ext/session/mod_user.h
   ext/session/php_session.h:
-  - Missing $Id: ChangeLog,v 1.1903 2005/02/23 01:35:55 changelog Exp $ 
tags
+  - Missing $Id: ChangeLog,v 1.1904 2005/02/24 01:34:57 changelog Exp $ 
tags
 
 * (PHP_4_3)
   ext/session/session.c:
@@ -1063,7 +1161,7 @@
 
 * (PHP_4_3)
   Zend/zend_ini_scanner.l:
-  Missing $Id: ChangeLog,v 1.1903 2005/02/23 01:35:55 changelog Exp $ tag 
+ ws fix
+  Missing $Id: ChangeLog,v 1.1904 2005/02/24 01:34:57 changelog Exp $ tag 
+ ws fix
 
 * ZendEngine2/zend_ini_scanner.l
   ZendEngine2/zend_ini_scanner.l:
@@ -2537,7 +2635,7 @@
   ext/standard/url_scanner_ex.c
   ext/standard/url_scanner_ex.h
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.1903 2005/02/23 01:35:55 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.1904 2005/02/24 01:34:57 changelog Exp $ tag
 
 * ext/standard/credits_ext.h
   ext/standard/credits_sapi.h:

[PHP-CVS] cvs: php-src /main fopen_wrappers.c

2005-02-23 Thread Anantha Kesari H Y 
hyanantha   Wed Feb 23 03:56:51 2005 EDT

  Modified files:  
/php-src/main   fopen_wrappers.c 
  Log:
  NetWare LibC has pwd.h
  
  
http://cvs.php.net/diff.php/php-src/main/fopen_wrappers.c?r1=1.172r2=1.173ty=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.172 php-src/main/fopen_wrappers.c:1.173
--- php-src/main/fopen_wrappers.c:1.172 Wed Feb  2 18:43:17 2005
+++ php-src/main/fopen_wrappers.c   Wed Feb 23 03:56:47 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: fopen_wrappers.c,v 1.172 2005/02/02 23:43:17 iliaa Exp $ */
+/* $Id: fopen_wrappers.c,v 1.173 2005/02/23 08:56:47 hyanantha Exp $ */
 
 /* {{{ includes
  */
@@ -48,8 +48,6 @@
 #if HAVE_PWD_H
 #ifdef PHP_WIN32
 #include win32/pwd.h
-#elif defined(NETWARE)
-#include netware/pwd.h
 #else
 #include pwd.h
 #endif

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

[PHP-CVS] cvs: php-src /main php_compat.h

2005-02-23 Thread Anantha Kesari H Y 
hyanantha   Wed Feb 23 05:31:47 2005 EDT

  Modified files:  
/php-src/main   php_compat.h 
  Log:
  NetWare can make use autoconf generated header file
  
  
http://cvs.php.net/diff.php/php-src/main/php_compat.h?r1=1.22r2=1.23ty=u
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.22 php-src/main/php_compat.h:1.23
--- php-src/main/php_compat.h:1.22  Sun Jan  9 16:05:06 2005
+++ php-src/main/php_compat.h   Wed Feb 23 05:31:44 2005
@@ -16,15 +16,13 @@
   +--+
 */
 
-/* $Id: php_compat.h,v 1.22 2005/01/09 21:05:06 sniper Exp $ */
+/* $Id: php_compat.h,v 1.23 2005/02/23 10:31:44 hyanantha Exp $ */
 
 #ifndef PHP_COMPAT_H
 #define PHP_COMPAT_H
 
 #ifdef PHP_WIN32
 #include config.w32.h
-#elif defined(NETWARE)
-#include config.nw.h
 #else
 #include php_config.h
 #endif

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

[PHP-CVS] cvs: php-src /main php_open_temporary_file.c

2005-02-23 Thread Anantha Kesari H Y 
hyanantha   Wed Feb 23 05:54:07 2005 EDT

  Modified files:  
/php-src/main   php_open_temporary_file.c 
  Log:
  NetWare LibC has mkstemp implementation
  
  
http://cvs.php.net/diff.php/php-src/main/php_open_temporary_file.c?r1=1.31r2=1.32ty=u
Index: php-src/main/php_open_temporary_file.c
diff -u php-src/main/php_open_temporary_file.c:1.31 
php-src/main/php_open_temporary_file.c:1.32
--- php-src/main/php_open_temporary_file.c:1.31 Thu Oct  7 08:22:16 2004
+++ php-src/main/php_open_temporary_file.c  Wed Feb 23 05:54:06 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_open_temporary_file.c,v 1.31 2004/10/07 12:22:16 hyanantha Exp $ */
+/* $Id: php_open_temporary_file.c,v 1.32 2005/02/23 10:54:06 hyanantha Exp $ */
 
 #include php.h
 
@@ -106,9 +106,6 @@
 #endif
;
 #endif
-#ifdef NETWARE
-char *file_path = NULL;
-#endif
 
if (!path) {
return -1;
@@ -133,12 +130,6 @@
VCWD_CHMOD(opened_path, 0600);
fd = VCWD_OPEN_MODE(opened_path, open_flags, 0600);
}
-#elif defined(NETWARE)
-   /* Using standard mktemp() implementation for NetWare */
-   file_path = mktemp(opened_path);
-   if (file_path) {
-   fd = VCWD_OPEN(file_path, open_flags);
-   }
 #elif defined(HAVE_MKSTEMP)
fd = mkstemp(opened_path);
 #else

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

[PHP-CVS] cvs: php-src /ext/pdo_sqlite/sqlite/src .cvsignore

2005-02-23 Thread Joe Orton 
jorton  Wed Feb 23 06:14:28 2005 EDT

  Modified files:  
/php-src/ext/pdo_sqlite/sqlite/src  .cvsignore 
  Log:
  Ignore generated files.
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/sqlite/src/.cvsignore?r1=1.1r2=1.2ty=u
Index: php-src/ext/pdo_sqlite/sqlite/src/.cvsignore
diff -u php-src/ext/pdo_sqlite/sqlite/src/.cvsignore:1.1 
php-src/ext/pdo_sqlite/sqlite/src/.cvsignore:1.2
--- php-src/ext/pdo_sqlite/sqlite/src/.cvsignore:1.1Wed Feb 16 23:23:15 2005
+++ php-src/ext/pdo_sqlite/sqlite/src/.cvsignoreWed Feb 23 06:14:28 2005
@@ -1 +1,4 @@
+*.lo
 config.h
+*.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_5_0) / NEWS

2005-02-23 Thread Derick Rethans 
derick  Wed Feb 23 07:33:48 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS 
  Log:
  - MFH: fixed bug #32076 (ReflectionMethod :: isDestructor() always return
true).
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.260r2=1.1760.2.261ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.260 php-src/NEWS:1.1760.2.261
--- php-src/NEWS:1.1760.2.260   Tue Feb 22 09:59:29 2005
+++ php-src/NEWSWed Feb 23 07:33:47 2005
@@ -146,6 +146,8 @@
 - Extended the functionality of is_subclass_of() to accept either a class name
   or an object as first parameter. (Andrey) 
 - Fixed potential problems with unserializing invalid serialize data. (Marcus)
+- Fixed bug #32076 (ReflectionMethod::isDestructor() always return true). 
+  (Derick, Tony)
 - Fixed bug #31034 (Problem with non-existing iconv header file). (Derick)
 - Fixed bug #30995 (snmp extension does not build with net-snmp 5.2). (Ilia)
 - Fixed bug #30994 (SOAP server unable to handle request with references).

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

[PHP-CVS] cvs: php-src /ext/mbstring/libmbfl/mbfl mbfilter.c mbfilter.h

2005-02-23 Thread Moriyoshi Koizumi 
moriyoshi   Wed Feb 23 08:35:35 2005 EDT

  Modified files:  
/php-src/ext/mbstring/libmbfl/mbfl  mbfilter.c mbfilter.h 
  Log:
  - Synch with the latest checkouts.  (include fix by Joe Orton. Thanks.)
  
  
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.4r2=1.5ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.4 
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.5
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.4Sun Feb 20 17:18:08 2005
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.cWed Feb 23 08:35:34 2005
@@ -605,7 +605,7 @@
}
 }
 
-const enum mbfl_no_encoding
+enum mbfl_no_encoding
 mbfl_identify_encoding_no(mbfl_string *string, enum mbfl_no_encoding *elist, 
int elistsz)
 {
const mbfl_encoding *encoding;
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h?r1=1.3r2=1.4ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h:1.3 
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h:1.4
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h:1.3Wed Feb  4 02:24:07 2004
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.hWed Feb 23 08:35:34 2005
@@ -162,7 +162,7 @@
 MBFLAPI extern const char *
 mbfl_identify_encoding_name(mbfl_string *string, enum mbfl_no_encoding *elist, 
int elistsz, int strict);
 
-MBFLAPI extern const enum mbfl_no_encoding
+MBFLAPI extern enum mbfl_no_encoding
 mbfl_identify_encoding_no(mbfl_string *string, enum mbfl_no_encoding *elist, 
int elistsz);
 
 /*

-- 
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/mbstring/libmbfl/mbfl mbfilter.c mbfilter.h

2005-02-23 Thread Moriyoshi Koizumi 
moriyoshi   Wed Feb 23 08:35:57 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/mbstring/libmbfl/mbfl  mbfilter.c mbfilter.h 
  Log:
  - MFH: Synch with the latest checkouts.  (include fix by Joe Orton. Thanks.)
  
  
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.2.2.2r2=1.2.2.3ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.2.2.2 
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.2.2.3
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.2.2.2Sun Feb 20 
18:02:51 2005
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.cWed Feb 23 08:35:57 2005
@@ -605,7 +605,7 @@
}
 }
 
-const enum mbfl_no_encoding
+enum mbfl_no_encoding
 mbfl_identify_encoding_no(mbfl_string *string, enum mbfl_no_encoding *elist, 
int elistsz)
 {
const mbfl_encoding *encoding;
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h?r1=1.3r2=1.3.2.1ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h:1.3 
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h:1.3.2.1
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h:1.3Wed Feb  4 02:24:07 2004
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.hWed Feb 23 08:35:57 2005
@@ -162,7 +162,7 @@
 MBFLAPI extern const char *
 mbfl_identify_encoding_name(mbfl_string *string, enum mbfl_no_encoding *elist, 
int elistsz, int strict);
 
-MBFLAPI extern const enum mbfl_no_encoding
+MBFLAPI extern enum mbfl_no_encoding
 mbfl_identify_encoding_no(mbfl_string *string, enum mbfl_no_encoding *elist, 
int elistsz);
 
 /*

-- 
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/mbstring/libmbfl/mbfl mbfilter.c mbfilter.h

2005-02-23 Thread Moriyoshi Koizumi 
moriyoshi   Wed Feb 23 08:36:14 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/mbstring/libmbfl/mbfl  mbfilter.c mbfilter.h 
  Log:
  - MFH: Synch with the latest checkouts.  (include fix by Joe Orton. Thanks.)
  
  
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.1.2.2r2=1.1.2.3ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.2 
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.3
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.2Mon Feb 21 
02:10:13 2005
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.cWed Feb 23 08:36:14 2005
@@ -605,7 +605,7 @@
}
 }
 
-const enum mbfl_no_encoding
+enum mbfl_no_encoding
 mbfl_identify_encoding_no(mbfl_string *string, enum mbfl_no_encoding *elist, 
int elistsz)
 {
const mbfl_encoding *encoding;
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h?r1=1.2.2.2r2=1.2.2.3ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h:1.2.2.2 
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h:1.2.2.3
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.h:1.2.2.2Mon Feb 21 
02:10:13 2005
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.hWed Feb 23 08:36:14 2005
@@ -162,7 +162,7 @@
 MBFLAPI extern const char *
 mbfl_identify_encoding_name(mbfl_string *string, enum mbfl_no_encoding *elist, 
int elistsz, int strict);
 
-MBFLAPI extern const enum mbfl_no_encoding
+MBFLAPI extern enum mbfl_no_encoding
 mbfl_identify_encoding_no(mbfl_string *string, enum mbfl_no_encoding *elist, 
int elistsz);
 
 /*

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

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

2005-02-23 Thread Ard Biesheuvel 
abies   Wed Feb 23 12:44:23 2005 EDT

  Modified files:  
/php-src/ext/pdo_firebird   config.m4 
  Log:
  Added search for libfbclient
  
http://cvs.php.net/diff.php/php-src/ext/pdo_firebird/config.m4?r1=1.4r2=1.5ty=u
Index: php-src/ext/pdo_firebird/config.m4
diff -u php-src/ext/pdo_firebird/config.m4:1.4 
php-src/ext/pdo_firebird/config.m4:1.5
--- php-src/ext/pdo_firebird/config.m4:1.4  Wed Feb 16 23:23:14 2005
+++ php-src/ext/pdo_firebird/config.m4  Wed Feb 23 12:44:22 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.4 2005/02/17 04:23:14 wez Exp $
+dnl $Id: config.m4,v 1.5 2005/02/23 17:44:22 abies Exp $
 dnl
 
 PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO,
@@ -15,15 +15,22 @@
 FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/lib
   fi
 
-  PHP_CHECK_LIBRARY(gds, isc_detach_database,
+  PHP_CHECK_LIBRARY(fbclient, isc_detach_database,
   [
-FIREBIRD_LIBNAME=gds
+FIREBIRD_LIBNAME=fbclient
   ], [
-PHP_CHECK_LIBRARY(ib_util, isc_detach_database,
+PHP_CHECK_LIBRARY(gds, isc_detach_database,
 [
-  FIREBIRD_LIBNAME=ib_util
+  FIREBIRD_LIBNAME=gds
 ], [
-  AC_MSG_ERROR([libgds or libib_util not found! Check config.log for more 
information.])
+  PHP_CHECK_LIBRARY(ib_util, isc_detach_database,
+  [
+FIREBIRD_LIBNAME=ib_util
+  ], [
+AC_MSG_ERROR([libfbclient, libgds or libib_util not found! Check 
config.log for more information.])
+  ], [
+-L$FIREBIRD_LIBDIR
+  ])
 ], [
   -L$FIREBIRD_LIBDIR
 ])

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

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

2005-02-23 Thread Stefan Esser 
sesser  Wed Feb 23 13:26:40 2005 EDT

  Modified files:  
/php-src/ext/standard   var_unserializer.c var_unserializer.re 
  Log:
  Correcting bounds check before someone uses this code
  
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.54r2=1.55ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.54 
php-src/ext/standard/var_unserializer.c:1.55
--- php-src/ext/standard/var_unserializer.c:1.54Wed Feb 23 06:17:52 2005
+++ php-src/ext/standard/var_unserializer.c Wed Feb 23 13:26:38 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.c,v 1.54 2005/02/23 11:17:52 stas Exp $ */
+/* $Id: var_unserializer.c,v 1.55 2005/02/23 18:26:38 sesser Exp $ */
 
 #include php.h
 #include ext/standard/php_var.h
@@ -290,7 +290,7 @@
 
(*p) += 2;
 
-   if((*p) + datalen = max) {
+   if(datalen  0 || (*p) + datalen = max) {
zend_error(E_WARNING, Unsifficient data for unserializing - %d 
required, %d present, datalen, max - (*p));
return 0;
}
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.42r2=1.43ty=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.42 
php-src/ext/standard/var_unserializer.re:1.43
--- php-src/ext/standard/var_unserializer.re:1.42   Wed Feb 23 06:17:52 2005
+++ php-src/ext/standard/var_unserializer.reWed Feb 23 13:26:39 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.re,v 1.42 2005/02/23 11:17:52 stas Exp $ */
+/* $Id: var_unserializer.re,v 1.43 2005/02/23 18:26:39 sesser Exp $ */
 
 #include php.h
 #include ext/standard/php_var.h
@@ -294,7 +294,7 @@
 
(*p) += 2;
 
-   if((*p) + datalen = max) {
+   if(datalen  0 || (*p) + datalen = max) {
zend_error(E_WARNING, Unsifficient data for unserializing - %d 
required, %d present, datalen, max - (*p));
return 0;
}

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

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

2005-02-23 Thread Ilia Alshanetsky 
iliaa   Wed Feb 23 13:48:51 2005 EDT

  Modified files:  
/php-src/ext/bz2bz2.c 
  Log:
  MFB_4_3: Fixed bug #29521 (compress.bzip2 returns error when used with http 
  wrapper).
  
  
  
http://cvs.php.net/diff.php/php-src/ext/bz2/bz2.c?r1=1.7r2=1.8ty=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.7 php-src/ext/bz2/bz2.c:1.8
--- php-src/ext/bz2/bz2.c:1.7   Tue Jul 20 01:26:33 2004
+++ php-src/ext/bz2/bz2.c   Wed Feb 23 13:48:49 2005
@@ -16,7 +16,7 @@
   +--+
 */
  
-/* $Id: bz2.c,v 1.7 2004/07/20 05:26:33 pollita Exp $ */
+/* $Id: bz2.c,v 1.8 2005/02/23 18:48:49 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -185,7 +185,7 @@

if (bz_file == NULL) {
/* that didn't work, so try and get something from the 
network/wrapper */
-   stream = php_stream_open_wrapper(path, mode, options, 
opened_path);
+   stream = php_stream_open_wrapper(path, mode, options | 
STREAM_WILL_CAST, opened_path);

if (stream) {
int fd;

-- 
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/bz2 bz2.c

2005-02-23 Thread Ilia Alshanetsky 
iliaa   Wed Feb 23 13:48:57 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/bz2bz2.c 
  Log:
  MFB_4_3: Fixed bug #29521 (compress.bzip2 returns error when used with http 
  wrapper)
  
  
http://cvs.php.net/diff.php/php-src/ext/bz2/bz2.c?r1=1.6r2=1.6.2.1ty=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.6 php-src/ext/bz2/bz2.c:1.6.2.1
--- php-src/ext/bz2/bz2.c:1.6   Thu Jan  8 03:14:18 2004
+++ php-src/ext/bz2/bz2.c   Wed Feb 23 13:48:57 2005
@@ -16,7 +16,7 @@
   +--+
 */
  
-/* $Id: bz2.c,v 1.6 2004/01/08 08:14:18 andi Exp $ */
+/* $Id: bz2.c,v 1.6.2.1 2005/02/23 18:48:57 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -185,7 +185,7 @@

if (bz_file == NULL) {
/* that didn't work, so try and get something from the 
network/wrapper */
-   stream = php_stream_open_wrapper(path, mode, options, 
opened_path);
+   stream = php_stream_open_wrapper(path, mode, options | 
STREAM_WILL_CAST, opened_path);

if (stream) {
int fd;

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

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

2005-02-23 Thread Ilia Alshanetsky 
iliaa   Wed Feb 23 13:53:09 2005 EDT

  Modified files:  
/php-src/ext/standard   dir.c 
  Log:
  Fixed compiler warning.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/dir.c?r1=1.142r2=1.143ty=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.142 php-src/ext/standard/dir.c:1.143
--- php-src/ext/standard/dir.c:1.142Mon Feb 21 19:24:13 2005
+++ php-src/ext/standard/dir.c  Wed Feb 23 13:53:09 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.142 2005/02/22 00:24:13 iliaa Exp $ */
+/* $Id: dir.c,v 1.143 2005/02/23 18:53:09 iliaa Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -462,7 +462,7 @@
char *dirn;
int dirn_len;
long flags = 0;
-   php_stream_dirent **namelist;
+   char **namelist;
int n, i;
zval *zcontext = NULL;
php_stream_context *context = 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/standard dir.c

2005-02-23 Thread Ilia Alshanetsky 
iliaa   Wed Feb 23 13:53:19 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   dir.c 
  Log:
  MFH: fixed compiler warning.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/dir.c?r1=1.141.2.1r2=1.141.2.2ty=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.141.2.1 
php-src/ext/standard/dir.c:1.141.2.2
--- php-src/ext/standard/dir.c:1.141.2.1Mon Feb 21 19:24:51 2005
+++ php-src/ext/standard/dir.c  Wed Feb 23 13:53:19 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.141.2.1 2005/02/22 00:24:51 iliaa Exp $ */
+/* $Id: dir.c,v 1.141.2.2 2005/02/23 18:53:19 iliaa Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -462,7 +462,7 @@
char *dirn;
int dirn_len;
long flags = 0;
-   php_stream_dirent **namelist;
+   char **namelist;
int n, i;
zval *zcontext = NULL;
php_stream_context *context = NULL;

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

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

2005-02-23 Thread Ard Biesheuvel 
abies   Wed Feb 23 15:20:27 2005 EDT

  Modified files:  
/php-src/ext/interbase  interbase.c 
  Log:
  Fixed bug #31597: ibase_connect() - incorrect warning
  
http://cvs.php.net/diff.php/php-src/ext/interbase/interbase.c?r1=1.223r2=1.224ty=u
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.223 
php-src/ext/interbase/interbase.c:1.224
--- php-src/ext/interbase/interbase.c:1.223 Tue Jul  6 09:46:18 2004
+++ php-src/ext/interbase/interbase.c   Wed Feb 23 15:20:25 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: interbase.c,v 1.223 2004/07/06 13:46:18 abies Exp $ */
+/* $Id: interbase.c,v 1.224 2005/02/23 20:20:25 abies Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -591,7 +591,7 @@
dpb = dpb_buffer + 1;
 
for (i = 0; i  sizeof(dpb_args); ++i) {
-   if (dpb_args[i]  args[i]) {
+   if (dpb_args[i]  args[i]  len[i]) {
dpb += sprintf(dpb, %c%c%s, dpb_args[i],(unsigned 
char)len[i],args[i]);
}
}

-- 
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) / TODO_SEGFAULTS

2005-02-23 Thread Ilia Alshanetsky 
iliaa   Wed Feb 23 17:40:18 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcTODO_SEGFAULTS 
  Log:
  pack() issues were resolved.
  
  
http://cvs.php.net/diff.php/php-src/TODO_SEGFAULTS?r1=1.1.2.35r2=1.1.2.36ty=u
Index: php-src/TODO_SEGFAULTS
diff -u php-src/TODO_SEGFAULTS:1.1.2.35 php-src/TODO_SEGFAULTS:1.1.2.36
--- php-src/TODO_SEGFAULTS:1.1.2.35 Wed Jun  4 11:03:29 2003
+++ php-src/TODO_SEGFAULTS  Wed Feb 23 17:40:18 2005
@@ -25,12 +25,12 @@
 mb_strcut('', [number greater than the length of first arg]) (Moriyoshi)
 ext/exif, ext/dba (Marcus)
 php_base64_encode (Moriyoshi)
+pack (Ilia)

 Open:
 
 the dbase extension (1)
 socket_select   (2)
-pack(3)

 (1) heap corruption, mostly visible in malloc-related calls.  Whether you see 
 this or not might depend on your libc/compiler.  Hard to track down,
@@ -70,8 +70,6 @@
 
 echo dbase_open | php do_crash.txt
 
-(3) multiple integer overflows, ex. pack(d4294967297, 2);
-
 Amendment 1.
 
 CFLAGS='-O0 -g' \

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

[PHP-CVS] cvs: php-src /main/streams mmap.c

2005-02-23 Thread Ilia Alshanetsky 
iliaa   Wed Feb 23 17:41:05 2005 EDT

  Modified files:  
/php-src/main/streams   mmap.c 
  Log:
  Increase maximum mmapable file size to 2mb from 1mb.
  
  
http://cvs.php.net/diff.php/php-src/main/streams/mmap.c?r1=1.5r2=1.6ty=u
Index: php-src/main/streams/mmap.c
diff -u php-src/main/streams/mmap.c:1.5 php-src/main/streams/mmap.c:1.6
--- php-src/main/streams/mmap.c:1.5 Wed Apr 21 08:02:47 2004
+++ php-src/main/streams/mmap.c Wed Feb 23 17:41:05 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: mmap.c,v 1.5 2004/04/21 12:02:47 wez Exp $ */
+/* $Id: mmap.c,v 1.6 2005/02/23 22:41:05 iliaa Exp $ */
 
 /* Memory Mapping interface for streams */
 #include php.h
@@ -33,7 +33,7 @@
 
/* For now, we impose an arbitrary 1MB limit to avoid
 * runaway swapping when large files are passed thru. */
-   if (length  1 * 1024 * 1024) {
+   if (length  2 * 1024 * 1024) {
return NULL;
}


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

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

2005-02-23 Thread Ilia Alshanetsky 
iliaa   Wed Feb 23 18:39:36 2005 EDT

  Modified files:  
/php-src/ext/standard   image.c 
  Log:
  Additional safety checks. 
  # More to follow
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.103r2=1.104ty=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.103 php-src/ext/standard/image.c:1.104
--- php-src/ext/standard/image.c:1.103  Wed Feb 23 17:49:32 2005
+++ php-src/ext/standard/image.cWed Feb 23 18:39:36 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: image.c,v 1.103 2005/02/23 22:49:32 helly Exp $ */
+/* $Id: image.c,v 1.104 2005/02/23 23:39:36 iliaa Exp $ */
 
 #include php.h
 #include stdio.h
@@ -636,6 +636,10 @@
dummy_int = php_read4(stream TSRMLS_CC); /* YTOsiz */
 
result-channels = php_read2(stream TSRMLS_CC); /* Csiz */
+   if (result-channels  0 || result-channels  256) {
+   efree(result);
+   return NULL;
+   }
 
/* Collect bit depth info */
highest_bit_depth = bit_depth = 0;
@@ -683,7 +687,7 @@
break;
}
 
-   if (box_length == 1) {
+   if (box_length = 1) {
/* We won't handle XLBoxes */
return NULL;
}
@@ -698,7 +702,9 @@
}
 
/* Skip over LBox (Which includes both TBox and LBox itself */
-   php_stream_seek(stream, box_length - 8, SEEK_CUR); 
+   if (php_stream_seek(stream, box_length - 8, SEEK_CUR)) {
+   break;
+   }
}
 
if (result == NULL) {



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

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

2005-02-23 Thread Marcus Boerger 
helly   Wed Feb 23 19:12:15 2005 EDT

  Modified files:  
/php-src/ext/standard   image.c 
  Log:
  - Prevent superflous memory allocation
  
http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.104r2=1.105ty=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.104 php-src/ext/standard/image.c:1.105
--- php-src/ext/standard/image.c:1.104  Wed Feb 23 18:39:36 2005
+++ php-src/ext/standard/image.cWed Feb 23 19:12:15 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: image.c,v 1.104 2005/02/23 23:39:36 iliaa Exp $ */
+/* $Id: image.c,v 1.105 2005/02/24 00:12:15 helly Exp $ */
 
 #include php.h
 #include stdio.h
@@ -867,10 +867,11 @@
  */
 static struct gfxinfo *php_handle_iff(php_stream * stream TSRMLS_DC)
 {
-   struct gfxinfo *result = NULL;
+   struct gfxinfo * result;
unsigned char a[10];
int chunkId;
int size;
+   short width, height, bits;
 
if (php_stream_read(stream, a, 8) != 8) {
return NULL;
@@ -893,18 +894,20 @@
size++;
}
if (chunkId == 0x424d4844) { /* BMHD chunk */
-   if (php_stream_read(stream, a, 9) != 9) {
+   if (size  9 || php_stream_read(stream, a, 9) != 9) {
return NULL;
}
-   result = (struct gfxinfo *) ecalloc(1, sizeof(struct 
gfxinfo));
-   result-width= php_ifd_get16s(a+0, 1);
-   result-height   = php_ifd_get16s(a+2, 1);
-   result-bits = a[8]  0xff;
-   result-channels = 0;
-   if (result-width  0  result-height  0  
result-bits  0  result-bits  33) {
+   width  = php_ifd_get16s(a+0, 1);
+   height = php_ifd_get16s(a+2, 1);
+   bits   = a[8]  0xff;
+   if (width  0  height  0  bits  0  bits  33) {
+   result = (struct gfxinfo *) ecalloc(1, 
sizeof(struct gfxinfo));
+   result-width= width;
+   result-height   = height;
+   result-bits = bits;
+   result-channels = 0;
return result;
}
-   efree(result);
} else {
if (php_stream_seek(stream, size, SEEK_CUR)) {
return NULL;

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

[PHP-CVS] cvs: php-src /main/streams mmap.c

2005-02-23 Thread Andi Gutmans 
andiWed Feb 23 22:04:57 2005 EDT

  Modified files:  
/php-src/main/streams   mmap.c 
  Log:
  - Fix comment
  
  
http://cvs.php.net/diff.php/php-src/main/streams/mmap.c?r1=1.6r2=1.7ty=u
Index: php-src/main/streams/mmap.c
diff -u php-src/main/streams/mmap.c:1.6 php-src/main/streams/mmap.c:1.7
--- php-src/main/streams/mmap.c:1.6 Wed Feb 23 17:41:05 2005
+++ php-src/main/streams/mmap.c Wed Feb 23 22:04:57 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: mmap.c,v 1.6 2005/02/23 22:41:05 iliaa Exp $ */
+/* $Id: mmap.c,v 1.7 2005/02/24 03:04:57 andi Exp $ */
 
 /* Memory Mapping interface for streams */
 #include php.h
@@ -31,7 +31,7 @@
range.mode = mode;
range.mapped = NULL;
 
-   /* For now, we impose an arbitrary 1MB limit to avoid
+   /* For now, we impose an arbitrary 2MB limit to avoid
 * runaway swapping when large files are passed thru. */
if (length  2 * 1024 * 1024) {
return NULL;

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