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

2007-01-29 Thread changelog
changelog   Tue Jan 30 01:30:59 2007 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2585r2=1.2586diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2585 php-src/ChangeLog:1.2586
--- php-src/ChangeLog:1.2585Sun Jan 28 01:31:08 2007
+++ php-src/ChangeLog   Tue Jan 30 01:30:58 2007
@@ -1,3 +1,109 @@
+2007-01-29  Nuno Lopes  [EMAIL PROTECTED]
+
+* run-tests.php:
+  display all errors/leaks/warnings on each test, instead of showing just 
the
+  top most error
+
+2007-01-29  Rui Hirokawa  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  ext/mbstring/config.m4
+  ext/mbstring/libmbfl/filters/Makefile.am
+  ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c
+  ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c
+  ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c
+  ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.h
+  ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.h
+  ext/mbstring/libmbfl/filters/mbfilter_jis.c
+  ext/mbstring/libmbfl/filters/mbfilter_jis.h
+  ext/mbstring/libmbfl/filters/unicode_table_jis.h
+  ext/mbstring/libmbfl/mbfl/mbfl_convert.c
+  ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
+  ext/mbstring/libmbfl/mbfl/mbfl_ident.c:
+  fixed incompatibility with PHP 5.2.0 for encoding conversion between
+  ShiftJIS(CP932), eucJP, ISO-2022-JP.
+
+2007-01-29  Dmitry Stogov  [EMAIL PROTECTED]
+
+* sapi/cgi/cgi_main.c:
+  Prevent flush() of closed handle on php_module_shutdown()
+
+2007-01-29  Nuno Lopes  [EMAIL PROTECTED]
+
+* ext/soap/php_xml.c:
+  fix access to already free'ed memory
+
+2007-01-29  Dmitry Stogov  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  sapi/cgi/cgi_main.c:
+  Prevent flush of closed handle on php_module_shutdown()
+
+2007-01-29  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/oci8/tests/privileged_connect1.phpt:
+  fix test
+  different Oracle client versions report different error messages
+
+* ext/oci8/tests/array_bind_005.phpt:
+  fix test
+
+2007-01-29  Pierre-Alain Joye  [EMAIL PROTECTED]
+
+* ext/zip/php_zip.c
+  ext/zip/tests/bug40228.phpt
+  ext/zip/tests/bug40228.zip:
+  - MFB: #40228, ZipArchive::extractTo does create empty directories
+   recursively
+
+* (PHP_5_2)
+  NEWS:
+  - #40228
+
+* (PHP_5_2)
+  ext/zip/php_zip.c
+  ext/zip/tests/bug40228.phpt
+  ext/zip/tests/bug40228.phpt
+  ext/zip/tests/bug40228.zip
+  ext/zip/tests/bug40228.zip:
+  - #40228, ZipArchive::extractTo does create empty directories
+recursively
+
+2007-01-29  Michael Wallner  [EMAIL PROTECTED]
+
+* main/output.c:
+  - don't do memory limit checks for chunk_size
+
+2007-01-29  Dmitry Stogov  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  NEWS
+  main/output.c:
+  Fixed bug #40259 (ob_start call many times - memory error). (Dmitry)
+
+2007-01-29  Antony Dovgal  [EMAIL PROTECTED]
+
+* (PHP_4_4)
+  NEWS
+  ext/imap/config.m4
+  ext/imap/php_imap.c:
+  backported fix for ext/imap compilation failure with recent c-client
+  versions
+  (fixes #39401)
+
+2007-01-29  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* ZendEngine2/zend_ini_parser.y
+  ZendEngine2/zend_language_parser.y
+  ZendEngine2/zend_language_scanner.l
+  win32/build/Makefile
+  win32/build/buildconf.js
+  win32/build/confutils.js
+  win32/build/cvsclean.js
+  win32/build/template.rc:
+  
+  Copyright update
+
 2007-01-27  Antony Dovgal  [EMAIL PROTECTED]
 
 * (PHP_5_2)


[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

2007-01-29 Thread changelog
changelog   Tue Jan 30 01:31:01 2007 UTC

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1062r2=1.1063diff_format=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.1062 ZendEngine2/ChangeLog:1.1063
--- ZendEngine2/ChangeLog:1.1062Tue Jan 23 01:31:13 2007
+++ ZendEngine2/ChangeLog   Tue Jan 30 01:31:01 2007
@@ -1,3 +1,11 @@
+2007-01-29  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* zend_ini_parser.y
+  zend_language_parser.y
+  zend_language_scanner.l:
+  
+  Copyright update
+
 2007-01-22  Antony Dovgal  [EMAIL PROTECTED]
 
 * (PHP_5_2)
@@ -16706,7 +16714,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.1062 2007/01/23 01:31:13 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.1063 2007/01/30 01:31:01 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -18430,7 +18438,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.1062 2007/01/23 01:31:13 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.1063 2007/01/30 01:31:01 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]
 


[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/imap config.m4 php_imap.c

2007-01-29 Thread Antony Dovgal
tony2001Mon Jan 29 10:08:17 2007 UTC

  Modified files:  (Branch: PHP_4_4)
/php-srcNEWS 
/php-src/ext/imap   config.m4 php_imap.c 
  Log:
  backported fix for ext/imap compilation failure with recent c-client versions
  (fixes #39401)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.186r2=1.1247.2.920.2.187diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.186 php-src/NEWS:1.1247.2.920.2.187
--- php-src/NEWS:1.1247.2.920.2.186 Mon Jan 22 19:59:21 2007
+++ php-src/NEWSMon Jan 29 10:08:16 2007
@@ -7,6 +7,8 @@
   class). (Ilia)
 - Backported a fix in the configure tests to detect the rounding fuzz.
   (Derick, Joe Orton)
+- Backported fix for ext/imap compilation failure with recent c-client 
+  versions. (Tony)
 
 - Moved extensions to PECL:
   . ext/ovrimos (Derick)
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.49.2.15r2=1.49.2.15.2.1diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.49.2.15 
php-src/ext/imap/config.m4:1.49.2.15.2.1
--- php-src/ext/imap/config.m4:1.49.2.15Tue Jan 11 04:56:57 2005
+++ php-src/ext/imap/config.m4  Mon Jan 29 10:08:17 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.49.2.15 2005/01/11 04:56:57 sniper Exp $
+dnl $Id: config.m4,v 1.49.2.15.2.1 2007/01/29 10:08:17 tony2001 Exp $
 dnl
 
 AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -127,6 +127,49 @@
   AC_DEFINE(HAVE_IMAP2004,1,[ ])
 ])
 
+dnl Check for new version of the utf8_mime2text() function
+old_CFLAGS=$CFLAGS
+CFLAGS=-I$IMAP_INC_DIR
+AC_CACHE_CHECK(for utf8_mime2text signature, ac_cv_utf8_mime2text,
+  AC_TRY_COMPILE([
+#include stdio.h
+#include c-client.h
+  ],[
+SIZEDTEXT *src, *dst;
+utf8_mime2text(src, dst);
+  ],[
+ac_cv_utf8_mime2text=old
+  ],[
+ac_cv_utf8_mime2text=new
+  ])
+)
+if test $ac_cv_utf8_mime2text = new; then
+  AC_DEFINE(HAVE_NEW_MIME2TEXT, 1, [Whether utf8_mime2text() has new 
signature])
+fi
+CFLAGS=$old_CPPFLAGS
+
+old_CFLAGS=$CFLAGS
+CFLAGS=-I$IMAP_INC_DIR
+AC_CACHE_CHECK(for U8T_CANONICAL, ac_cv_u8t_canonical,
+  AC_TRY_COMPILE([
+#include c-client.h
+  ],[
+ int i = U8T_CANONICAL;
+  ],[
+ ac_cv_u8t_canonical=yes
+  ],[
+ ac_cv_u8t_canonical=no
+  ])
+)
+CFLAGS=$old_CPPFLAGS
+
+if test $ac_cv_u8t_canonical = no  test $ac_cv_utf8_mime2text = 
new; then
+AC_MSG_ERROR([utf8_mime2text() has new signature, but U8T_CANONICAL is 
missing. This should not happen. Check config.log for additional information.])
+fi
+if test $ac_cv_u8t_canonical = yes  test $ac_cv_utf8_mime2text = 
old; then
+AC_MSG_ERROR([utf8_mime2text() has old signature, but U8T_CANONICAL is 
present. This should not happen. Check config.log for additional information.])
+fi
+
 dnl Check for c-client version 2001
 old_CPPFLAGS=$CPPFLAGS
 CPPFLAGS=-I$IMAP_INC_DIR
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.142.2.44.2.10r2=1.142.2.44.2.11diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.142.2.44.2.10 
php-src/ext/imap/php_imap.c:1.142.2.44.2.11
--- php-src/ext/imap/php_imap.c:1.142.2.44.2.10 Mon Jan  1 09:46:43 2007
+++ php-src/ext/imap/php_imap.c Mon Jan 29 10:08:17 2007
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.142.2.44.2.10 2007/01/01 09:46:43 sebastian Exp $ */
+/* $Id: php_imap.c,v 1.142.2.44.2.11 2007/01/29 10:08:17 tony2001 Exp $ */
 
 #define IMAP41
 
@@ -74,7 +74,11 @@
 void rfc822_date(char *date);
 char *cpystr(const char *str);
 char *cpytxt(SIZEDTEXT *dst, char *text, unsigned long size);
+#ifndef HAVE_NEW_MIME2TEXT
 long utf8_mime2text(SIZEDTEXT *src, SIZEDTEXT *dst);
+#else
+long utf8_mime2text (SIZEDTEXT *src, SIZEDTEXT *dst, long flags);
+#endif
 unsigned long find_rightmost_bit(unsigned long *valptr);
 void fs_give(void **block);
 void *fs_get(size_t size);
@@ -2064,7 +2068,11 @@
dest.size = 0;
 
cpytxt(src, Z_STRVAL_PP(str), Z_STRLEN_PP(str));
+#ifndef HAVE_NEW_MIME2TEXT
utf8_mime2text(src, dest);
+#else
+   utf8_mime2text(src, dest, U8T_CANONICAL);
+#endif
RETURN_STRINGL(dest.data, strlen(dest.data), 1);
 }
 /* }}} */

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



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main output.c

2007-01-29 Thread Dmitry Stogov
dmitry  Mon Jan 29 11:21:31 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   output.c 
/php-srcNEWS 
  Log:
  Fixed bug #40259 (ob_start call many times - memory error). (Dmitry)
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.167.2.3.2.1r2=1.167.2.3.2.2diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.167.2.3.2.1 php-src/main/output.c:1.167.2.3.2.2
--- php-src/main/output.c:1.167.2.3.2.1 Mon Jan  1 09:36:11 2007
+++ php-src/main/output.c   Mon Jan 29 11:21:31 2007
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: output.c,v 1.167.2.3.2.1 2007/01/01 09:36:11 sebastian Exp $ */
+/* $Id: output.c,v 1.167.2.3.2.2 2007/01/29 11:21:31 dmitry Exp $ */
 
 #include php.h
 #include ext/standard/head.h
@@ -416,9 +416,23 @@
  */
 static int php_ob_init_named(uint initial_size, uint block_size, char 
*handler_name, zval *output_handler, uint chunk_size, zend_bool erase TSRMLS_DC)
 {
+   php_ob_buffer tmp_buf;
+
if (output_handler  !zend_is_callable(output_handler, 0, NULL)) {
return FAILURE;
}
+   
+   tmp_buf.block_size = block_size;
+   tmp_buf.size = initial_size;
+   tmp_buf.buffer = (char *) emalloc(initial_size+1);
+   tmp_buf.text_length = 0;
+   tmp_buf.output_handler = output_handler;
+   tmp_buf.chunk_size = chunk_size;
+   tmp_buf.status = 0;
+   tmp_buf.internal_output_handler = NULL;
+   tmp_buf.handler_name = 
estrdup(handler_namehandler_name[0]?handler_name:OB_DEFAULT_HANDLER_NAME);
+   tmp_buf.erase = erase;
+
if (OG(ob_nesting_level)0) {
 #if HAVE_ZLIB  !defined(COMPILE_DL_ZLIB)
if (!strncmp(handler_name, ob_gzhandler, 
sizeof(ob_gzhandler))  php_ob_gzhandler_check(TSRMLS_C)) {
@@ -431,16 +445,7 @@
zend_stack_push(OG(ob_buffers), OG(active_ob_buffer), 
sizeof(php_ob_buffer));
}
OG(ob_nesting_level)++;
-   OG(active_ob_buffer).block_size = block_size;
-   OG(active_ob_buffer).size = initial_size;
-   OG(active_ob_buffer).buffer = (char *) emalloc(initial_size+1);
-   OG(active_ob_buffer).text_length = 0;
-   OG(active_ob_buffer).output_handler = output_handler;
-   OG(active_ob_buffer).chunk_size = chunk_size;
-   OG(active_ob_buffer).status = 0;
-   OG(active_ob_buffer).internal_output_handler = NULL;
-   OG(active_ob_buffer).handler_name = 
estrdup(handler_namehandler_name[0]?handler_name:OB_DEFAULT_HANDLER_NAME);
-   OG(active_ob_buffer).erase = erase;
+   OG(active_ob_buffer) = tmp_buf;
OG(php_body_write) = php_b_body_write;
return SUCCESS;
 }
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.513r2=1.2027.2.547.2.514diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.513 php-src/NEWS:1.2027.2.547.2.514
--- php-src/NEWS:1.2027.2.547.2.513 Fri Jan 26 15:15:16 2007
+++ php-src/NEWSMon Jan 29 11:21:31 2007
@@ -1,6 +1,7 @@
 PHPNEWS
 |||
 ?? ??? 2007, PHP 5.2.1
+- Fixed bug #40259 (ob_start call many times - memory error). (Dmitry)
 - Fixed bug #40231 (file_exists incorrectly reports false). (Dmitry)
 
 25 Jan 2007, PHP 5.2.1RC4

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



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

2007-01-29 Thread Michael Wallner
mikeMon Jan 29 13:04:57 2007 UTC

  Modified files:  
/php-src/main   output.c 
  Log:
  - don't do memory limit checks for chunk_size
  
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.204r2=1.205diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.204 php-src/main/output.c:1.205
--- php-src/main/output.c:1.204 Mon Jan  1 09:29:35 2007
+++ php-src/main/output.c   Mon Jan 29 13:04:57 2007
@@ -19,7 +19,7 @@
+--+
 */
 
-/* $Id: output.c,v 1.204 2007/01/01 09:29:35 sebastian Exp $ */
+/* $Id: output.c,v 1.205 2007/01/29 13:04:57 mike Exp $ */
 
 #ifndef PHP_OUTPUT_DEBUG
 #  define PHP_OUTPUT_DEBUG 0
@@ -887,20 +887,11 @@
 static inline php_output_handler *php_output_handler_init_ex(zval *name, 
size_t chunk_size, int flags TSRMLS_DC)
 {
php_output_handler *handler;
-   size_t mem_limit;

handler = ecalloc(1, sizeof(php_output_handler));
ZVAL_ADDREF(name);
handler-name = name;
-   
-   mem_limit = (PG(memory_limit) - zend_memory_usage(1 TSRMLS_CC)) / 2;
-   if (!chunk_size || chunk_size  mem_limit) {
-   handler-size = mem_limit;
-   chunk_size = 0;
-   } else {
-   handler-size = chunk_size;
-   }
-
+   handler-size = chunk_size;
handler-flags = flags;
handler-buffer.size = PHP_OUTPUT_HANDLER_INITBUF_SIZE(chunk_size);
handler-buffer.data = emalloc(handler-buffer.size);

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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/zip php_zip.c /ext/zip/tests bug40228.phpt bug40228.zip

2007-01-29 Thread Pierre-Alain Joye
pajoye  Mon Jan 29 15:25:06 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/zip/tests  bug40228.phpt bug40228.zip 

  Modified files:  
/php-src/ext/zipphp_zip.c 
  Log:
  - #40228, ZipArchive::extractTo does create empty directories
recursively
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.26r2=1.1.2.27diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.26 php-src/ext/zip/php_zip.c:1.1.2.27
--- php-src/ext/zip/php_zip.c:1.1.2.26  Sun Jan  7 03:12:14 2007
+++ php-src/ext/zip/php_zip.c   Mon Jan 29 15:25:06 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_zip.c,v 1.1.2.26 2007/01/07 03:12:14 iliaa Exp $ */
+/* $Id: php_zip.c,v 1.1.2.27 2007/01/29 15:25:06 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -106,27 +106,32 @@
 
char *file_basename;
size_t file_basename_len;
+   int is_dir_only = 0;
 
if (file_len = MAXPATHLEN || zip_stat(za, file, 0, sb)) {
return 0;
}
 
-   memcpy(file_dirname, file, file_len);
-
-   dir_len = php_dirname(file_dirname, file_len);
-
-   if (dir_len  0) {
-   len = spprintf(file_dirname_fullpath, 0, %s/%s, dest, 
file_dirname);
+   if (file_len  1  file[file_len - 1] == '/') {
+   len = spprintf(file_dirname_fullpath, 0, %s/%s, dest, file);
+   is_dir_only = 1;
} else {
-   len = spprintf(file_dirname_fullpath, 0, %s, dest);
-   }
+   memcpy(file_dirname, file, file_len);
+   dir_len = php_dirname(file_dirname, file_len);
 
-   php_basename(file, file_len, NULL, 0, file_basename, 
file_basename_len TSRMLS_CC);
+   if (dir_len  0) {
+   len = spprintf(file_dirname_fullpath, 0, %s/%s, 
dest, file_dirname);
+   } else {
+   len = spprintf(file_dirname_fullpath, 0, %s, dest);
+   }
 
-   if (SAFEMODE_CHECKFILE(file_dirname_fullpath)) {
-   efree(file_dirname_fullpath);
-   efree(file_basename);
-   return 0;
+   php_basename(file, file_len, NULL, 0, file_basename, (unsigned 
int *)file_basename_len TSRMLS_CC);
+
+   if (SAFEMODE_CHECKFILE(file_dirname_fullpath)) {
+   efree(file_dirname_fullpath);
+   efree(file_basename);
+   return 0;
+   }
}
 
/* let see if the path already exists */
@@ -142,7 +147,9 @@
/* it is a standalone directory, job done */
if (file[file_len - 1] == '/') {
efree(file_dirname_fullpath);
-   efree(file_basename);
+   if (!is_dir_only) {
+   efree(file_basename);
+   }
return 1;
}
 
@@ -2009,7 +2016,7 @@
php_info_print_table_start();
 
php_info_print_table_row(2, Zip, enabled);
-   php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 
1.1.2.26 2007/01/07 03:12:14 iliaa Exp $);
+   php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 
1.1.2.27 2007/01/29 15:25:06 pajoye Exp $);
php_info_print_table_row(2, Zip version, 2.0.0);
php_info_print_table_row(2, Libzip version, 0.7.1);
 

http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug40228.phpt?view=markuprev=1.1
Index: php-src/ext/zip/tests/bug40228.phpt
+++ php-src/ext/zip/tests/bug40228.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug40228.zip?view=markuprev=1.1
Index: php-src/ext/zip/tests/bug40228.zip
+++ php-src/ext/zip/tests/bug40228.zip

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



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

2007-01-29 Thread Pierre-Alain Joye
pajoye  Mon Jan 29 15:25:35 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - #40228
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.514r2=1.2027.2.547.2.515diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.514 php-src/NEWS:1.2027.2.547.2.515
--- php-src/NEWS:1.2027.2.547.2.514 Mon Jan 29 11:21:31 2007
+++ php-src/NEWSMon Jan 29 15:25:35 2007
@@ -3,6 +3,8 @@
 ?? ??? 2007, PHP 5.2.1
 - Fixed bug #40259 (ob_start call many times - memory error). (Dmitry)
 - Fixed bug #40231 (file_exists incorrectly reports false). (Dmitry)
+- Fixed bug #40228 (ZipArchive::extractTo does create empty directories 
+  recursively). (Pierre)
 
 25 Jan 2007, PHP 5.2.1RC4
 - Fixed PECL bug #7295 (ORA-01405: fetched column value is NULL on LOB fields).

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



[PHP-CVS] cvs: php-src /ext/zip php_zip.c /ext/zip/tests bug40228.phpt bug40228.zip

2007-01-29 Thread Pierre-Alain Joye
pajoye  Mon Jan 29 16:01:55 2007 UTC

  Modified files:  
/php-src/ext/zipphp_zip.c 
/php-src/ext/zip/tests  bug40228.phpt bug40228.zip 
  Log:
  - MFB: #40228, ZipArchive::extractTo does create empty directories
   recursively
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.37r2=1.38diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.37 php-src/ext/zip/php_zip.c:1.38
--- php-src/ext/zip/php_zip.c:1.37  Sat Jan  6 20:30:23 2007
+++ php-src/ext/zip/php_zip.c   Mon Jan 29 16:01:55 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_zip.c,v 1.37 2007/01/06 20:30:23 nlopess Exp $ */
+/* $Id: php_zip.c,v 1.38 2007/01/29 16:01:55 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -101,23 +101,28 @@
 
char *file_basename;
size_t file_basename_len;
+   int is_dir_only = 0;
 
if (file_len = MAXPATHLEN || zip_stat(za, file, 0, sb)) {
return 0;
}
 
-   memcpy(file_dirname, file, file_len);
-
-   dir_len = php_dirname(file_dirname, file_len);
-
-   if (dir_len  0) {
-   len = spprintf(file_dirname_fullpath, 0, %s/%s, dest, 
file_dirname);
+   if (file_len  1  file[file_len - 1] == '/') {
+   len = spprintf(file_dirname_fullpath, 0, %s/%s, dest, file);
+   is_dir_only = 1;
} else {
-   len = spprintf(file_dirname_fullpath, 0, %s, dest);
-   }
+   memcpy(file_dirname, file, file_len);
 
-   php_basename(file, file_len, NULL, 0, file_basename, 
file_basename_len TSRMLS_CC);
+   dir_len = php_dirname(file_dirname, file_len);
+
+   if (dir_len  0) {
+   len = spprintf(file_dirname_fullpath, 0, %s/%s, 
dest, file_dirname);
+   } else {
+   len = spprintf(file_dirname_fullpath, 0, %s, dest);
+   }
 
+   php_basename(file, file_len, NULL, 0, file_basename, (unsigned 
int *)file_basename_len TSRMLS_CC);
+   }
/* let see if the path already exists */
if (php_stream_stat_path(file_dirname_fullpath, ssb)  0) {
ret = php_stream_mkdir(file_dirname_fullpath, 0777,  
PHP_STREAM_MKDIR_RECURSIVE, NULL);
@@ -131,7 +136,9 @@
/* it is a standalone directory, job done */
if (file[file_len - 1] == '/') {
efree(file_dirname_fullpath);
-   efree(file_basename);
+   if (!is_dir_only) {
+   efree(file_basename);
+   }
return 1;
}
 
@@ -2076,7 +2083,7 @@
php_info_print_table_start();
 
php_info_print_table_row(2, Zip, enabled);
-   php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 1.37 
2007/01/06 20:30:23 nlopess Exp $);
+   php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 1.38 
2007/01/29 16:01:55 pajoye Exp $);
php_info_print_table_row(2, Zip version, 2.0.0);
php_info_print_table_row(2, Libzip version, 0.7.1);
 
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug40228.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/zip/tests/bug40228.phpt
diff -u /dev/null php-src/ext/zip/tests/bug40228.phpt:1.2
--- /dev/null   Mon Jan 29 16:01:55 2007
+++ php-src/ext/zip/tests/bug40228.phpt Mon Jan 29 16:01:55 2007
@@ -0,0 +1,23 @@
+--TEST--
+Bug #40228 (extractTo does not create recursive empty path)
+--SKIPIF--
+?php if (!extension_loaded(zip)) print skip; ?
+--FILE--
+?php
+$dest = dirname(__FILE__);
+$arc_name = $dest . /bug40228.zip;
+$zip = new ZipArchive;
+$zip-open($arc_name, ZIPARCHIVE::CREATE);;
+$zip-extractTo($dest);
+if (is_dir($dest . '/test/empty')) {
+   echo Ok\n;
+   rmdir($dest . '/test/empty');
+   rmdir($dest . '/test');
+} else {
+   echo Failed.\n;
+}
+echo Done\n;
+?
+--EXPECT--
+Ok
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug40228.zip?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/zip/tests/bug40228.zip

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



[PHP-CVS] cvs: php-src /ext/oci8/tests array_bind_005.phpt

2007-01-29 Thread Antony Dovgal
tony2001Mon Jan 29 16:16:07 2007 UTC

  Modified files:  
/php-src/ext/oci8/tests array_bind_005.phpt 
  Log:
  fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/array_bind_005.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/oci8/tests/array_bind_005.phpt
diff -u php-src/ext/oci8/tests/array_bind_005.phpt:1.4 
php-src/ext/oci8/tests/array_bind_005.phpt:1.5
--- php-src/ext/oci8/tests/array_bind_005.phpt:1.4  Fri Nov 10 16:56:19 2006
+++ php-src/ext/oci8/tests/array_bind_005.phpt  Mon Jan 29 16:16:07 2007
@@ -59,7 +59,6 @@
 echo Done\n;
 ?
 --EXPECTF--
-Warning: oci_execute(): ORA-01405: fetched column value is NULL in %s on line 
%d
 array(5) {
   [0]=
   string(0) 
@@ -74,7 +73,6 @@
 }
 Done
 --UEXPECTF--
-Warning: oci_execute(): ORA-01405: fetched column value is NULL in %s on line 
%d
 array(5) {
   [0]=
   unicode(0) 

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



[PHP-CVS] cvs: php-src /ext/oci8/tests privileged_connect1.phpt

2007-01-29 Thread Antony Dovgal
tony2001Mon Jan 29 16:18:15 2007 UTC

  Modified files:  
/php-src/ext/oci8/tests privileged_connect1.phpt 
  Log:
  fix test
  different Oracle client versions report different error messages
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/privileged_connect1.phpt?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/oci8/tests/privileged_connect1.phpt
diff -u php-src/ext/oci8/tests/privileged_connect1.phpt:1.5 
php-src/ext/oci8/tests/privileged_connect1.phpt:1.6
--- php-src/ext/oci8/tests/privileged_connect1.phpt:1.5 Thu Dec 21 19:22:49 2006
+++ php-src/ext/oci8/tests/privileged_connect1.phpt Mon Jan 29 16:18:15 2007
@@ -26,9 +26,9 @@
 Warning: oci_connect() expects parameter 5 to be long, string given in %s on 
line %d
 Done
 --UEXPECTF--
-Warning: oci_connect(): ORA-01017: invalid username/password; logon denied in 
%s on line %d
+Warning: oci_connect(): ORA-%d: %s in %s on line %d
 
-Warning: oci_connect(): ORA-01017: invalid username/password; logon denied in 
%s on line %d
+Warning: oci_connect(): ORA-%d: %s in %s on line %d
 
 Warning: oci_connect(): Invalid session mode specified (-1) in %s on line %d
 

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



[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cgi cgi_main.c

2007-01-29 Thread Dmitry Stogov
dmitry  Mon Jan 29 19:36:01 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/sapi/cgi   cgi_main.c 
  Log:
  Prevent flush of closed handle on php_module_shutdown()
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.20r2=1.267.2.15.2.21diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.20 
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.21
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.20 Mon Jan  1 09:36:12 2007
+++ php-src/sapi/cgi/cgi_main.c Mon Jan 29 19:36:01 2007
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.15.2.20 2007/01/01 09:36:12 sebastian Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.21 2007/01/29 19:36:01 dmitry Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -1519,6 +1519,7 @@
 
case 'i': /* php info  quit */
if 
(php_request_startup(TSRMLS_C) == FAILURE) {
+   SG(server_context) = 
NULL;

php_module_shutdown(TSRMLS_C);
return FAILURE;
}
@@ -1566,6 +1567,7 @@
case 'v': /* show php version  quit */
no_headers = 1;
if 
(php_request_startup(TSRMLS_C) == FAILURE) {
+   SG(server_context) = 
NULL;

php_module_shutdown(TSRMLS_C);
return FAILURE;
}
@@ -1673,6 +1675,7 @@
fcgi_finish_request(request);
}
 #endif
+   SG(server_context) = NULL;
php_module_shutdown(TSRMLS_C);
return FAILURE;
}
@@ -1705,6 +1708,7 @@
}
 #endif
php_request_shutdown((void *) 0);
+   SG(server_context) = NULL;
php_module_shutdown(TSRMLS_C);
return FAILURE;
}

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



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

2007-01-29 Thread Nuno Lopes
nlopess Mon Jan 29 19:36:53 2007 UTC

  Modified files:  
/php-src/ext/soap   php_xml.c 
  Log:
  fix access to already free'ed memory
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_xml.c?r1=1.32r2=1.33diff_format=u
Index: php-src/ext/soap/php_xml.c
diff -u php-src/ext/soap/php_xml.c:1.32 php-src/ext/soap/php_xml.c:1.33
--- php-src/ext/soap/php_xml.c:1.32 Wed Jan 24 21:43:47 2007
+++ php-src/ext/soap/php_xml.c  Mon Jan 29 19:36:53 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: php_xml.c,v 1.32 2007/01/24 21:43:47 pollita Exp $ */
+/* $Id: php_xml.c,v 1.33 2007/01/29 19:36:53 nlopess Exp $ */
 
 #include php_soap.h
 #include libxml/parser.h
@@ -87,12 +87,17 @@
 */
 
old_allow_url_fopen_list = PG(allow_url_fopen_list);
-   if (!old_allow_url_fopen_list) {
-   old_allow_url_fopen_list = ;
+   if (old_allow_url_fopen_list) {
+   old_allow_url_fopen_list = estrdup(old_allow_url_fopen_list);
+   } else {
+   old_allow_url_fopen_list = STR_EMPTY_ALLOC();
}
+
zend_alter_ini_entry(allow_url_fopen, sizeof(allow_url_fopen), *, 
1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
ctxt = xmlCreateFileParserCtxt(filename);
zend_alter_ini_entry(allow_url_fopen, sizeof(allow_url_fopen), 
old_allow_url_fopen_list, strlen(old_allow_url_fopen_list), PHP_INI_SYSTEM, 
PHP_INI_STAGE_RUNTIME);
+   efree(old_allow_url_fopen_list);
+
if (ctxt) {
ctxt-keepBlanks = 0;
ctxt-sax-ignorableWhitespace = soap_ignorableWhitespace;

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



[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c

2007-01-29 Thread Dmitry Stogov
dmitry  Mon Jan 29 19:38:21 2007 UTC

  Modified files:  
/php-src/sapi/cgi   cgi_main.c 
  Log:
  Prevent flush() of closed handle on php_module_shutdown()
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.307r2=1.308diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.307 php-src/sapi/cgi/cgi_main.c:1.308
--- php-src/sapi/cgi/cgi_main.c:1.307   Mon Jan  1 09:29:36 2007
+++ php-src/sapi/cgi/cgi_main.c Mon Jan 29 19:38:21 2007
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.307 2007/01/01 09:29:36 sebastian Exp $ */
+/* $Id: cgi_main.c,v 1.308 2007/01/29 19:38:21 dmitry Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -1451,6 +1451,7 @@
 
case 'i': /* php info  quit */
if 
(php_request_startup(TSRMLS_C) == FAILURE) {
+   
SG(server_context) = NULL;

php_module_shutdown(TSRMLS_C);
return FAILURE;
}
@@ -1497,6 +1498,7 @@
case 'v': /* show php version  
quit */
no_headers = 1;
if 
(php_request_startup(TSRMLS_C) == FAILURE) {
+   
SG(server_context) = NULL;

php_module_shutdown(TSRMLS_C);
return FAILURE;
}
@@ -1597,6 +1599,7 @@
if (fastcgi) {
fcgi_finish_request(request);
}
+   SG(server_context) = NULL;
php_module_shutdown(TSRMLS_C);
return FAILURE;
}
@@ -1627,6 +1630,7 @@
goto fastcgi_request_done;
}
php_request_shutdown((void *) 0);
+   SG(server_context) = NULL;
php_module_shutdown(TSRMLS_C);
return FAILURE;
}

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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 /ext/mbstring/libmbfl/filters Makefile.am mbfilter_euc_jp_win.c mbfilter_iso2022_jp_ms.c mbfilter_iso2022_jp_ms.h mbfilter_jis.c mbfilter_jis.h

2007-01-29 Thread Rui Hirokawa
hirokawaMon Jan 29 22:53:47 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/mbstring/libmbfl/filters   mbfilter_iso2022_jp_ms.c 
mbfilter_iso2022_jp_ms.h 

  Modified files:  
/php-src/ext/mbstring   config.m4 
/php-src/ext/mbstring/libmbfl/filters   Makefile.am 
mbfilter_euc_jp_win.c 
mbfilter_jis.c mbfilter_jis.h 
unicode_table_jis.h 
/php-src/ext/mbstring/libmbfl/mbfl  mbfl_convert.c mbfl_encoding.c 
mbfl_ident.c 
  Log:
  fixed incompatibility with PHP 5.2.0 for encoding conversion between 
ShiftJIS(CP932), eucJP, ISO-2022-JP.
  http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.7r2=1.58.2.4.2.8diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.7 
php-src/ext/mbstring/config.m4:1.58.2.4.2.8
--- php-src/ext/mbstring/config.m4:1.58.2.4.2.7 Fri Nov  3 01:11:35 2006
+++ php-src/ext/mbstring/config.m4  Mon Jan 29 22:53:47 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.58.2.4.2.7 2006/11/03 01:11:35 hirokawa Exp $
+dnl $Id: config.m4,v 1.58.2.4.2.8 2007/01/29 22:53:47 hirokawa Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -210,6 +210,7 @@
  libmbfl/filters/mbfilter_iso8859_8.c
  libmbfl/filters/mbfilter_iso8859_9.c
  libmbfl/filters/mbfilter_jis.c
+ libmbfl/filters/mbfilter_iso2022_jp_ms.c
  libmbfl/filters/mbfilter_koi8r.c
  libmbfl/filters/mbfilter_armscii8.c
  libmbfl/filters/mbfilter_qprint.c
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/Makefile.am?r1=1.4.4.1r2=1.4.4.2diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/Makefile.am
diff -u php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4.4.1 
php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4.4.2
--- php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4.4.1Fri Nov  3 
01:11:35 2006
+++ php-src/ext/mbstring/libmbfl/filters/Makefile.amMon Jan 29 22:53:47 2007
@@ -2,7 +2,7 @@
 noinst_LTLIBRARIES=libmbfl_filters.la
 INCLUDES=-I../mbfl
 libmbfl_filters_la_LDFLAGS=-version-info $(SHLIB_VERSION)
-libmbfl_filters_la_SOURCES=mbfilter_cp936.c mbfilter_hz.c mbfilter_euc_tw.c 
mbfilter_big5.c mbfilter_euc_jp.c mbfilter_jis.c mbfilter_iso8859_1.c 
mbfilter_iso8859_2.c mbfilter_cp1252.c mbfilter_cp1251.c mbfilter_ascii.c 
mbfilter_iso8859_3.c mbfilter_iso8859_4.c mbfilter_iso8859_5.c 
mbfilter_iso8859_6.c mbfilter_iso8859_7.c mbfilter_iso8859_8.c 
mbfilter_iso8859_9.c mbfilter_iso8859_10.c mbfilter_iso8859_13.c 
mbfilter_iso8859_14.c mbfilter_iso8859_15.c mbfilter_iso8859_16.c 
mbfilter_htmlent.c mbfilter_byte2.c mbfilter_byte4.c mbfilter_uuencode.c 
mbfilter_base64.c mbfilter_sjis.c mbfilter_7bit.c mbfilter_qprint.c 
mbfilter_ucs4.c mbfilter_ucs2.c mbfilter_utf32.c mbfilter_utf16.c 
mbfilter_utf8.c mbfilter_utf7.c mbfilter_utf7imap.c mbfilter_euc_jp_win.c 
mbfilter_cp932.c mbfilter_cp51932.c mbfilter_euc_cn.c mbfilter_euc_kr.c 
mbfilter_uhc.c mbfilter_iso2022_kr.c mbfilter_cp866.c mbfilter_koi8r.c 
mbfilter_armscii8.c html_entities.c cp932_table.h html_entities.h 
mbfilter_7bit.h mbfil!
 ter_ascii.h mbfilter_base64.h mbfilter_big5.h mbfilter_byte2.h 
mbfilter_byte4.h mbfilter_cp1251.h mbfilter_cp1252.h mbfilter_cp866.h 
mbfilter_cp932.h mbfilter_cp51932.h mbfilter_cp936.h mbfilter_euc_cn.h 
mbfilter_euc_jp.h mbfilter_euc_jp_win.h mbfilter_euc_kr.h mbfilter_euc_tw.h 
mbfilter_htmlent.h mbfilter_hz.h mbfilter_iso2022_kr.h mbfilter_iso8859_1.h 
mbfilter_iso8859_10.h mbfilter_iso8859_13.h mbfilter_iso8859_14.h 
mbfilter_iso8859_15.h mbfilter_iso8859_16.h mbfilter_iso8859_2.h 
mbfilter_iso8859_3.h mbfilter_iso8859_4.h mbfilter_iso8859_5.h 
mbfilter_iso8859_6.h mbfilter_iso8859_7.h mbfilter_iso8859_8.h 
mbfilter_iso8859_9.h mbfilter_jis.h mbfilter_koi8r.h mbfilter_armscii8.h 
mbfilter_qprint.h mbfilter_sjis.h mbfilter_ucs2.h mbfilter_ucs4.h 
mbfilter_uhc.h mbfilter_utf16.h mbfilter_utf32.h mbfilter_utf7.h 
mbfilter_utf7imap.h mbfilter_utf8.h mbfilter_uuencode.h unicode_prop.h 
unicode_table_big5.h unicode_table_cns11643.h unicode_table_cp1251.h 
unicode_table_cp1252.h unicode_!
 table_cp866.h unicode_table_cp932_ext.h unicode_table_cp936.h unicode_
table_iso8859_10.h unicode_table_iso8859_13.h unicode_table_iso8859_14.h 
unicode_table_iso8859_15.h unicode_table_iso8859_16.h unicode_table_iso8859_2.h 
unicode_table_iso8859_3.h unicode_table_iso8859_4.h unicode_table_iso8859_5.h 
unicode_table_iso8859_6.h unicode_table_iso8859_7.h unicode_table_iso8859_8.h 
unicode_table_iso8859_9.h unicode_table_jis.h unicode_table_koi8r.h 
unicode_table_armscii8.h unicode_table_uhc.h
+libmbfl_filters_la_SOURCES=mbfilter_cp936.c mbfilter_hz.c mbfilter_euc_tw.c 
mbfilter_big5.c mbfilter_euc_jp.c mbfilter_jis.c 

[PHP-CVS] cvs: php-src / run-tests.php

2007-01-29 Thread Nuno Lopes
nlopess Mon Jan 29 22:55:22 2007 UTC

  Modified files:  
/php-srcrun-tests.php 
  Log:
  display all errors/leaks/warnings on each test, instead of showing just the 
top most error
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.312r2=1.313diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.312 php-src/run-tests.php:1.313
--- php-src/run-tests.php:1.312 Thu Dec 28 15:06:58 2006
+++ php-src/run-tests.php   Mon Jan 29 22:55:22 2007
@@ -23,7 +23,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.312 2006/12/28 15:06:58 nlopess Exp $ */
+/* $Id: run-tests.php,v 1.313 2007/01/29 22:55:22 nlopess Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -401,7 +401,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.312 $'.\n;
+   echo '$Revision: 1.313 $'.\n;
exit(1);
default:
echo Illegal switch specified!\n;
@@ -1568,11 +1568,13 @@
}
 
if ($leaked) {
-   $restype = 'LEAK';
-   } else if ($warn) {
-   $restype = 'WARN';
-   } else {
-   $restype = 'FAIL';
+   $restype[] = 'LEAK';
+   }
+   if ($warn) {
+   $restype[] = 'WARN';
+   }
+   if (!$passed) {
+   $restype[] = 'FAIL';
}
 
if (!$passed) {
@@ -1604,9 +1606,10 @@
}
}
 
-   show_result($restype, $tested, $tested_file, $unicode_semantics, $info, 
$temp_filenames);
+   show_result(implode('', $restype), $tested, $tested_file, 
$unicode_semantics, $info, $temp_filenames);
 
-   $PHP_FAILED_TESTS[$restype.'ED'][] = array (
+   foreach ($restype as $type) {
+   $PHP_FAILED_TESTS[$type.'ED'][] = array (
'name' = $file,
'test_name' = 
(is_array($IN_REDIRECT) ? $IN_REDIRECT['via'] : '') . $tested .  
[$tested_file],
'output' = $output_filename,
@@ -1614,12 +1617,13 @@
'info'   = $info,
'unicode'= $unicode_semantics,
);
+   }
 
if (isset($old_php)) {
$php = $old_php;
}
 
-   return $restype.'ED';
+   return $restype[0].'ED';
 }
 
 function comp_line($l1,$l2,$is_reg)

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



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

2007-01-29 Thread Ilia Alshanetsky
iliaa   Tue Jan 30 01:27:30 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  
  Prepare news file for release
  
  http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.515r2=1.2027.2.547.2.516diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.515 php-src/NEWS:1.2027.2.547.2.516
--- php-src/NEWS:1.2027.2.547.2.515 Mon Jan 29 15:25:35 2007
+++ php-src/NEWSTue Jan 30 01:27:29 2007
@@ -1,85 +1,12 @@
 PHPNEWS
 |||
 ?? ??? 2007, PHP 5.2.1
-- Fixed bug #40259 (ob_start call many times - memory error). (Dmitry)
-- Fixed bug #40231 (file_exists incorrectly reports false). (Dmitry)
-- Fixed bug #40228 (ZipArchive::extractTo does create empty directories 
-  recursively). (Pierre)
-
-25 Jan 2007, PHP 5.2.1RC4
-- Fixed PECL bug #7295 (ORA-01405: fetched column value is NULL on LOB fields).
-  (Tony)
-- Fixed bug #40200 (The FastCgi version has different realpath results than
-  thread safe version). (Dmitry)
-- Fixed bug #40191 (use of array_unique() with objects triggers segfault).
-  (Tony)
-- Fixed bug #40189 (possible endless loop in zlib.inflate stream filter).
-  (Greg, Tony)
-- Fixed bug #40169 (CURLOPT_TCP_NODELAY only available in curl = 7.11.2). 
-  (Tony)
-- Fixed bug #40092 (chroot() doesn't clear realpath cache). (Dmitry)
-- Fixed bug #39450 (getenv() fills other super-globals). (Ilia, Tony)
-- Fixed bug #39367 (clearstatcache() doesn't clear realpath cache).
-  (j at pureftpd dot org, Dmitry)
-
-18 Jan 2007, PHP 5.2.1RC3
-- Added read-timeout context option timeout for HTTP streams. (Hannes,
-  Ilia). 
+- Added read-timeout context option timeout for HTTP streams. (Hannes, 
Ilia). 
 - Added CURLOPT_TCP_NODELAY constant to Curl extension. (Sara)
-- Improved proc_open(). Now on Windows it can run external commands not through
-  CMD.EXE. (Dmitry)
-- Moved extensions to PECL:
-  . ext/informix (Derick, Tony)
-- Fixed bug #40129 (iconv extension doesn't compile with CodeWarrior on 
-  Netware). (gk at gknw dot de, Tony)
-- Fixed bug #40127 (apache2handler doesn't compile on Netware). (gk at gknw
-  dot de)
-- Fixed bug #40121 (PDO_DBLIB driver wont free statements). (Ilia)
-- Fixed bug #40098 (php_fopen_primary_script() not thread safe). (Ilia)
-- Fixed bug #40091 (spl_autoload_register with 2 instances of the same
-  class). (Ilia)
-- Fixed bug #40083 (milter SAPI functions always return false/null). (Tony)
-- Fixed bug #40079 (php_get_current_user() not thread safe). (Ilia, wharmby
-  at uk dot ibm dot com)
-- Fixed bug #40078 (ORA-01405 when fetching NULL values using 
-  oci_bind_array_by_name()). (Tony)
-- Fixed bug #40076 (zend_alloc.c: Value of enumeration constant must be in
-  range of signed integer). (Dmitry)
-- Fixed bug #40073 (exif_read_data dies on certain images). (Tony, Marcus)
-- Fixed bug #40036 (empty() does not work correctly with ArrayObject when using
-  ARRAY_AS_PROPS). (Ilia)
-- Fixed bug #40002 (Try/Catch performs poorly). (Dmitry)
-- Fixed bug #39993 (tr_TR.UTF-8 locale has problems with PHP). (Ilia)
-- Fixed bug #39990 (Cannot foreach over overloaded properties). (Dmitry)
-- Fixed bug #39988 (type argument of oci_define_by_name() is ignored).
-  (Chris Jones, Tony)
-- Fixed bug #39979 (PGSQL_CONNECT_FORCE_NEW will causes next connect to
-  establish a new connection). (Ilia)
-- Fixed bug #39969 (ini setting short_open_tag has no effect when using
-  --enable-maintainer-zts). (Dmitry)
-- Fixed bug #39504 (xmlwriter_write_dtd_entity() creates Attlist tag,
-  not entity). (Hannes)
-- Fixed bug #39449 (Overloaded array properties do not work correctly).
-  (Dmitry)
-- Fixed bug #39394 (Missing check for older variants of openssl). (Ilia)
-- Fixed bug #38604 (Fixed request time leak inside foreach() when iterating 
-  through virtual properties). (Dmitry)
-- Fixed bug #38325 (spl_autoload_register() gives wrong line for class
-  not found). (Ilia)
-- Fixed bug #36214 (__get method works properly only when conditional operator
-  is used). (Dmitry)
-- Fixed bug #35634 (Erroneous Class declarations may not be nested error
-  raised). (Carl P. Corliss, Dmitry)
-- Fixed bug #35106 (nested foreach fails when array variable has a reference).
-  (Dmitry)
-
-04 Jan 2007, PHP 5.2.1RC2
-- Small optimization of the date() function. (Matt,Ilia)
-- Optimized the internal is_numeric_string() function. (Matt,Ilia)
 - Added support for hex numbers of any size. (Matt)
-- Removed dependency from SHELL32.DLL. (Dmitry)
-- Added function stream_socket_shutdown(). It is a wrapper for system 
shutdown()
-  function, that shut downs part of a full-duplex connection. (Dmitry)
+- Added function stream_socket_shutdown(). It is a wrapper for system 
+  shutdown() function, that shut downs part of a full-duplex connection. 
+  (Dmitry)
 - Added internal heap protection (Dmitry)