date:20080831

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

2008-08-31 Thread changelog

changelog   Mon Sep  1 01:31:53 2008 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3155r2=1.3156diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.3155 php-src/ChangeLog:1.3156
--- php-src/ChangeLog:1.3155Sun Aug 31 01:31:49 2008
+++ php-src/ChangeLog   Mon Sep  1 01:31:52 2008
@@ -1,3 +1,346 @@
+2008-08-31  Steph Fox  [EMAIL PROTECTED]
+
+* ext/phar/tests/cache_list/files/blog.phar
+  ext/phar/tests/cache_list/files/blog.phar.inc
+  ext/phar/tests/cache_list/files/config.xml
+  ext/phar/tests/cache_list/files/extracted.inc:
+  - Missed the files we don't use yet
+
+* (PHP_5_3)
+  ext/phar/phar_object.c:
+  - unnecessary ;
+  We are now 100% synched - let's keep it that way!
+
+* (PHP_5_3)
+  ext/phar/package.php
+  ext/phar/package.xml
+  ext/phar/phar.c:
+  - cs, update package files following RC1 (just to keep it all in sync)
+
+* ext/phar/php_phar.h:
+  - Note to self: don't try to second-guess Greg
+
+* ext/phar/config.w32
+  ext/phar/dirstream.c
+  ext/phar/func_interceptors.c
+  ext/phar/package.php
+  ext/phar/package.xml
+  ext/phar/phar.c
+  ext/phar/phar_internal.h
+  ext/phar/phar_object.c
+  ext/phar/php_phar.h
+  ext/phar/stream.c
+  ext/phar/stream.h
+  ext/phar/tar.c
+  ext/phar/util.c
+  ext/phar/zip.c
+  ext/phar/tests/opendir_edgecases.phpt
+  ext/phar/tests/phar_buildfromiterator10.phpt
+  ext/phar/tests/phar_get_supported_signatures_001.phpt
+  ext/phar/tests/phar_get_supported_signatures_001a.phpt
+  ext/phar/tests/phar_get_supported_signatures_002.phpt
+  ext/phar/tests/phar_get_supported_signatures_002a.phpt
+  ext/phar/tests/phpinfo_004.phpt
+  ext/phar/tests/cache_list/files/frontcontroller.phar.inc
+  ext/phar/tests/cache_list/files/frontcontroller10.phar.inc
+  ext/phar/tests/cache_list/files/frontcontroller11.phar.inc
+  ext/phar/tests/cache_list/files/frontcontroller12.phar.inc
+  ext/phar/tests/cache_list/files/frontcontroller13.phar.inc
+  ext/phar/tests/cache_list/files/frontcontroller14.phar.inc
+  ext/phar/tests/cache_list/files/frontcontroller16.phar.inc
+  ext/phar/tests/cache_list/files/frontcontroller17.phar.inc
+  ext/phar/tests/cache_list/files/frontcontroller18.phar.inc
+  ext/phar/tests/cache_list/files/frontcontroller19.phar.inc
+  ext/phar/tests/cache_list/files/frontcontroller2.phar.inc
+  ext/phar/tests/cache_list/files/frontcontroller3.phar.inc
+  ext/phar/tests/cache_list/files/frontcontroller4.phar.inc
+  ext/phar/tests/cache_list/files/frontcontroller5.phar.inc
+  ext/phar/tests/cache_list/files/frontcontroller6.phar.inc
+  ext/phar/tests/cache_list/files/frontcontroller7.phar.inc
+  ext/phar/tests/cache_list/files/frontcontroller8.phar.inc
+  ext/phar/tests/cache_list/files/frontcontroller9.phar.inc
+  ext/phar/tests/cache_list/files/md5.phar
+  ext/phar/tests/cache_list/files/nophar.phar
+  ext/phar/tests/cache_list/files/nophar.phar.inc
+  ext/phar/tests/cache_list/files/openssl.phar
+  ext/phar/tests/cache_list/files/openssl.phar.pubkey
+  ext/phar/tests/cache_list/files/phar_oo_test.inc
+  ext/phar/tests/cache_list/files/phar_test.inc
+  ext/phar/tests/cache_list/files/private.pem
+  ext/phar/tests/cache_list/files/sha1.phar
+  ext/phar/tests/cache_list/files/sha256.phar
+  ext/phar/tests/cache_list/files/sha512.phar
+  ext/phar/tests/cache_list/files/zfapp.tgz
+  ext/phar/tests/zip/bzip2.phpt
+  ext/phar/tests/zip/files/bzip2.zip:
+  - MFB
+
+2008-08-31  Greg Beaver  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ext/phar/phar.phar
+  ext/phar/php_phar.h:
+  move to 2.0.0-dev
+
+* (PHP_5_3)
+  ext/phar/phar.phar
+  ext/phar/tar.c:
+  use TAR_FILE instead of '0' and '\0' instead of 0
+
+* (PHP_5_3)
+  ext/phar/config.w32:
+  temp bandaid on broken build system, revert when snapshot build is fixed 
in
+  win32
+
+* (PHP_5_3)
+  ext/phar/tar.c:
+  hadn't saved tar.c, use '\0' instead of 0 for char values, removes 
warning
+  in intel compiler
+
+* (PHP_5_3)
+  ext/phar/phar.phar
+  ext/phar/util.c:
+  use '\0' instead of 0 for chars, removes intel warning
+
+* (PHP_5_3)
+  ext/phar/phar.phar
+  ext/phar/util.c:
+  remove unnecessary double variable declarations
+
+* (PHP_5_3)
+  ext/phar/phar_object.c:
+  remove unnecessary ;
+
+2008-08-31  Steph Fox  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ext/phar/tests/phar_get_supported_signatures_001.phpt
+  ext/phar/tests/phar_get_supported_signatures_001a.phpt
+  ext/phar/tests/phar_get_supported_signatures_002.phpt
+  ext/phar/tests/phar_get_supported_signatures_002a.phpt
+

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar func_interceptors.c

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 06:04:39 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   func_interceptors.c 
  Log:
  WS merge from pecl/phar
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/func_interceptors.c?r1=1.20.2.14r2=1.20.2.15diff_format=u
Index: php-src/ext/phar/func_interceptors.c
diff -u php-src/ext/phar/func_interceptors.c:1.20.2.14 
php-src/ext/phar/func_interceptors.c:1.20.2.15
--- php-src/ext/phar/func_interceptors.c:1.20.2.14  Thu Aug 14 13:01:28 2008
+++ php-src/ext/phar/func_interceptors.cSun Aug 31 06:04:38 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: func_interceptors.c,v 1.20.2.14 2008/08/14 13:01:28 dmitry Exp $ */
+/* $Id: func_interceptors.c,v 1.20.2.15 2008/08/31 06:04:38 cellog Exp $ */
 
 #include phar_internal.h
 
@@ -517,7 +517,7 @@
case S_IFDIR: RETURN_STRING(dir, 1);
case S_IFREG: RETURN_STRING(file, 1);
}
-   php_error_docref(NULL TSRMLS_CC, E_NOTICE, Unknown file type 
(%d), stat_sb-st_modeS_IFMT);
+   php_error_docref(NULL TSRMLS_CC, E_NOTICE, Unknown file type 
(%d), stat_sb-st_mode  S_IFMT);
RETURN_STRING(unknown, 1);
case FS_IS_W:
RETURN_BOOL((stat_sb-st_mode  wmask) != 0);



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar func_interceptors.c phar.phar

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 06:05:20 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   func_interceptors.c phar.phar 
  Log:
  remove unused variables, merge from pecl/phar
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/func_interceptors.c?r1=1.20.2.15r2=1.20.2.16diff_format=u
Index: php-src/ext/phar/func_interceptors.c
diff -u php-src/ext/phar/func_interceptors.c:1.20.2.15 
php-src/ext/phar/func_interceptors.c:1.20.2.16
--- php-src/ext/phar/func_interceptors.c:1.20.2.15  Sun Aug 31 06:04:38 2008
+++ php-src/ext/phar/func_interceptors.cSun Aug 31 06:05:20 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: func_interceptors.c,v 1.20.2.15 2008/08/31 06:04:38 cellog Exp $ */
+/* $Id: func_interceptors.c,v 1.20.2.16 2008/08/31 06:05:20 cellog Exp $ */
 
 #include phar_internal.h
 
@@ -681,16 +681,12 @@
 #endif
goto statme_baby;
} else {
-   char *save, *save2, *actual;
-   int save_len, save2_len, actual_len;
+   char *save;
+   int save_len;
 
 notfound:
save = PHAR_G(cwd);
-   save2 = entry;
-   actual = entry[0] == '/' ? (entry + 1) : entry;
save_len = PHAR_G(cwd_len);
-   save2_len = entry_len;
-   actual_len = entry[0] == '/' ? (entry_len - 1) 
: entry_len;
/* this file is not in the current directory, 
use the original path */
entry = estrndup(filename, filename_length);
entry_len = filename_length;
@@ -702,7 +698,6 @@
PHAR_G(cwd) = save;
PHAR_G(cwd_len) = save_len;
efree(entry);
-   efree(save2);
if (IS_EXISTS_CHECK(type)) {
efree(arch);
RETURN_TRUE;
@@ -713,7 +708,6 @@
PHAR_G(cwd) = save;
PHAR_G(cwd_len) = save_len;
efree(entry);
-   efree(save2);
efree(arch);
if (IS_EXISTS_CHECK(type)) {
RETURN_TRUE;
@@ -735,7 +729,6 @@
PHAR_G(cwd) = save;
PHAR_G(cwd_len) = save_len;
efree(entry);
-   efree(save2);
efree(arch);
/* Error Occured */
if (!IS_EXISTS_CHECK(type)) {
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.33r2=1.7.2.34diff_format=u
Index: php-src/ext/phar/phar.phar



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.c

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 06:09:38 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar.c 
  Log:
  remove unused variables, merge from pecl/phar
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.40r2=1.370.2.41diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.370.2.40 php-src/ext/phar/phar.c:1.370.2.41
--- php-src/ext/phar/phar.c:1.370.2.40  Thu Aug 21 05:17:26 2008
+++ php-src/ext/phar/phar.c Sun Aug 31 06:09:37 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar.c,v 1.370.2.40 2008/08/21 05:17:26 cellog Exp $ */
+/* $Id: phar.c,v 1.370.2.41 2008/08/31 06:09:37 cellog Exp $ */
 
 #define PHAR_MAIN 1
 #include phar_internal.h
@@ -2305,7 +2305,6 @@
 int phar_open_executed_filename(char *alias, int alias_len, char **error 
TSRMLS_DC) /* {{{ */
 {
char *fname;
-   long halt_offset;
zval *halt_constant;
php_stream *fp;
int fname_len;
@@ -2340,7 +2339,6 @@
return FAILURE;
}
 
-   halt_offset = Z_LVAL(*halt_constant);
FREE_ZVAL(halt_constant);
 
 #if PHP_MAJOR_VERSION  6
@@ -3734,7 +3732,7 @@
php_info_print_table_header(2, Phar: PHP Archive support, enabled);
php_info_print_table_row(2, Phar EXT version, PHP_PHAR_VERSION);
php_info_print_table_row(2, Phar API version, PHP_PHAR_API_VERSION);
-   php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.40 $);
+   php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.41 $);
php_info_print_table_row(2, Phar-based phar archives, enabled);
php_info_print_table_row(2, Tar-based phar archives, enabled);
php_info_print_table_row(2, ZIP-based phar archives, enabled);



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.c phar.phar

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 06:13:42 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar.c phar.phar 
  Log:
  remove orphaned code, merge from pecl/phar
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.41r2=1.370.2.42diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.370.2.41 php-src/ext/phar/phar.c:1.370.2.42
--- php-src/ext/phar/phar.c:1.370.2.41  Sun Aug 31 06:09:37 2008
+++ php-src/ext/phar/phar.c Sun Aug 31 06:13:42 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar.c,v 1.370.2.41 2008/08/31 06:09:37 cellog Exp $ */
+/* $Id: phar.c,v 1.370.2.42 2008/08/31 06:13:42 cellog Exp $ */
 
 #define PHAR_MAIN 1
 #include phar_internal.h
@@ -2514,125 +2514,6 @@
 }
 /* }}} */
 
-#ifndef PHAR_HAVE_OPENSSL
-static int phar_call_openssl_signverify(int is_sign, php_stream *fp, off_t 
end, char *key, int key_len, char **signature, int *signature_len TSRMLS_DC) /* 
{{{ */
-{
-   zend_fcall_info fci;
-   zend_fcall_info_cache fcc;
-   zval *zdata, *zsig, *zkey, *retval_ptr, **zp[3], *openssl;
-
-   MAKE_STD_ZVAL(zdata);
-   MAKE_STD_ZVAL(openssl);
-   ZVAL_STRINGL(openssl, is_sign ? openssl_sign : openssl_verify, 
is_sign ? sizeof(openssl_sign)-1 : sizeof(openssl_verify)-1, 1);
-   MAKE_STD_ZVAL(zsig);
-   ZVAL_STRINGL(zsig, *signature, *signature_len, 1);
-   MAKE_STD_ZVAL(zkey);
-   ZVAL_STRINGL(zkey, key, key_len, 1);
-   zp[0] = zdata;
-   zp[1] = zsig;
-   zp[2] = zkey;
-
-   php_stream_rewind(fp);
-   Z_TYPE_P(zdata) = IS_STRING;
-   Z_STRLEN_P(zdata) = end;
-   if (end != (off_t) php_stream_copy_to_mem(fp, (Z_STRVAL_P(zdata)), 
(size_t) end, 0)) {
-   zval_dtor(zdata);
-   zval_dtor(zsig);
-   zval_dtor(zkey);
-   return FAILURE;
-   }
-
-#if PHP_VERSION_ID  50300
-   if (FAILURE == zend_fcall_info_init(openssl, fci, fcc TSRMLS_CC)) {
-#else
-   if (FAILURE == zend_fcall_info_init(openssl, 0, fci, fcc, NULL, NULL 
TSRMLS_CC)) {
-#endif
-   zval_dtor(zdata);
-   zval_dtor(zsig);
-   zval_dtor(zkey);
-   zval_dtor(openssl);
-   return FAILURE;
-   }
-
-   zval_dtor(openssl);
-   efree(openssl);
-
-   fci.param_count = 3;
-   fci.params = zp;
-#if PHP_VERSION_ID  50300
-   ++(zdata-refcount);
-   ++(zsig-refcount);
-   ++(zkey-refcount);
-#else
-   Z_ADDREF_P(zdata);
-
-   if (is_sign) {
-   Z_SET_ISREF_P(zsig);
-   } else {
-   Z_ADDREF_P(zsig);
-   }
-
-   Z_ADDREF_P(zkey);
-#endif
-   fci.retval_ptr_ptr = retval_ptr;
-
-   if (FAILURE == zend_call_function(fci, fcc TSRMLS_CC)) {
-   zval_dtor(zdata);
-   zval_dtor(zsig);
-   zval_dtor(zkey);
-   efree(zdata);
-   efree(zkey);
-   efree(zsig);
-   return FAILURE;
-   }
-#if PHP_VERSION_ID  50300
-   --(zdata-refcount);
-   --(zsig-refcount);
-   --(zkey-refcount);
-#else
-   Z_DELREF_P(zdata);
-
-   if (is_sign) {
-   Z_UNSET_ISREF_P(zsig);
-   } else {
-   Z_DELREF_P(zsig);
-   }
-
-   Z_DELREF_P(zkey);
-#endif
-   zval_dtor(zdata);
-   efree(zdata);
-   zval_dtor(zkey);
-   efree(zkey);
-
-   switch (Z_TYPE_P(retval_ptr)) {
-   default:
-   case IS_LONG:
-   zval_dtor(zsig);
-   efree(zsig);
-   if (1 == Z_LVAL_P(retval_ptr)) {
-   efree(retval_ptr);
-   return SUCCESS;
-   }
-   efree(retval_ptr);
-   return FAILURE;
-   case IS_BOOL:
-   efree(retval_ptr);
-   if (Z_BVAL_P(retval_ptr)) {
-   *signature = estrndup(Z_STRVAL_P(zsig), 
Z_STRLEN_P(zsig));
-   *signature_len = Z_STRLEN_P(zsig);
-   zval_dtor(zsig);
-   efree(zsig);
-   return SUCCESS;
-   }
-   zval_dtor(zsig);
-   efree(zsig);
-   return FAILURE;
-   }
-}
-/* }}} */
-#endif /* #ifndef PHAR_HAVE_OPENSSL */
-
 /**
  * Save phar contents to disk
  *
@@ -3732,7 +3613,7 @@
php_info_print_table_header(2, Phar: PHP Archive support, enabled);
php_info_print_table_row(2, Phar EXT version, PHP_PHAR_VERSION);
php_info_print_table_row(2, Phar API version, PHP_PHAR_API_VERSION);
-   php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.41 $);
+   php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.42 $);

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar func_interceptors.c phar.phar phar_object.c

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 06:26:19 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   func_interceptors.c phar.phar phar_object.c 
  Log:
  use %u instead of %d, merge from pecl/phar
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/func_interceptors.c?r1=1.20.2.16r2=1.20.2.17diff_format=u
Index: php-src/ext/phar/func_interceptors.c
diff -u php-src/ext/phar/func_interceptors.c:1.20.2.16 
php-src/ext/phar/func_interceptors.c:1.20.2.17
--- php-src/ext/phar/func_interceptors.c:1.20.2.16  Sun Aug 31 06:05:20 2008
+++ php-src/ext/phar/func_interceptors.cSun Aug 31 06:26:19 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: func_interceptors.c,v 1.20.2.16 2008/08/31 06:05:20 cellog Exp $ */
+/* $Id: func_interceptors.c,v 1.20.2.17 2008/08/31 06:26:19 cellog Exp $ */
 
 #include phar_internal.h
 
@@ -517,7 +517,7 @@
case S_IFDIR: RETURN_STRING(dir, 1);
case S_IFREG: RETURN_STRING(file, 1);
}
-   php_error_docref(NULL TSRMLS_CC, E_NOTICE, Unknown file type 
(%d), stat_sb-st_mode  S_IFMT);
+   php_error_docref(NULL TSRMLS_CC, E_NOTICE, Unknown file type 
(%u), stat_sb-st_mode  S_IFMT);
RETURN_STRING(unknown, 1);
case FS_IS_W:
RETURN_BOOL((stat_sb-st_mode  wmask) != 0);
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.35r2=1.7.2.36diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.35 php-src/ext/phar/phar.phar:1.7.2.36
--- php-src/ext/phar/phar.phar:1.7.2.35 Sun Aug 31 06:13:42 2008
+++ php-src/ext/phar/phar.phar  Sun Aug 31 06:26:19 2008
@@ -1171,8 +1171,8 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?
-6-+6+ 
¶Â²Øä±÷¡JÉþs±æêÔ*,8W?°!~ýë¸YåBós.coîd!Â¨`w¡óLæÈ¹BÀí.å[aäÙs\í¹
 gß×
 óbnáN@@ -1229,4 +1229,4 @@
 ùUNøÖ[EMAIL PROTECTED][EMAIL PROTECTED] 
¬ËaYº[Ãâ¬mòvOëý]¸¹)×soSjßZæ/]ûôÞv¿Ç½T%æ:ýÚ)cÚv]¶Ebô«ÐÓ*Çê=KÕO)ò)«Ë-Ô]µLí·¡7µ¾Í¨.î
zÿ.jß?8Tù®,:«Äa·éï¤Á»hg
 ±µÉH¨#[T5$ÜßÞ¶LÐâ¯z4Ê¼è)ÿLuÒñxï;ñ©Æø³;TMe,¯¿{}4b,[EMAIL PROTECTED]
íÑèµïtúÎþ®øÚ÷Eí»ú¡ÃÏàÇGxîÓá§¾óãæ]¢Õ~fI|øðP 
j7l1ØÛPHüéÅiGH¬5´¯$ß/rªýëÐ~Ñúgìªz²¢ÎÛ¦puùäûù;â9³ä¯;[EMAIL 
PROTECTED]
-Pàø3C°\ No newline at end of file
+Pàø3C°\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.39r2=1.266.2.40diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.39 
php-src/ext/phar/phar_object.c:1.266.2.40
--- php-src/ext/phar/phar_object.c:1.266.2.39   Fri Aug  1 13:48:44 2008
+++ php-src/ext/phar/phar_object.c  Sun Aug 31 06:26:19 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar_object.c,v 1.266.2.39 2008/08/01 13:48:44 sfox Exp $ */
+/* $Id: phar_object.c,v 1.266.2.40 2008/08/31 06:26:19 cellog Exp $ */
 
 #include phar_internal.h
 #include func_interceptors.h
@@ -203,7 +203,7 @@
ctr.line_len = spprintf((ctr.line), 0, Content-type: 
%s, mime_type);
sapi_header_op(SAPI_HEADER_REPLACE, ctr TSRMLS_CC);
efree(ctr.line);
-   ctr.line_len = spprintf((ctr.line), 0, 
Content-length: %d, info-uncompressed_filesize);
+   ctr.line_len = spprintf((ctr.line), 0, 
Content-length: %u, info-uncompressed_filesize);
sapi_header_op(SAPI_HEADER_REPLACE, ctr TSRMLS_CC);
efree(ctr.line);
 
@@ -2986,7 +2986,7 @@
add_assoc_stringl(return_value, hash_type, 
OpenSSL, 7, 1);
break;
default:
-   unknown_len = spprintf(unknown, 0, Unknown 
(%d), phar_obj-arc.archive-sig_flags);
+   unknown_len = spprintf(unknown, 0, Unknown 
(%u), phar_obj-arc.archive-sig_flags);
add_assoc_stringl(return_value, hash_type, 
unknown, unknown_len, 0);
break;
}



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.c phar.phar

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 06:28:01 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar.c phar.phar 
  Log:
  remove superfluous double variable declaration, merge from pecl/phar
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.42r2=1.370.2.43diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.370.2.42 php-src/ext/phar/phar.c:1.370.2.43
--- php-src/ext/phar/phar.c:1.370.2.42  Sun Aug 31 06:13:42 2008
+++ php-src/ext/phar/phar.c Sun Aug 31 06:28:01 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar.c,v 1.370.2.42 2008/08/31 06:13:42 cellog Exp $ */
+/* $Id: phar.c,v 1.370.2.43 2008/08/31 06:28:01 cellog Exp $ */
 
 #define PHAR_MAIN 1
 #include phar_internal.h
@@ -3182,7 +3182,6 @@
}
 
if (phar-flags  PHAR_FILE_COMPRESSED_GZ) {
-   php_stream_filter *filter;
/* to properly compress, we have to tell zlib to add a 
zlib header */
zval filterparams;
 
@@ -3206,8 +3205,6 @@
/* use the temp stream as our base */
phar-fp = newfile;
} else if (phar-flags  PHAR_FILE_COMPRESSED_BZ2) {
-   php_stream_filter *filter;
-
filter = php_stream_filter_create(bzip2.compress, 
NULL, php_stream_is_persistent(phar-fp) TSRMLS_CC);
php_stream_filter_append(phar-fp-writefilters, 
filter);
php_stream_copy_to_stream(newfile, phar-fp, 
PHP_STREAM_COPY_ALL);
@@ -3613,7 +3610,7 @@
php_info_print_table_header(2, Phar: PHP Archive support, enabled);
php_info_print_table_row(2, Phar EXT version, PHP_PHAR_VERSION);
php_info_print_table_row(2, Phar API version, PHP_PHAR_API_VERSION);
-   php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.42 $);
+   php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.43 $);
php_info_print_table_row(2, Phar-based phar archives, enabled);
php_info_print_table_row(2, Tar-based phar archives, enabled);
php_info_print_table_row(2, ZIP-based phar archives, enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.36r2=1.7.2.37diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.36 php-src/ext/phar/phar.phar:1.7.2.37
--- php-src/ext/phar/phar.phar:1.7.2.36 Sun Aug 31 06:26:19 2008
+++ php-src/ext/phar/phar.phar  Sun Aug 31 06:28:01 2008
@@ -1171,8 +1171,8 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?
-6-+6+ 
¶Â²Øä±÷¡JÉþs±æêÔ*,8W?°!~ýë¸YåBós.coîd!Â¨`w¡óLæÈ¹BÀí.å[aäÙs\í¹
 gß×
 óbnáN@@ -1229,4 +1229,4 @@
 ùUNøÖ[EMAIL PROTECTED][EMAIL PROTECTED] 
¬ËaYº[Ãâ¬mòvOëý]¸¹)×soSjßZæ/]ûôÞv¿Ç½T%æ:ýÚ)cÚv]¶Ebô«ÐÓ*Çê=KÕO)ò)«Ë-Ô]µLí·¡7µ¾Í¨.î
zÿ.jß?8Tù®,:«Äa·éï¤Á»hg
 ±µÉH¨#[T5$ÜßÞ¶LÐâ¯z4Ê¼è)ÿLuÒñxï;ñ©Æø³;TMe,¯¿{}4b,[EMAIL PROTECTED]
íÑèµïtúÎþ®øÚ÷Eí»ú¡ÃÏàÇGxîÓá§¾óãæ]¢Õ~fI|øðP 
j7l1ØÛPHüéÅiGH¬5´¯$ß/rªýëÐ~Ñúgìªz²¢ÎÛ¦puùäûù;â9³ä¯;[EMAIL 
PROTECTED]
-Pàø3C°\ No newline at end of file
+Pàø3C°\ No newline at end of file



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar phar_object.c

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 06:31:53 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar.phar phar_object.c 
  Log:
  remove unused variables, merge from pecl/phar
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.37r2=1.7.2.38diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.37 php-src/ext/phar/phar.phar:1.7.2.38
--- php-src/ext/phar/phar.phar:1.7.2.37 Sun Aug 31 06:28:01 2008
+++ php-src/ext/phar/phar.phar  Sun Aug 31 06:31:53 2008
@@ -1171,8 +1171,8 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?
-6-+6+ 
¶Â²Øä±÷¡JÉþs±æêÔ*,8W?°!~ýë¸YåBós.coîd!Â¨`w¡óLæÈ¹BÀí.å[aäÙs\í¹
 gß×
 óbnáN@@ -1229,4 +1229,4 @@
 ùUNøÖ[EMAIL PROTECTED][EMAIL PROTECTED] 
¬ËaYº[Ãâ¬mòvOëý]¸¹)×soSjßZæ/]ûôÞv¿Ç½T%æ:ýÚ)cÚv]¶Ebô«ÐÓ*Çê=KÕO)ò)«Ë-Ô]µLí·¡7µ¾Í¨.î
zÿ.jß?8Tù®,:«Äa·éï¤Á»hg
 ±µÉH¨#[T5$ÜßÞ¶LÐâ¯z4Ê¼è)ÿLuÒñxï;ñ©Æø³;TMe,¯¿{}4b,[EMAIL PROTECTED]
íÑèµïtúÎþ®øÚ÷Eí»ú¡ÃÏàÇGxîÓá§¾óãæ]¢Õ~fI|øðP 
j7l1ØÛPHüéÅiGH¬5´¯$ß/rªýëÐ~Ñúgìªz²¢ÎÛ¦puùäûù;â9³ä¯;[EMAIL 
PROTECTED]
-Pàø3C°\ No newline at end of file
+Pàø3C°\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.40r2=1.266.2.41diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.40 
php-src/ext/phar/phar_object.c:1.266.2.41
--- php-src/ext/phar/phar_object.c:1.266.2.40   Sun Aug 31 06:26:19 2008
+++ php-src/ext/phar/phar_object.c  Sun Aug 31 06:31:53 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar_object.c,v 1.266.2.40 2008/08/31 06:26:19 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.41 2008/08/31 06:31:53 cellog Exp $ */
 
 #include phar_internal.h
 #include func_interceptors.h
@@ -1393,7 +1393,7 @@
 {
zval **value;
zend_uchar key_type;
-   zend_bool is_splfileinfo = 0, close_fp = 1;
+   zend_bool close_fp = 1;
ulong int_key;
struct _phar_t *p_obj = (struct _phar_t*) puser;
uint str_key_len, base_len = p_obj-l, fname_len;
@@ -1505,7 +1505,6 @@
}
 
save = fname;
-   is_splfileinfo = 1;
goto phar_spl_fileinfo;
case SPL_FS_INFO:
case SPL_FS_FILE:
@@ -1516,7 +1515,6 @@
 #endif
fname_len = strlen(fname);
save = fname;
-   is_splfileinfo = 1;
goto phar_spl_fileinfo;
}
}



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar phar_object.c

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 06:38:10 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar.phar phar_object.c 
  Log:
  merge minor optimization removing strlen from pecl/phar
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.38r2=1.7.2.39diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.38 php-src/ext/phar/phar.phar:1.7.2.39
--- php-src/ext/phar/phar.phar:1.7.2.38 Sun Aug 31 06:31:53 2008
+++ php-src/ext/phar/phar.phar  Sun Aug 31 06:38:09 2008
@@ -1171,8 +1171,8 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?
-6-+6+ 
¶Â²Øä±÷¡JÉþs±æêÔ*,8W?°!~ýë¸YåBós.coîd!Â¨`w¡óLæÈ¹BÀí.å[aäÙs\í¹
 gß×
 óbnáN@@ -1229,4 +1229,4 @@
 ùUNøÖ[EMAIL PROTECTED][EMAIL PROTECTED] 
¬ËaYº[Ãâ¬mòvOëý]¸¹)×soSjßZæ/]ûôÞv¿Ç½T%æ:ýÚ)cÚv]¶Ebô«ÐÓ*Çê=KÕO)ò)«Ë-Ô]µLí·¡7µ¾Í¨.î
zÿ.jß?8Tù®,:«Äa·éï¤Á»hg
 ±µÉH¨#[T5$ÜßÞ¶LÐâ¯z4Ê¼è)ÿLuÒñxï;ñ©Æø³;TMe,¯¿{}4b,[EMAIL PROTECTED]
íÑèµïtúÎþ®øÚ÷Eí»ú¡ÃÏàÇGxîÓá§¾óãæ]¢Õ~fI|øðP 
j7l1ØÛPHüéÅiGH¬5´¯$ß/rªýëÐ~Ñúgìªz²¢ÎÛ¦puùäûù;â9³ä¯;[EMAIL 
PROTECTED]
-Pàø3C°\ No newline at end of file
+Pàø3C°\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.41r2=1.266.2.42diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.41 
php-src/ext/phar/phar_object.c:1.266.2.42
--- php-src/ext/phar/phar_object.c:1.266.2.41   Sun Aug 31 06:31:53 2008
+++ php-src/ext/phar/phar_object.c  Sun Aug 31 06:38:09 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar_object.c,v 1.266.2.41 2008/08/31 06:31:53 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.42 2008/08/31 06:38:09 cellog Exp $ */
 
 #include phar_internal.h
 #include func_interceptors.h
@@ -1984,6 +1984,7 @@
char *error;
const char *pcr_error;
int ext_len = ext ? strlen(ext) : 0;
+   int oldname_len;
phar_archive_data **pphar = NULL;
 
if (!ext) {
@@ -2049,12 +2050,13 @@
oldpath = estrndup(phar-fname, phar-fname_len);
oldname = zend_memrchr(phar-fname, '/', phar-fname_len);
++oldname;
+   oldname_len = strlen(oldname);
 
-   basename = estrndup(oldname, strlen(oldname));
+   basename = estrndup(oldname, oldname_len);
spprintf(newname, 0, %s.%s, strtok(basename, .), ext);
efree(basename);
 
-   basepath = estrndup(oldpath, strlen(oldpath) - strlen(oldname));
+   basepath = estrndup(oldpath, (strlen(oldpath) - oldname_len));
phar-fname_len = spprintf(newpath, 0, %s%s, basepath, newname);
phar-fname = newpath;
phar-ext = newpath + phar-fname_len - strlen(ext) - 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_3) /ext/phar phar_object.c

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 06:42:46 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar_object.c 
  Log:
  remove superfluous return statements, merge from pecl/phar
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.42r2=1.266.2.43diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.42 
php-src/ext/phar/phar_object.c:1.266.2.43
--- php-src/ext/phar/phar_object.c:1.266.2.42   Sun Aug 31 06:38:09 2008
+++ php-src/ext/phar/phar_object.c  Sun Aug 31 06:42:46 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar_object.c,v 1.266.2.42 2008/08/31 06:38:09 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.43 2008/08/31 06:42:46 cellog Exp $ */
 
 #include phar_internal.h
 #include func_interceptors.h
@@ -4638,7 +4638,6 @@
case PHAR_ENT_COMPRESSED_GZ:
if (entry_obj-ent.entry-flags  
PHAR_ENT_COMPRESSED_GZ) {
RETURN_TRUE;
-   return;
}
 
if ((entry_obj-ent.entry-flags  
PHAR_ENT_COMPRESSED_BZ2) != 0) {
@@ -4670,7 +4669,6 @@
case PHAR_ENT_COMPRESSED_BZ2:
if (entry_obj-ent.entry-flags  
PHAR_ENT_COMPRESSED_BZ2) {
RETURN_TRUE;
-   return;
}
 
if ((entry_obj-ent.entry-flags  
PHAR_ENT_COMPRESSED_GZ) != 0) {
@@ -4732,7 +4730,6 @@
 
if ((entry_obj-ent.entry-flags  PHAR_ENT_COMPRESSION_MASK) == 0) {
RETURN_TRUE;
-   return;
}
 
if (PHAR_G(readonly)  !entry_obj-ent.entry-phar-is_data) {



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar stream.c

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 06:47:39 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar.phar stream.c 
  Log:
  merge from pecl/phar strlen optimizations
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.39r2=1.7.2.40diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.39 php-src/ext/phar/phar.phar:1.7.2.40
--- php-src/ext/phar/phar.phar:1.7.2.39 Sun Aug 31 06:38:09 2008
+++ php-src/ext/phar/phar.phar  Sun Aug 31 06:47:38 2008
@@ -1171,8 +1171,8 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?
-6-+6+ 
¶Â²Øä±÷¡JÉþs±æêÔ*,8W?°!~ýë¸YåBós.coîd!Â¨`w¡óLæÈ¹BÀí.å[aäÙs\í¹
 gß×
 óbnáN@@ -1229,4 +1229,4 @@
 ùUNøÖ[EMAIL PROTECTED][EMAIL PROTECTED] 
¬ËaYº[Ãâ¬mòvOëý]¸¹)×soSjßZæ/]ûôÞv¿Ç½T%æ:ýÚ)cÚv]¶Ebô«ÐÓ*Çê=KÕO)ò)«Ë-Ô]µLí·¡7µ¾Í¨.î
zÿ.jß?8Tù®,:«Äa·éï¤Á»hg
 ±µÉH¨#[T5$ÜßÞ¶LÐâ¯z4Ê¼è)ÿLuÒñxï;ñ©Æø³;TMe,¯¿{}4b,[EMAIL PROTECTED]
íÑèµïtúÎþ®øÚ÷Eí»ú¡ÃÏàÇGxîÓá§¾óãæ]¢Õ~fI|øðP 
j7l1ØÛPHüéÅiGH¬5´¯$ß/rªýëÐ~Ñúgìªz²¢ÎÛ¦puùäûù;â9³ä¯;[EMAIL 
PROTECTED]
-Pàø3C°\ No newline at end of file
+Pàø3C°\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/stream.c?r1=1.27.2.16r2=1.27.2.17diff_format=u
Index: php-src/ext/phar/stream.c
diff -u php-src/ext/phar/stream.c:1.27.2.16 php-src/ext/phar/stream.c:1.27.2.17
--- php-src/ext/phar/stream.c:1.27.2.16 Sun Aug 31 02:14:03 2008
+++ php-src/ext/phar/stream.c   Sun Aug 31 06:47:38 2008
@@ -676,6 +676,7 @@
 {
php_url *resource;
char *internal_file, *error;
+   int internal_file_len;
phar_entry_data *idata;
phar_archive_data **pphar;
uint host_len;
@@ -701,7 +702,7 @@
host_len = strlen(resource-host);
phar_request_initialize(TSRMLS_C);
 
-   if (FAILURE == zend_hash_find((PHAR_GLOBALS-phar_fname_map), 
resource-host, strlen(resource-host), (void **) pphar)) {
+   if (FAILURE == zend_hash_find((PHAR_GLOBALS-phar_fname_map), 
resource-host, host_len, (void **) pphar)) {
pphar = NULL;
}
if (PHAR_G(readonly)  (!pphar || !(*pphar)-is_data)) {
@@ -712,7 +713,8 @@
 
/* need to copy to strip leading /, will get touched again */
internal_file = estrdup(resource-path + 1);
-   if (FAILURE == phar_get_entry_data(idata, resource-host, 
strlen(resource-host), internal_file, strlen(internal_file), r, 0, error, 1 
TSRMLS_CC)) {
+   internal_file_len = strlen(internal_file);
+   if (FAILURE == phar_get_entry_data(idata, resource-host, host_len, 
internal_file, internal_file_len, r, 0, error, 1 TSRMLS_CC)) {
/* constraints of fp refcount were not met */
if (error) {
php_stream_wrapper_log_error(wrapper, options 
TSRMLS_CC, unlink of \%s\ failed: %s, url, error);
@@ -829,7 +831,7 @@
 
host_len = strlen(resource_from-host);
 
-   if (SUCCESS != phar_get_archive(phar, resource_from-host, 
strlen(resource_from-host), NULL, 0, error TSRMLS_CC)) {
+   if (SUCCESS != phar_get_archive(phar, resource_from-host, host_len, 
NULL, 0, error TSRMLS_CC)) {
php_url_free(resource_from);
php_url_free(resource_to);
php_error_docref(NULL TSRMLS_CC, E_WARNING, phar error: cannot 
rename \%s\ to \%s\: %s, url_from, url_to, error);



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar tar.c

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 06:51:49 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar.phar tar.c 
  Log:
  remove superfluous variable declarations, merge WS from pecl/phar
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.40r2=1.7.2.41diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.40 php-src/ext/phar/phar.phar:1.7.2.41
--- php-src/ext/phar/phar.phar:1.7.2.40 Sun Aug 31 06:47:38 2008
+++ php-src/ext/phar/phar.phar  Sun Aug 31 06:51:49 2008
@@ -1171,8 +1171,8 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?
-6-+6+ 
¶Â²Øä±÷¡JÉþs±æêÔ*,8W?°!~ýë¸YåBós.coîd!Â¨`w¡óLæÈ¹BÀí.å[aäÙs\í¹
 gß×
 óbnáN@@ -1229,4 +1229,4 @@
 ùUNøÖ[EMAIL PROTECTED][EMAIL PROTECTED] 
¬ËaYº[Ãâ¬mòvOëý]¸¹)×soSjßZæ/]ûôÞv¿Ç½T%æ:ýÚ)cÚv]¶Ebô«ÐÓ*Çê=KÕO)ò)«Ë-Ô]µLí·¡7µ¾Í¨.î
zÿ.jß?8Tù®,:«Äa·éï¤Á»hg
 ±µÉH¨#[T5$ÜßÞ¶LÐâ¯z4Ê¼è)ÿLuÒñxï;ñ©Æø³;TMe,¯¿{}4b,[EMAIL PROTECTED]
íÑèµïtúÎþ®øÚ÷Eí»ú¡ÃÏàÇGxîÓá§¾óãæ]¢Õ~fI|øðP 
j7l1ØÛPHüéÅiGH¬5´¯$ß/rªýëÐ~Ñúgìªz²¢ÎÛ¦puùäûù;â9³ä¯;[EMAIL 
PROTECTED]
-Pàø3C°\ No newline at end of file
+Pàø3C°\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tar.c?r1=1.55.2.18r2=1.55.2.19diff_format=u
Index: php-src/ext/phar/tar.c
diff -u php-src/ext/phar/tar.c:1.55.2.18 php-src/ext/phar/tar.c:1.55.2.19
--- php-src/ext/phar/tar.c:1.55.2.18Fri Aug  1 13:48:45 2008
+++ php-src/ext/phar/tar.c  Sun Aug 31 06:51:49 2008
@@ -255,7 +255,6 @@
phar_tar_number(hdr-size, sizeof(hdr-size));
 
if (((!old  hdr-prefix[0] == 0) || old)  strlen(hdr-name) 
== sizeof(.phar/signature.bin)-1  !strncmp(hdr-name, 
.phar/signature.bin, sizeof(.phar/signature.bin)-1)) {
-   size_t read;
if (size  511) {
if (error) {
spprintf(error, 4096, phar error: 
tar-based phar \%s\ has signature that is larger than 511 bytes, cannot 
process, fname);
@@ -370,7 +369,7 @@
return FAILURE;
}
 
-   entry.tar_type = ((old  (hdr-typeflag == 
0))?'0':hdr-typeflag);
+   entry.tar_type = ((old  (hdr-typeflag == 0)) ? '0' : 
hdr-typeflag);
entry.offset = entry.offset_abs = pos; /* header_offset unused 
in tar */
entry.fp_type = PHAR_FP;
entry.flags = phar_tar_number(hdr-mode, sizeof(hdr-mode))  
PHAR_ENT_PERM_MASK;
@@ -424,7 +423,6 @@
}
 
if (!actual_alias  entry.filename_len == 
sizeof(.phar/alias.txt)-1  !strncmp(entry.filename, .phar/alias.txt, 
sizeof(.phar/alias.txt)-1)) {
-   size_t read;
/* found explicit alias */
if (size  511) {
if (error) {



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar phar_object.c

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 06:58:05 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar.phar phar_object.c 
  Log:
  fix compile warning in PHP  6.0
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.41r2=1.7.2.42diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.41 php-src/ext/phar/phar.phar:1.7.2.42
--- php-src/ext/phar/phar.phar:1.7.2.41 Sun Aug 31 06:51:49 2008
+++ php-src/ext/phar/phar.phar  Sun Aug 31 06:58:04 2008
@@ -1171,8 +1171,8 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?
-6-+6+ 
¶Â²Øä±÷¡JÉþs±æêÔ*,8W?°!~ýë¸YåBós.coîd!Â¨`w¡óLæÈ¹BÀí.å[aäÙs\í¹
 gß×
 óbnáN@@ -1229,4 +1229,4 @@
 ùUNøÖ[EMAIL PROTECTED][EMAIL PROTECTED] 
¬ËaYº[Ãâ¬mòvOëý]¸¹)×soSjßZæ/]ûôÞv¿Ç½T%æ:ýÚ)cÚv]¶Ebô«ÐÓ*Çê=KÕO)ò)«Ë-Ô]µLí·¡7µ¾Í¨.î
zÿ.jß?8Tù®,:«Äa·éï¤Á»hg
 ±µÉH¨#[T5$ÜßÞ¶LÐâ¯z4Ê¼è)ÿLuÒñxï;ñ©Æø³;TMe,¯¿{}4b,[EMAIL PROTECTED]
íÑèµïtúÎþ®øÚ÷Eí»ú¡ÃÏàÇGxîÓá§¾óãæ]¢Õ~fI|øðP 
j7l1ØÛPHüéÅiGH¬5´¯$ß/rªýëÐ~Ñúgìªz²¢ÎÛ¦puùäûù;â9³ä¯;[EMAIL 
PROTECTED]
-Pàø3C°\ No newline at end of file
+Pàø3C°\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.43r2=1.266.2.44diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.43 
php-src/ext/phar/phar_object.c:1.266.2.44
--- php-src/ext/phar/phar_object.c:1.266.2.43   Sun Aug 31 06:42:46 2008
+++ php-src/ext/phar/phar_object.c  Sun Aug 31 06:58:04 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar_object.c,v 1.266.2.43 2008/08/31 06:42:46 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.44 2008/08/31 06:58:04 cellog Exp $ */
 
 #include phar_internal.h
 #include func_interceptors.h
@@ -1448,7 +1448,12 @@
}
 
if (key_type  9) { /* IS_UNICODE == 10 */
+#if PHP_VERSION_ID  6
+/* this can never happen, but fixes a compile warning */
+   spprintf(str_key, 0, %s, key);
+#else
spprintf(str_key, 0, %v, key);
+#endif
} else {
PHAR_STR(key, str_key);
}
@@ -1575,7 +1580,12 @@
}
 
if (key_type  9) { /* IS_UNICODE == 10 */
+#if PHP_VERSION_ID  6
+/* this can never happen, but fixes a compile warning */
+   spprintf(str_key, 0, %s, key);
+#else
spprintf(str_key, 0, %v, key);
+#endif
} else {
PHAR_STR(key, str_key);
}



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/tests/cache_list/files blog.phar blog.phar.inc config.xml extracted.inc frontcontroller.phar.inc frontcontroller10.phar.inc frontcontroller11.phar.inc frontco

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 07:03:27 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/phar/tests/cache_list/filesblog.phar blog.phar.inc 
config.xml extracted.inc 
frontcontroller.phar.inc 
frontcontroller10.phar.inc 
frontcontroller11.phar.inc 
frontcontroller12.phar.inc 
frontcontroller13.phar.inc 
frontcontroller14.phar.inc 
frontcontroller16.phar.inc 
frontcontroller17.phar.inc 
frontcontroller18.phar.inc 
frontcontroller19.phar.inc 
frontcontroller2.phar.inc 
frontcontroller3.phar.inc 
frontcontroller4.phar.inc 
frontcontroller5.phar.inc 
frontcontroller6.phar.inc 
frontcontroller7.phar.inc 
frontcontroller8.phar.inc 
frontcontroller9.phar.inc 
md5.phar nophar.phar 
nophar.phar.inc 
openssl.phar 
openssl.phar.pubkey 
phar_oo_test.inc 
phar_test.inc private.pem 
sha1.phar sha256.phar 
sha512.phar zfapp.tgz 
  Log:
  commit missing files for tests
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/blog.phar?view=markuprev=1.1
Index: php-src/ext/phar/tests/cache_list/files/blog.phar
+++ php-src/ext/phar/tests/cache_list/files/blog.phar

http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/blog.phar.inc?view=markuprev=1.1
Index: php-src/ext/phar/tests/cache_list/files/blog.phar.inc
+++ php-src/ext/phar/tests/cache_list/files/blog.phar.inc

http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/config.xml?view=markuprev=1.1
Index: php-src/ext/phar/tests/cache_list/files/config.xml
+++ php-src/ext/phar/tests/cache_list/files/config.xml

http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/extracted.inc?view=markuprev=1.1
Index: php-src/ext/phar/tests/cache_list/files/extracted.inc
+++ php-src/ext/phar/tests/cache_list/files/extracted.inc

http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/frontcontroller.phar.inc?view=markuprev=1.1
Index: php-src/ext/phar/tests/cache_list/files/frontcontroller.phar.inc
+++ php-src/ext/phar/tests/cache_list/files/frontcontroller.phar.inc

http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/frontcontroller10.phar.inc?view=markuprev=1.1
Index: php-src/ext/phar/tests/cache_list/files/frontcontroller10.phar.inc
+++ php-src/ext/phar/tests/cache_list/files/frontcontroller10.phar.inc

http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/frontcontroller11.phar.inc?view=markuprev=1.1
Index: php-src/ext/phar/tests/cache_list/files/frontcontroller11.phar.inc
+++ php-src/ext/phar/tests/cache_list/files/frontcontroller11.phar.inc

http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc?view=markuprev=1.1
Index: php-src/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc
+++ php-src/ext/phar/tests/cache_list/files/frontcontroller12.phar.inc

http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/frontcontroller13.phar.inc?view=markuprev=1.1
Index: php-src/ext/phar/tests/cache_list/files/frontcontroller13.phar.inc
+++ php-src/ext/phar/tests/cache_list/files/frontcontroller13.phar.inc

http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc?view=markuprev=1.1
Index: php-src/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc
+++ php-src/ext/phar/tests/cache_list/files/frontcontroller14.phar.inc

http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/frontcontroller16.phar.inc?view=markuprev=1.1
Index: php-src/ext/phar/tests/cache_list/files/frontcontroller16.phar.inc
+++ php-src/ext/phar/tests/cache_list/files/frontcontroller16.phar.inc

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar util.c

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 07:15:26 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar.phar util.c 
  Log:
  use safer strlcpy, patch by Tony Dovgal
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.42r2=1.7.2.43diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.42 php-src/ext/phar/phar.phar:1.7.2.43
--- php-src/ext/phar/phar.phar:1.7.2.42 Sun Aug 31 06:58:04 2008
+++ php-src/ext/phar/phar.phar  Sun Aug 31 07:15:25 2008
@@ -1171,8 +1171,8 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?
-6-+6+ 
¶Â²Øä±÷¡JÉþs±æêÔ*,8W?°!~ýë¸YåBós.coîd!Â¨`w¡óLæÈ¹BÀí.å[aäÙs\í¹
 gß×
 óbnáN@@ -1229,4 +1229,4 @@
 ùUNøÖ[EMAIL PROTECTED][EMAIL PROTECTED] 
¬ËaYº[Ãâ¬mòvOëý]¸¹)×soSjßZæ/]ûôÞv¿Ç½T%æ:ýÚ)cÚv]¶Ebô«ÐÓ*Çê=KÕO)ò)«Ë-Ô]µLí·¡7µ¾Í¨.î
zÿ.jß?8Tù®,:«Äa·éï¤Á»hg
 ±µÉH¨#[T5$ÜßÞ¶LÐâ¯z4Ê¼è)ÿLuÒñxï;ñ©Æø³;TMe,¯¿{}4b,[EMAIL PROTECTED]
íÑèµïtúÎþ®øÚ÷Eí»ú¡ÃÏàÇGxîÓá§¾óãæ]¢Õ~fI|øðP 
j7l1ØÛPHüéÅiGH¬5´¯$ß/rªýëÐ~Ñúgìªz²¢ÎÛ¦puùäûù;â9³ä¯;[EMAIL 
PROTECTED]
-Pàø3C°\ No newline at end of file
+Pàø3C°\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.30r2=1.55.2.31diff_format=u
Index: php-src/ext/phar/util.c
diff -u php-src/ext/phar/util.c:1.55.2.30 php-src/ext/phar/util.c:1.55.2.31
--- php-src/ext/phar/util.c:1.55.2.30   Sun Aug 31 02:14:03 2008
+++ php-src/ext/phar/util.c Sun Aug 31 07:15:25 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: util.c,v 1.55.2.30 2008/08/31 02:14:03 cellog Exp $ */
+/* $Id: util.c,v 1.55.2.31 2008/08/31 07:15:25 cellog Exp $ */
 
 #include phar_internal.h
 
@@ -475,7 +475,7 @@
 
wrapper = php_stream_locate_url_wrapper(trypath, 
actual, STREAM_OPEN_FOR_INCLUDE TSRMLS_CC);
if (wrapper == php_plain_files_wrapper) {
-   strncpy(trypath, actual, MAXPATHLEN);
+   strlcpy(trypath, actual, sizeof(trypath));
} else if (!wrapper) {
/* if wrapper is NULL, there was a mal-formed 
include_path stream wrapper, so skip this ptr */
continue;
@@ -542,7 +542,7 @@
 
if (wrapper == php_plain_files_wrapper) {
/* this should never technically 
happen, but we'll leave it here for completeness */
-   strncpy(trypath, actual, MAXPATHLEN);
+   strlcpy(trypath, actual, 
sizeof(trypath));
} else if (!wrapper) {
/* if wrapper is NULL, there was a 
malformed include_path stream wrapper
   this also should be impossible */



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

[PHP-CVS] cvs: php-src / README.RELEASE_PROCESS

2008-08-31 Thread Lukas Smith

lsmith  Sun Aug 31 08:32:21 2008 UTC

  Modified files:  
/php-srcREADME.RELEASE_PROCESS 
  Log:
  added note about how to move extensions from/to pecl
  
http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.8r2=1.9diff_format=u
Index: php-src/README.RELEASE_PROCESS
diff -u php-src/README.RELEASE_PROCESS:1.8 php-src/README.RELEASE_PROCESS:1.9
--- php-src/README.RELEASE_PROCESS:1.8  Wed Aug  6 21:49:37 2008
+++ php-src/README.RELEASE_PROCESS  Sun Aug 31 08:32:21 2008
@@ -20,6 +20,9 @@
 
 5. Verify the tags to be extra sure everything was tagged properly.
 
+6. Moving extensions from/to PECL requires root level access to the CVS server.
+Do not use cvs rm, because this will prevent moving the CVS history.
+
 Rolling a non stable release (alpha/beta/RC)
 
 



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

[PHP-CVS] cvs: php-src(PHP_5_3) / README.RELEASE_PROCESS

2008-08-31 Thread Lukas Smith

lsmith  Sun Aug 31 08:32:32 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcREADME.RELEASE_PROCESS 
  Log:
  MFH
  
http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.1.2.8r2=1.1.2.9diff_format=u
Index: php-src/README.RELEASE_PROCESS
diff -u php-src/README.RELEASE_PROCESS:1.1.2.8 
php-src/README.RELEASE_PROCESS:1.1.2.9
--- php-src/README.RELEASE_PROCESS:1.1.2.8  Wed Aug  6 21:49:47 2008
+++ php-src/README.RELEASE_PROCESS  Sun Aug 31 08:32:32 2008
@@ -20,6 +20,9 @@
 
 5. Verify the tags to be extra sure everything was tagged properly.
 
+6. Moving extensions from/to PECL requires root level access to the CVS server.
+Do not use cvs rm, because this will prevent moving the CVS history.
+
 Rolling a non stable release (alpha/beta/RC)
 
 



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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) / README.RELEASE_PROCESS

2008-08-31 Thread Hannes Magnusson

On Sun, Aug 31, 2008 at 10:32, Lukas Smith [EMAIL PROTECTED] wrote:
 lsmith  Sun Aug 31 08:32:32 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcREADME.RELEASE_PROCESS
  Log:
  MFH

 http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.1.2.8r2=1.1.2.9diff_format=u
 Index: php-src/README.RELEASE_PROCESS
 diff -u php-src/README.RELEASE_PROCESS:1.1.2.8 
 php-src/README.RELEASE_PROCESS:1.1.2.9
 --- php-src/README.RELEASE_PROCESS:1.1.2.8  Wed Aug  6 21:49:47 2008
 +++ php-src/README.RELEASE_PROCESS  Sun Aug 31 08:32:32 2008
 @@ -20,6 +20,9 @@

  5. Verify the tags to be extra sure everything was tagged properly.

 +6. Moving extensions from/to PECL requires root level access to the CVS 
 server.
 +Do not use cvs rm, because this will prevent moving the CVS history.

That can't be right.
The extension should be copypaste from php-src/ext/foobar to pecl/,
sure, but the removal of it from php-src should be done via cvs rm 
cvs commit otherwise you break bunch of our scripts - especially
version information listing in the manual.

-Hannes

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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) / README.RELEASE_PROCESS

2008-08-31 Thread Lukas Kahwe Smith



On 31.08.2008, at 11:47, Hannes Magnusson wrote:


On Sun, Aug 31, 2008 at 10:32, Lukas Smith [EMAIL PROTECTED] wrote:

lsmith  Sun Aug 31 08:32:32 2008 UTC

Modified files:  (Branch: PHP_5_3)
  /php-srcREADME.RELEASE_PROCESS
Log:
MFH

http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.1.2.8r2=1.1.2.9diff_format=u
Index: php-src/README.RELEASE_PROCESS
diff -u php-src/README.RELEASE_PROCESS:1.1.2.8 php-src/ 
README.RELEASE_PROCESS:1.1.2.9
--- php-src/README.RELEASE_PROCESS:1.1.2.8  Wed Aug  6 21:49:47  
2008

+++ php-src/README.RELEASE_PROCESS  Sun Aug 31 08:32:32 2008
@@ -20,6 +20,9 @@

5. Verify the tags to be extra sure everything was tagged properly.

+6. Moving extensions from/to PECL requires root level access to  
the CVS server.

+Do not use cvs rm, because this will prevent moving the CVS history.


That can't be right.
The extension should be copypaste from php-src/ext/foobar to pecl/,
sure, but the removal of it from php-src should be done via cvs rm 
cvs commit otherwise you break bunch of our scripts - especially
version information listing in the manual.



Sounds sensible. Anyways, I would appreciate it if someone who knows  
would write a howto, so that RMs can verify that things are done  
properly. I guess in the past Derick took care of a lot of these moves  
via OS level file system magic. I do not know the details on how this  
worked. If it was a copy or a move and if there was a cvs rm  
afterwards or not.


regards,
Lukas Kahwe Smith
[EMAIL PROTECTED]




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

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

2008-08-31 Thread Mikko Koppanen

mkoppanen   Sun Aug 31 10:06:47 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  Added news entries about changes in ext/fileinfo
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.295r2=1.2027.2.547.2.965.2.296diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.295 
php-src/NEWS:1.2027.2.547.2.965.2.296
--- php-src/NEWS:1.2027.2.547.2.965.2.295   Fri Aug 29 14:59:19 2008
+++ php-src/NEWSSun Aug 31 10:06:46 2008
@@ -1,6 +1,10 @@
 PHPNEWS
 |||
 ?? ??? 200?, PHP 5.3.0 Alpha 2
+- Changed bundled libmagic to use PHP memory allocation routines. (Ilia)
+- Changed bundled libmagic to use pcre instead of ereg. (Derick,Scott,Mikko)
+- Updated mime_content_type to use fileinfo. (Derick)
+
 - Removed shebang line check from CGI sapi (it is checked by scanner). (Dmitry)
 
 - Changed session_start() to return false when session startup fails. (Jani)



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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) / README.RELEASE_PROCESS

2008-08-31 Thread Pierre Joye

Hi Hannes, Lukas.

On Sun, Aug 31, 2008 at 12:05 PM, Lukas Kahwe Smith [EMAIL PROTECTED] wrote:

 Sounds sensible. Anyways, I would appreciate it if someone who knows would
 write a howto, so that RMs can verify that things are done properly. I guess
 in the past Derick took care of a lot of these moves via OS level file
 system magic. I do not know the details on how this worked. If it was a copy
 or a move and if there was a cvs rm afterwards or not.

Hannes is right, it can't be a OS Level directory move but at least a
copy. Doing a move will change the previous branches and that's not
desired. The ideal solution would be:

- Filesystem: cp -r php-src/ext/foo pecl/
- cvs rm php-src/ext/foo

If the extension is still usable or not dead (unlike sybase but like
ming for example), in cooperation with the extension maintainers if
any:
- create the pecl.php.net/foo package and its content, license, maintainer
- create the package.xml, commit
- release the package (I can explain the PECL release process if necessary)


Cheers,
-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) / README.RELEASE_PROCESS

2008-08-31 Thread Lukas Kahwe Smith



On 31.08.2008, at 12:11, Pierre Joye wrote:


Hi Hannes, Lukas.

On Sun, Aug 31, 2008 at 12:05 PM, Lukas Kahwe Smith [EMAIL PROTECTED]  
wrote:


Sounds sensible. Anyways, I would appreciate it if someone who  
knows would
write a howto, so that RMs can verify that things are done  
properly. I guess
in the past Derick took care of a lot of these moves via OS level  
file
system magic. I do not know the details on how this worked. If it  
was a copy

or a move and if there was a cvs rm afterwards or not.


Hannes is right, it can't be a OS Level directory move but at least a
copy. Doing a move will change the previous branches and that's not
desired. The ideal solution would be:

- Filesystem: cp -r php-src/ext/foo pecl/
- cvs rm php-src/ext/foo

If the extension is still usable or not dead (unlike sybase but like
ming for example), in cooperation with the extension maintainers if
any:
- create the pecl.php.net/foo package and its content, license,  
maintainer

- create the package.xml, commit
- release the package (I can explain the PECL release process if  
necessary)



sounds good to me.

next question .. who can do the FS level cp? i think it would be good  
to have a list of people RM's can contact for this step. also this way  
we know the bus-faktor (after all people can disappear temporarily or  
permanently).


regards,
Lukas Kahwe Smith
[EMAIL PROTECTED]




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

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

2008-08-31 Thread Mikko Koppanen

mkoppanen   Sun Aug 31 10:20:59 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  Changed name,name,name to name, name, name according to Pierre's advice
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.296r2=1.2027.2.547.2.965.2.297diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.296 
php-src/NEWS:1.2027.2.547.2.965.2.297
--- php-src/NEWS:1.2027.2.547.2.965.2.296   Sun Aug 31 10:06:46 2008
+++ php-src/NEWSSun Aug 31 10:20:57 2008
@@ -2,7 +2,7 @@
 |||
 ?? ??? 200?, PHP 5.3.0 Alpha 2
 - Changed bundled libmagic to use PHP memory allocation routines. (Ilia)
-- Changed bundled libmagic to use pcre instead of ereg. (Derick,Scott,Mikko)
+- Changed bundled libmagic to use pcre instead of ereg. (Derick, Scott, Mikko)
 - Updated mime_content_type to use fileinfo. (Derick)
 
 - Removed shebang line check from CGI sapi (it is checked by scanner). (Dmitry)



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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) / README.RELEASE_PROCESS

2008-08-31 Thread Pierre Joye

On Sun, Aug 31, 2008 at 12:20 PM, Lukas Kahwe Smith [EMAIL PROTECTED] wrote:

 sounds good to me.

 next question .. who can do the FS level cp? i think it would be good to
 have a list of people RM's can contact for this step. also this way we know
 the bus-faktor (after all people can disappear temporarily or permanently).

You will hate this answer ;-):

mail [EMAIL PROTECTED] :-D

Cheers,
-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

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

[PHP-CVS] cvs: php-src / README.RELEASE_PROCESS

2008-08-31 Thread Lukas Smith

lsmith  Sun Aug 31 10:34:57 2008 UTC

  Modified files:  
/php-srcREADME.RELEASE_PROCESS 
  Log:
  - added further details on the steps necessary to move ext from/to pecl
  
http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.9r2=1.10diff_format=u
Index: php-src/README.RELEASE_PROCESS
diff -u php-src/README.RELEASE_PROCESS:1.9 php-src/README.RELEASE_PROCESS:1.10
--- php-src/README.RELEASE_PROCESS:1.9  Sun Aug 31 08:32:21 2008
+++ php-src/README.RELEASE_PROCESS  Sun Aug 31 10:34:56 2008
@@ -21,7 +21,22 @@
 5. Verify the tags to be extra sure everything was tagged properly.
 
 6. Moving extensions from/to PECL requires root level access to the CVS server.
-Do not use cvs rm, because this will prevent moving the CVS history.
+Contact [EMAIL PROTECTED] to get this taken care of.
+
+Moving extensions from php-src to PECL
+- Filesystem: cp -r php-src/ext/foo pecl/foo
+- cvs rm php-src/ext/foo
+
+If the extension is still usable or not dead, in cooperation with the extension
+maintainers if any:
+- create the pecl.php.net/foo package and its content, license, maintainer
+- create the package.xml, commit
+- release the package
+
+Moving extensions from PECL to php-src
+- Filesystem: cp -r pecl/foo php-src/ext/foo
+OR depending on the wishes from the PECL extension maintainer.
+- Filesystem: ln -s pecl/foo php-src/ext/foo
 
 Rolling a non stable release (alpha/beta/RC)
 



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

[PHP-CVS] cvs: php-src(PHP_5_3) / README.RELEASE_PROCESS

2008-08-31 Thread Lukas Smith

lsmith  Sun Aug 31 10:35:06 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcREADME.RELEASE_PROCESS 
  Log:
  MFH
  
http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.1.2.9r2=1.1.2.10diff_format=u
Index: php-src/README.RELEASE_PROCESS
diff -u php-src/README.RELEASE_PROCESS:1.1.2.9 
php-src/README.RELEASE_PROCESS:1.1.2.10
--- php-src/README.RELEASE_PROCESS:1.1.2.9  Sun Aug 31 08:32:32 2008
+++ php-src/README.RELEASE_PROCESS  Sun Aug 31 10:35:06 2008
@@ -21,7 +21,22 @@
 5. Verify the tags to be extra sure everything was tagged properly.
 
 6. Moving extensions from/to PECL requires root level access to the CVS server.
-Do not use cvs rm, because this will prevent moving the CVS history.
+Contact [EMAIL PROTECTED] to get this taken care of.
+
+Moving extensions from php-src to PECL
+- Filesystem: cp -r php-src/ext/foo pecl/foo
+- cvs rm php-src/ext/foo
+
+If the extension is still usable or not dead, in cooperation with the extension
+maintainers if any:
+- create the pecl.php.net/foo package and its content, license, maintainer
+- create the package.xml, commit
+- release the package
+
+Moving extensions from PECL to php-src
+- Filesystem: cp -r pecl/foo php-src/ext/foo
+OR depending on the wishes from the PECL extension maintainer.
+- Filesystem: ln -s pecl/foo php-src/ext/foo
 
 Rolling a non stable release (alpha/beta/RC)
 



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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) / README.RELEASE_PROCESS

2008-08-31 Thread Hannes Magnusson

On Sun, Aug 31, 2008 at 12:20, Lukas Kahwe Smith [EMAIL PROTECTED] wrote:
 next question .. who can do the FS level cp?

Derick and Rasmus

-Hannes

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/session mod_files.c /ext/session/tests session_save_path_variation5.phpt

2008-08-31 Thread Alexey Zakhlestin

indeyetsSun Aug 31 14:49:58 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/sessionmod_files.c 
/php-src/ext/session/tests  session_save_path_variation5.phpt 
  Log:
  remove special treatment of /tmp path
  
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_files.c?r1=1.100.2.3.2.10.2.1r2=1.100.2.3.2.10.2.2diff_format=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.100.2.3.2.10.2.1 
php-src/ext/session/mod_files.c:1.100.2.3.2.10.2.2
--- php-src/ext/session/mod_files.c:1.100.2.3.2.10.2.1  Mon Dec 31 07:17:13 2007
+++ php-src/ext/session/mod_files.c Sun Aug 31 14:49:57 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: mod_files.c,v 1.100.2.3.2.10.2.1 2007/12/31 07:17:13 sebastian Exp $ */
+/* $Id: mod_files.c,v 1.100.2.3.2.10.2.2 2008/08/31 14:49:57 indeyets Exp $ */
 
 #include php.h
 
@@ -278,13 +278,11 @@
/* if save path is an empty string, determine the temporary dir 
*/
save_path = php_get_temporary_directory();
 
-   if (strcmp(save_path, /tmp)) {
-   if (PG(safe_mode)  (!php_checkuid(save_path, NULL, 
CHECKUID_CHECK_FILE_AND_DIR))) {
-   return FAILURE;
-   }
-   if (php_check_open_basedir(save_path TSRMLS_CC)) {
-   return FAILURE;
-   }
+   if (PG(safe_mode)  (!php_checkuid(save_path, NULL, 
CHECKUID_CHECK_FILE_AND_DIR))) {
+   return FAILURE;
+   }
+   if (php_check_open_basedir(save_path TSRMLS_CC)) {
+   return FAILURE;
}
}

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_save_path_variation5.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/session/tests/session_save_path_variation5.phpt
diff -u php-src/ext/session/tests/session_save_path_variation5.phpt:1.1.2.3 
php-src/ext/session/tests/session_save_path_variation5.phpt:1.1.2.4
--- php-src/ext/session/tests/session_save_path_variation5.phpt:1.1.2.3 Wed Apr 
30 15:20:18 2008
+++ php-src/ext/session/tests/session_save_path_variation5.phpt Sun Aug 31 
14:49:58 2008
@@ -36,10 +36,6 @@
 var_dump(chdir($sessions));
 ini_set(session.save_path, $directory);
 var_dump(session_save_path());
-var_dump(session_start());
-var_dump(session_save_path());
-var_dump(session_destroy());
-var_dump(session_save_path());
 var_dump(rmdir($sessions));
 
 echo Done;
@@ -57,9 +53,5 @@
 Warning: ini_set(): open_basedir restriction in effect. File(%s) is not within 
the allowed path(s): (.) in %s on line %d
 string(0) 
 bool(true)
-string(0) 
-bool(true)
-string(0) 
-bool(true)
 Done
 



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

[PHP-CVS] cvs: php-src /ext/session mod_files.c /ext/session/tests session_save_path_variation5.phpt

2008-08-31 Thread Alexey Zakhlestin

indeyetsSun Aug 31 14:50:10 2008 UTC

  Modified files:  
/php-src/ext/sessionmod_files.c 
/php-src/ext/session/tests  session_save_path_variation5.phpt 
  Log:
  remove special treatment of /tmp path
  
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_files.c?r1=1.118r2=1.119diff_format=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.118 
php-src/ext/session/mod_files.c:1.119
--- php-src/ext/session/mod_files.c:1.118   Wed May 21 12:01:55 2008
+++ php-src/ext/session/mod_files.c Sun Aug 31 14:50:10 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: mod_files.c,v 1.118 2008/05/21 12:01:55 tony2001 Exp $ */
+/* $Id: mod_files.c,v 1.119 2008/08/31 14:50:10 indeyets Exp $ */
 
 #include php.h
 
@@ -296,10 +296,8 @@
/* if save path is an empty string, determine the temporary dir 
*/
save_path = php_get_temporary_directory();
 
-   if (strcmp(save_path, /tmp)) {
-   if (php_check_open_basedir(save_path TSRMLS_CC)) {
-   return FAILURE;
-   }
+   if (php_check_open_basedir(save_path TSRMLS_CC)) {
+   return FAILURE;
}
}

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_save_path_variation5.phpt?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/session/tests/session_save_path_variation5.phpt
diff -u php-src/ext/session/tests/session_save_path_variation5.phpt:1.6 
php-src/ext/session/tests/session_save_path_variation5.phpt:1.7
--- php-src/ext/session/tests/session_save_path_variation5.phpt:1.6 Tue May 
27 18:16:04 2008
+++ php-src/ext/session/tests/session_save_path_variation5.phpt Sun Aug 31 
14:50:10 2008
@@ -36,10 +36,6 @@
 var_dump(chdir($sessions));
 ini_set(session.save_path, $directory);
 var_dump(session_save_path());
-var_dump(session_start());
-var_dump(session_save_path());
-var_dump(session_destroy());
-var_dump(session_save_path());
 var_dump(rmdir($sessions));
 
 echo Done;
@@ -59,10 +55,6 @@
 Warning: ini_set(): open_basedir restriction in effect. File(%s) is not within 
the allowed path(s): (.) in %s on line %d
 unicode(0) 
 bool(true)
-unicode(0) 
-bool(true)
-unicode(0) 
-bool(true)
 Done
 
 



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

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

2008-08-31 Thread Alexey Zakhlestin

indeyetsSun Aug 31 14:56:15 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  added entry about change in ext/session
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.297r2=1.2027.2.547.2.965.2.298diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.297 
php-src/NEWS:1.2027.2.547.2.965.2.298
--- php-src/NEWS:1.2027.2.547.2.965.2.297   Sun Aug 31 10:20:57 2008
+++ php-src/NEWSSun Aug 31 14:56:14 2008
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? ??? 200?, PHP 5.3.0 Alpha 2
+- Removed special treatment of /tmp path for sessions in open_basedir
+  context. (Alexey)
 - Changed bundled libmagic to use PHP memory allocation routines. (Ilia)
 - Changed bundled libmagic to use pcre instead of ereg. (Derick, Scott, Mikko)
 - Updated mime_content_type to use fileinfo. (Derick)



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

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

2008-08-31 Thread Lukas Kahwe Smith



On 31.08.2008, at 16:56, Alexey Zakhlestin wrote:


indeyetsSun Aug 31 14:56:15 2008 UTC

 Modified files:  (Branch: PHP_5_3)
   /php-src NEWS
 Log:
 added entry about change in ext/session

http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.297r2=1.2027.2.547.2.965.2.298diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.297 
php-src/NEWS:1.2027.2.547.2.965.2.298
--- php-src/NEWS:1.2027.2.547.2.965.2.297   Sun Aug 31 10:20:57 2008
+++ php-src/NEWSSun Aug 31 14:56:14 2008
@@ -1,6 +1,8 @@
PHP
NEWS
|
|
|
|
|
|
|
|
|
||
?? ??? 200?, PHP 5.3.0 Alpha 2
+- Removed special treatment of /tmp path for sessions in  
open_basedir

+  context. (Alexey)
- Changed bundled libmagic to use PHP memory allocation routines.  
(Ilia)
- Changed bundled libmagic to use pcre instead of ereg. (Derick,  
Scott, Mikko)

- Updated mime_content_type to use fileinfo. (Derick)



might make sense to mention that it was introduced in 5.2.2 (or  
whatever version you recently mentioned).


regards,
Lukas Kahwe Smith
[EMAIL PROTECTED]




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

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

2008-08-31 Thread Alexey Zakhlestin

indeyetsSun Aug 31 15:04:22 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  more detailed news-entry
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.298r2=1.2027.2.547.2.965.2.299diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.298 
php-src/NEWS:1.2027.2.547.2.965.2.299
--- php-src/NEWS:1.2027.2.547.2.965.2.298   Sun Aug 31 14:56:14 2008
+++ php-src/NEWSSun Aug 31 15:04:21 2008
@@ -2,7 +2,7 @@
 |||
 ?? ??? 200?, PHP 5.3.0 Alpha 2
 - Removed special treatment of /tmp path for sessions in open_basedir
-  context. (Alexey)
+  context, which was introduced in 5.2.2, but was never documented. (Alexey)
 - Changed bundled libmagic to use PHP memory allocation routines. (Ilia)
 - Changed bundled libmagic to use pcre instead of ereg. (Derick, Scott, Mikko)
 - Updated mime_content_type to use fileinfo. (Derick)



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pcre/tests preg_filter.phpt

2008-08-31 Thread Nuno Lopes

nlopess Sun Aug 31 15:28:35 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pcre/tests preg_filter.phpt 
  Log:
  remove unicode skipif, as the test doesnt require such support
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_filter.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/pcre/tests/preg_filter.phpt
diff -u php-src/ext/pcre/tests/preg_filter.phpt:1.1.2.2 
php-src/ext/pcre/tests/preg_filter.phpt:1.1.2.3
--- php-src/ext/pcre/tests/preg_filter.phpt:1.1.2.2 Fri Aug 29 12:13:54 2008
+++ php-src/ext/pcre/tests/preg_filter.phpt Sun Aug 31 15:28:35 2008
@@ -1,11 +1,5 @@
 --TEST--
 preg_filter()
---SKIPIF--
-?php
-if (@preg_match_all('/./u', , $matches) === false) {
-   die(skip no utf8 support in PCRE library);
-}
-?
 --FILE--
 ?php
 



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

[PHP-CVS] cvs: php-src /ext/pcre/tests preg_filter.phpt

2008-08-31 Thread Nuno Lopes

nlopess Sun Aug 31 15:28:52 2008 UTC

  Modified files:  
/php-src/ext/pcre/tests preg_filter.phpt 
  Log:
  MFB: remove extra skipif
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_filter.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/pcre/tests/preg_filter.phpt
diff -u php-src/ext/pcre/tests/preg_filter.phpt:1.1 
php-src/ext/pcre/tests/preg_filter.phpt:1.2
--- php-src/ext/pcre/tests/preg_filter.phpt:1.1 Sun Aug 24 12:34:02 2008
+++ php-src/ext/pcre/tests/preg_filter.phpt Sun Aug 31 15:28:52 2008
@@ -1,11 +1,5 @@
 --TEST--
 preg_filter()
---SKIPIF--
-?php
-if (@preg_match_all('/./u', , $matches) === false) {
-   die(skip no utf8 support in PCRE library);
-}
-?
 --FILE--
 ?php
 



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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) / README.RELEASE_PROCESS

2008-08-31 Thread Rasmus Lerdorf


Hannes Magnusson wrote:

On Sun, Aug 31, 2008 at 12:20, Lukas Kahwe Smith[EMAIL PROTECTED]  wrote:

next question .. who can do the FS level cp?


Derick and Rasmus


Along with andrei, andi, gwynne, gopal, ilia, sascha, scoates, wez and zeev.

I think we have it covered.  But yes, please email systems@ with 
requests like this.


-Rasmus

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

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

2008-08-31 Thread Jani Taskinen

Quite pointless entries, this thing was never in any release, who cares what 
happened during development of it? Think f.e. if all changes done for the 
namespace crap was added in the NEWS..


Short version: Please remove these pointless entries.

--Jani

Mikko Koppanen kirjoitti:

mkoppanen   Sun Aug 31 10:06:47 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src	NEWS 
  Log:

  Added news entries about changes in ext/fileinfo
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.295r2=1.2027.2.547.2.965.2.296diff_format=u

Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.295 
php-src/NEWS:1.2027.2.547.2.965.2.296
--- php-src/NEWS:1.2027.2.547.2.965.2.295   Fri Aug 29 14:59:19 2008
+++ php-src/NEWSSun Aug 31 10:06:46 2008
@@ -1,6 +1,10 @@
 PHPNEWS
 |||
 ?? ??? 200?, PHP 5.3.0 Alpha 2
+- Changed bundled libmagic to use PHP memory allocation routines. (Ilia)
+- Changed bundled libmagic to use pcre instead of ereg. (Derick,Scott,Mikko)
+- Updated mime_content_type to use fileinfo. (Derick)
+
 - Removed shebang line check from CGI sapi (it is checked by scanner). (Dmitry)
 
 - Changed session_start() to return false when session startup fails. (Jani)







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

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

2008-08-31 Thread Mikko Koppanen

On Sun, Aug 31, 2008 at 5:53 PM, Jani Taskinen [EMAIL PROTECTED] wrote:
 Quite pointless entries, this thing was never in any release, who cares what
 happened during development of it? Think f.e. if all changes done for the
 namespace crap was added in the NEWS..

 Short version: Please remove these pointless entries.

These changes happened after alpha1 and before upcoming alpha2. I
thought those changes were to be logged into NEWS. Removed the
entries, sorry for the noise!



-- 
Mikko Koppanen

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

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

2008-08-31 Thread Mikko Koppanen

mkoppanen   Sun Aug 31 17:05:13 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  Removed fileinfo related according to Jani's request
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.299r2=1.2027.2.547.2.965.2.300diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.299 
php-src/NEWS:1.2027.2.547.2.965.2.300
--- php-src/NEWS:1.2027.2.547.2.965.2.299   Sun Aug 31 15:04:21 2008
+++ php-src/NEWSSun Aug 31 17:05:12 2008
@@ -3,9 +3,6 @@
 ?? ??? 200?, PHP 5.3.0 Alpha 2
 - Removed special treatment of /tmp path for sessions in open_basedir
   context, which was introduced in 5.2.2, but was never documented. (Alexey)
-- Changed bundled libmagic to use PHP memory allocation routines. (Ilia)
-- Changed bundled libmagic to use pcre instead of ereg. (Derick, Scott, Mikko)
-- Updated mime_content_type to use fileinfo. (Derick)
 
 - Removed shebang line check from CGI sapi (it is checked by scanner). (Dmitry)
 



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

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

2008-08-31 Thread Pierre Joye

hi,

On Sun, Aug 31, 2008 at 6:53 PM, Jani Taskinen [EMAIL PROTECTED] wrote:
 Quite pointless entries, this thing was never in any release, who cares what
 happened during development of it? Think f.e. if all changes done for the
 namespace crap was added in the NEWS..

 Short version: Please remove these pointless entries.

That's not correct. There was a release (alpha1) and changes happened
between it and the next alpha/RC releases. Theses changes have to be
present in the NEWS file. It is the RM to merge them before the first
stable release (5.3.0-final).

I may be mistaken but it is what is described in the release process
doc and what other (Derick or Johannes) said as well.

Cheers,
-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) / README.RELEASE_PROCESS

2008-08-31 Thread Derick Rethans

On Sun, 31 Aug 2008, Pierre Joye wrote:

 On Sun, Aug 31, 2008 at 12:05 PM, Lukas Kahwe Smith [EMAIL PROTECTED] wrote:
 
  Sounds sensible. Anyways, I would appreciate it if someone who knows 
  would write a howto, so that RMs can verify that things are done 
  properly. I guess in the past Derick took care of a lot of these 
  moves via OS level file system magic. I do not know the details on 
  how this worked. If it was a copy or a move and if there was a cvs 
  rm afterwards or not.
 
 Hannes is right, it can't be a OS Level directory move but at least a
 copy. Doing a move will change the previous branches and that's not
 desired. The ideal solution would be:
 
 - Filesystem: cp -r php-src/ext/foo pecl/
 - cvs rm php-src/ext/foo

If you know this so well, why did you ignore it for all the extensions 
that you moved to PECL? From the NEWS file:

- Moved extensions to PECL (Pierre):
  . ext/dbase
  . ext/fbsql
  . ext/ming
  . ext/sybase (not maintained anymore, sybase_ct has to be used instead)

Those four all have no history anymore in pecl/extname

  . ext/ncurses

Wasn't even moved now, but three years ago by hartmut.

  . ext/fdf

Doesn't even exist in pecl/.

I was going to make a release today that still works for ming 0.3 (for 
5.2 and 5.3) but all the history was gone and I'm not going to spend 
hours to clean up after you. Please revert this mess for those four 
extensions that have no history in PECL, so that we can do it correctly 
- that is, resurrect all the files in HEAD and PHP_5_3 so that we can 
properly copy them to PECL.

regards,
Derick

-- 
HEAD before 5_3!: http://tinyurl.com/6d2esb
http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org

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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) / README.RELEASE_PROCESS

2008-08-31 Thread Pierre Joye

hi,

On Sun, Aug 31, 2008 at 7:24 PM, Derick Rethans [EMAIL PROTECTED] wrote:

 - Filesystem: cp -r php-src/ext/foo pecl/
 - cvs rm php-src/ext/foo

 If you know this so well, why did you ignore it for all the extensions
 that you moved to PECL? From the NEWS file:

 - Moved extensions to PECL (Pierre):
  . ext/dbase
  . ext/fbsql
  . ext/ming

See below.

  . ext/sybase (not maintained anymore, sybase_ct has to be used instead)

This will never be imported or copied.


  . ext/ncurses

 Wasn't even moved now, but three years ago by hartmut.

Wrong, it was cvs removed from HEAD only not from 5.x.

 I was going to make a release today that still works for ming 0.3 (for
 5.2 and 5.3) but all the history was gone and I'm not going to spend
 hours to clean up after you.

Frank will do it.

 Please revert this mess for those four
 extensions that have no history in PECL, so that we can do it correctly
 - that is, resurrect all the files in HEAD and PHP_5_3 so that we can
 properly copy them to PECL.

As I told you already, I have no time now to deal with that. The main
goal was to have them out for the first releases.

 It takes minutes to remove the pecl/extname directory and do the
copy. If you want it now, please do it.

Cheers,
-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

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

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

2008-08-31 Thread Jani Taskinen


Pierre Joye kirjoitti:

hi,

On Sun, Aug 31, 2008 at 6:53 PM, Jani Taskinen [EMAIL PROTECTED] wrote:

Quite pointless entries, this thing was never in any release, who cares what
happened during development of it? Think f.e. if all changes done for the
namespace crap was added in the NEWS..

Short version: Please remove these pointless entries.


That's not correct. There was a release (alpha1) and changes happened
between it and the next alpha/RC releases. Theses changes have to be
present in the NEWS file. It is the RM to merge them before the first
stable release (5.3.0-final).


I don't count alpha/beta/etc. as releases. Release is a stable release.
One that people actually download and use in production..

Also those entries didn't really give any useful information to PHP _users_ as 
the changes were pretty much internal things.


Please don't spam NEWS..:)

--Jani




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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/tests phar_get_supported_signatures_001.phpt phar_get_supported_signatures_001a.phpt phar_get_supported_signatures_002.phpt phar_get_supported_signatures_002a

2008-08-31 Thread Steph Fox

sfoxSun Aug 31 19:18:35 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar/tests phar_get_supported_signatures_001.phpt 
phar_get_supported_signatures_001a.phpt 
phar_get_supported_signatures_002.phpt 
phar_get_supported_signatures_002a.phpt 
phpinfo_004.phpt 
  Log:
  - Ensure that we're always checking for OpenSSL support, rather than just for 
ext/openssl being loaded
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_get_supported_signatures_001.phpt?r1=1.2.2.1r2=1.2.2.2diff_format=u
Index: php-src/ext/phar/tests/phar_get_supported_signatures_001.phpt
diff -u php-src/ext/phar/tests/phar_get_supported_signatures_001.phpt:1.2.2.1 
php-src/ext/phar/tests/phar_get_supported_signatures_001.phpt:1.2.2.2
--- php-src/ext/phar/tests/phar_get_supported_signatures_001.phpt:1.2.2.1   
Sun Jun  1 04:21:26 2008
+++ php-src/ext/phar/tests/phar_get_supported_signatures_001.phpt   Sun Aug 
31 19:18:35 2008
@@ -1,9 +1,12 @@
 --TEST--
 Phar::getSupportedSignatures()
 --SKIPIF--
-?php if (!extension_loaded(phar)) die(skip); ?
-?php if (extension_loaded(hash)) die(skip extension hash conflicts); ?
-?php if (extension_loaded(openssl)) die(skip extension openssl loaded); ?
+?php
+if (!extension_loaded(phar)) die(skip);
+if (extension_loaded(hash)) die(skip extension hash conflicts);
+$arr = Phar::getSupportedSignatures();
+if (in_array(OpenSSL, $arr)) die(skip openssl support enabled);
+?
 --INI--
 phar.require_hash=0
 phar.readonly=0
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_get_supported_signatures_001a.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/phar/tests/phar_get_supported_signatures_001a.phpt
diff -u php-src/ext/phar/tests/phar_get_supported_signatures_001a.phpt:1.1.2.1 
php-src/ext/phar/tests/phar_get_supported_signatures_001a.phpt:1.1.2.2
--- php-src/ext/phar/tests/phar_get_supported_signatures_001a.phpt:1.1.2.1  
Tue Jun 10 19:23:09 2008
+++ php-src/ext/phar/tests/phar_get_supported_signatures_001a.phpt  Sun Aug 
31 19:18:35 2008
@@ -1,9 +1,12 @@
 --TEST--
 Phar::getSupportedSignatures()
 --SKIPIF--
-?php if (!extension_loaded(phar)) die(skip); ?
-?php if (extension_loaded(hash)) die(skip extension hash conflicts); ?
-?php if (!extension_loaded(openssl)) die(skip extension openssl loaded); 
?
+?php
+if (!extension_loaded(phar)) die(skip);
+if (extension_loaded(hash)) die(skip extension hash conflicts);
+$arr = Phar::getSupportedSignatures();
+if (!in_array(OpenSSL, $arr)) die(skip openssl support required);
+?
 --INI--
 phar.require_hash=0
 phar.readonly=0
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_get_supported_signatures_002.phpt?r1=1.2.2.2r2=1.2.2.3diff_format=u
Index: php-src/ext/phar/tests/phar_get_supported_signatures_002.phpt
diff -u php-src/ext/phar/tests/phar_get_supported_signatures_002.phpt:1.2.2.2 
php-src/ext/phar/tests/phar_get_supported_signatures_002.phpt:1.2.2.3
--- php-src/ext/phar/tests/phar_get_supported_signatures_002.phpt:1.2.2.2   
Mon Jun 23 19:18:01 2008
+++ php-src/ext/phar/tests/phar_get_supported_signatures_002.phpt   Sun Aug 
31 19:18:35 2008
@@ -4,9 +4,8 @@
 ?php
 if (!extension_loaded(phar)) die(skip);
 if (!extension_loaded(hash)) die(skip extension hash required);
-if (extension_loaded(openssl)) die(skip extension openssl loaded);
 $arr = Phar::getSupportedSignatures();
-if (in_array(OpenSSL, $arr)) die (skip native openssl support enabled);
+if (in_array(OpenSSL, $arr)) die (skip openssl support enabled);
 ?
 --INI--
 phar.require_hash=0
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_get_supported_signatures_002a.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/phar/tests/phar_get_supported_signatures_002a.phpt
diff -u php-src/ext/phar/tests/phar_get_supported_signatures_002a.phpt:1.1.2.2 
php-src/ext/phar/tests/phar_get_supported_signatures_002a.phpt:1.1.2.3
--- php-src/ext/phar/tests/phar_get_supported_signatures_002a.phpt:1.1.2.2  
Mon Jun 23 17:48:23 2008
+++ php-src/ext/phar/tests/phar_get_supported_signatures_002a.phpt  Sun Aug 
31 19:18:35 2008
@@ -1,9 +1,12 @@
 --TEST--
 Phar::getSupportedSignatures()
 --SKIPIF--
-?php if (!extension_loaded(phar)) die(skip); ?
-?php if (!extension_loaded(hash)) die(skip extension hash required); ?
-?php if (!extension_loaded(openssl)) die(skip extension openssl 
required); ?
+?php
+if (!extension_loaded(phar)) die(skip);
+if (!extension_loaded(hash)) die(skip extension hash required);
+$arr = Phar::getSupportedSignatures();
+if (!in_array(OpenSSL, $arr)) die(skip openssl support required);
+?
 --INI--
 phar.require_hash=0
 phar.readonly=0
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phpinfo_004.phpt?r1=1.3.2.3r2=1.3.2.4diff_format=u
Index: php-src/ext/phar/tests/phpinfo_004.phpt
diff -u php-src/ext/phar/tests/phpinfo_004.phpt:1.3.2.3

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar_object.c

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 19:38:40 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar_object.c 
  Log:
  remove unnecessary ;
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.44r2=1.266.2.45diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.44 
php-src/ext/phar/phar_object.c:1.266.2.45
--- php-src/ext/phar/phar_object.c:1.266.2.44   Sun Aug 31 06:58:04 2008
+++ php-src/ext/phar/phar_object.c  Sun Aug 31 19:38:40 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar_object.c,v 1.266.2.44 2008/08/31 06:58:04 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.45 2008/08/31 19:38:40 cellog Exp $ */
 
 #include phar_internal.h
 #include func_interceptors.h
@@ -4798,36 +4798,36 @@
ZEND_ARG_INFO(0, flags)
ZEND_ARG_INFO(0, alias)
ZEND_ARG_INFO(0, fileformat)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_createDS, 0, 0, 0)
ZEND_ARG_INFO(0, index)
ZEND_ARG_INFO(0, webindex)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_loadPhar, 0, 0, 1)
ZEND_ARG_INFO(0, filename)
ZEND_ARG_INFO(0, alias)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_mapPhar, 0, 0, 0)
ZEND_ARG_INFO(0, alias)
ZEND_ARG_INFO(0, offset)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_mount, 0, 0, 2)
ZEND_ARG_INFO(0, inphar)
ZEND_ARG_INFO(0, externalfile)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_mungServer, 0, 0, 1)
ZEND_ARG_INFO(0, munglist)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_webPhar, 0, 0, 0)
@@ -4836,17 +4836,17 @@
ZEND_ARG_INFO(0, f404)
ZEND_ARG_INFO(0, mimetypes)
ZEND_ARG_INFO(0, rewrites)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_running, 0, 0, 1)
ZEND_ARG_INFO(0, retphar)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_ua, 0, 0, 1)
ZEND_ARG_INFO(0, archive)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 #if HAVE_SPL
 
@@ -4854,114 +4854,114 @@
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_build, 0, 0, 1)
ZEND_ARG_INFO(0, iterator)
ZEND_ARG_INFO(0, base_directory)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_conv, 0, 0, 0)
ZEND_ARG_INFO(0, format)
ZEND_ARG_INFO(0, compression_type)
ZEND_ARG_INFO(0, file_ext)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_comps, 0, 0, 1)
ZEND_ARG_INFO(0, compression_type)
ZEND_ARG_INFO(0, file_ext)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_decomp, 0, 0, 0)
ZEND_ARG_INFO(0, file_ext)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_comp, 0, 0, 1)
ZEND_ARG_INFO(0, compression_type)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_compo, 0, 0, 0)
ZEND_ARG_INFO(0, compression_type)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_copy, 0, 0, 2)
ZEND_ARG_INFO(0, newfile)
ZEND_ARG_INFO(0, oldfile)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_delete, 0, 0, 1)
ZEND_ARG_INFO(0, entry)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_fromdir, 0, 0, 1)
ZEND_ARG_INFO(0, base_dir)
ZEND_ARG_INFO(0, regex)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_offsetExists, 0, 0, 1)
ZEND_ARG_INFO(0, entry)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_offsetSet, 0, 0, 2)
ZEND_ARG_INFO(0, entry)
ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_setAlias, 0, 0, 1)
ZEND_ARG_INFO(0, alias)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_setMetadata, 0, 0, 1)
ZEND_ARG_INFO(0, metadata)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_setSigAlgo, 0, 0, 1)
ZEND_ARG_INFO(0, algorithm)
ZEND_ARG_INFO(0, privatekey)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_setStub, 0, 0, 1)
ZEND_ARG_INFO(0, newstub)
ZEND_ARG_INFO(0, maxlen)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_emptydir, 0, 0, 0)
ZEND_ARG_INFO(0, dirname)
-ZEND_END_ARG_INFO();

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar util.c

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 19:42:16 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar.phar util.c 
  Log:
  remove unnecessary double variable declarations
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.43r2=1.7.2.44diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.43 php-src/ext/phar/phar.phar:1.7.2.44
--- php-src/ext/phar/phar.phar:1.7.2.43 Sun Aug 31 07:15:25 2008
+++ php-src/ext/phar/phar.phar  Sun Aug 31 19:42:16 2008
@@ -1171,8 +1171,8 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?
-6-+6+ 
¶Â²Øä±÷¡JÉþs±æêÔ*,8W?°!~ýë¸YåBós.coîd!Â¨`w¡óLæÈ¹BÀí.å[aäÙs\í¹
 gß×
 óbnáN@@ -1229,4 +1229,4 @@
 ùUNøÖ[EMAIL PROTECTED][EMAIL PROTECTED] 
¬ËaYº[Ãâ¬mòvOëý]¸¹)×soSjßZæ/]ûôÞv¿Ç½T%æ:ýÚ)cÚv]¶Ebô«ÐÓ*Çê=KÕO)ò)«Ë-Ô]µLí·¡7µ¾Í¨.î
zÿ.jß?8Tù®,:«Äa·éï¤Á»hg
 ±µÉH¨#[T5$ÜßÞ¶LÐâ¯z4Ê¼è)ÿLuÒñxï;ñ©Æø³;TMe,¯¿{}4b,[EMAIL PROTECTED]
íÑèµïtúÎþ®øÚ÷Eí»ú¡ÃÏàÇGxîÓá§¾óãæ]¢Õ~fI|øðP 
j7l1ØÛPHüéÅiGH¬5´¯$ß/rªýëÐ~Ñúgìªz²¢ÎÛ¦puùäûù;â9³ä¯;[EMAIL 
PROTECTED]
-Pàø3C°\ No newline at end of file
+Pàø3C°\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.31r2=1.55.2.32diff_format=u
Index: php-src/ext/phar/util.c
diff -u php-src/ext/phar/util.c:1.55.2.31 php-src/ext/phar/util.c:1.55.2.32
--- php-src/ext/phar/util.c:1.55.2.31   Sun Aug 31 07:15:25 2008
+++ php-src/ext/phar/util.c Sun Aug 31 19:42:16 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: util.c,v 1.55.2.31 2008/08/31 07:15:25 cellog Exp $ */
+/* $Id: util.c,v 1.55.2.32 2008/08/31 19:42:16 cellog Exp $ */
 
 #include phar_internal.h
 
@@ -254,7 +254,7 @@
 {
 #if PHP_VERSION_ID = 50300
char *path, *fname, *arch, *entry, *ret, *test;
-   int arch_len, entry_len, fname_len;
+   int arch_len, entry_len, fname_len, ret_len;
phar_archive_data *phar;
 
if (pphar) {
@@ -322,9 +322,6 @@
efree(path);
 
if (ret  strlen(ret)  8  !strncmp(ret, phar://, 7)) {
-   char *arch;
-   int arch_len, ret_len;
-
ret_len = strlen(ret);
/* found phar:// */
 



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar util.c

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 19:46:36 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar.phar util.c 
  Log:
  use '\0' instead of 0 for chars, removes intel warning
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.44r2=1.7.2.45diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.44 php-src/ext/phar/phar.phar:1.7.2.45
--- php-src/ext/phar/phar.phar:1.7.2.44 Sun Aug 31 19:42:16 2008
+++ php-src/ext/phar/phar.phar  Sun Aug 31 19:46:35 2008
@@ -1171,8 +1171,8 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?
-6-+6+ 
¶Â²Øä±÷¡JÉþs±æêÔ*,8W?°!~ýë¸YåBós.coîd!Â¨`w¡óLæÈ¹BÀí.å[aäÙs\í¹
 gß×
 óbnáN@@ -1229,4 +1229,6 @@
 ùUNøÖ[EMAIL PROTECTED][EMAIL PROTECTED] 
¬ËaYº[Ãâ¬mòvOëý]¸¹)×soSjßZæ/]ûôÞv¿Ç½T%æ:ýÚ)cÚv]¶Ebô«ÐÓ*Çê=KÕO)ò)«Ë-Ô]µLí·¡7µ¾Í¨.î
zÿ.jß?8Tù®,:«Äa·éï¤Á»hg
 ±µÉH¨#[T5$ÜßÞ¶LÐâ¯z4Ê¼è)ÿLuÒñxï;ñ©Æø³;TMe,¯¿{}4b,[EMAIL PROTECTED]
íÑèµïtúÎþ®øÚ÷Eí»ú¡ÃÏàÇGxîÓá§¾óãæ]¢Õ~fI|øðP 
j7l1ØÛPHüéÅiGH¬5´¯$ß/rªýëÐ~Ñúgìªz²¢ÎÛ¦puùäûù;â9³ä¯;[EMAIL 
PROTECTED]
-Pàø3C°\ No newline at end of file
+Pàø3C°+
+;Z\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.32r2=1.55.2.33diff_format=u
Index: php-src/ext/phar/util.c
diff -u php-src/ext/phar/util.c:1.55.2.32 php-src/ext/phar/util.c:1.55.2.33
--- php-src/ext/phar/util.c:1.55.2.32   Sun Aug 31 19:42:16 2008
+++ php-src/ext/phar/util.c Sun Aug 31 19:46:35 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: util.c,v 1.55.2.32 2008/08/31 19:42:16 cellog Exp $ */
+/* $Id: util.c,v 1.55.2.33 2008/08/31 19:46:35 cellog Exp $ */
 
 #include phar_internal.h
 
@@ -683,7 +683,7 @@
if (entry-link) {
efree(entry-link);
entry-link = NULL;
-   entry-tar_type = (entry-is_tar ? TAR_FILE : 0);
+   entry-tar_type = (entry-is_tar ? TAR_FILE : '\0');
}
 
if (for_write) {
@@ -874,7 +874,7 @@
if (dest-link) {
efree(dest-link);
dest-link = NULL;
-   dest-tar_type = (dest-is_tar ? TAR_FILE : 0);
+   dest-tar_type = (dest-is_tar ? TAR_FILE : '\0');
}
 
dest-fp_type = PHAR_MOD;
@@ -1079,7 +1079,7 @@
if (entry-link) {
efree(entry-link);
entry-link = NULL;
-   entry-tar_type = (entry-is_tar ? TAR_FILE : 0);
+   entry-tar_type = (entry-is_tar ? TAR_FILE : '\0');
}
 
entry-fp = php_stream_fopen_tmpfile();
@@ -1136,7 +1136,7 @@
if (entry-link) {
efree(entry-link);
entry-link = NULL;
-   entry-tar_type = (entry-is_tar ? TAR_FILE : 0);
+   entry-tar_type = (entry-is_tar ? TAR_FILE : '\0');
}
 
entry-offset = 0;



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar tar.c

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 19:47:31 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   tar.c 
  Log:
  hadn't saved tar.c, use '\0' instead of 0 for char values, removes warning in 
intel compiler
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tar.c?r1=1.55.2.19r2=1.55.2.20diff_format=u
Index: php-src/ext/phar/tar.c
diff -u php-src/ext/phar/tar.c:1.55.2.19 php-src/ext/phar/tar.c:1.55.2.20
--- php-src/ext/phar/tar.c:1.55.2.19Sun Aug 31 06:51:49 2008
+++ php-src/ext/phar/tar.c  Sun Aug 31 19:47:31 2008
@@ -290,7 +290,7 @@
}
/* signature checked out, let's ensure this is the last 
file in the phar */
size = ((size+511)~511) + 512;
-   if (((hdr-typeflag == 0) || (hdr-typeflag == 
TAR_FILE))  size  0) {
+   if (((hdr-typeflag == '\0') || (hdr-typeflag == 
TAR_FILE))  size  0) {
/* this is not good enough - seek succeeds even 
on truncated tars */
php_stream_seek(fp, size, SEEK_CUR);
if ((uint)php_stream_tell(fp)  totalsize) {
@@ -471,7 +471,7 @@
 
size = (size+511)~511;
 
-   if (((hdr-typeflag == 0) || (hdr-typeflag == TAR_FILE))  
size  0) {
+   if (((hdr-typeflag == '\0') || (hdr-typeflag == TAR_FILE))  
size  0) {
/* this is not good enough - seek succeeds even on 
truncated tars */
php_stream_seek(fp, size, SEEK_CUR);
if ((uint)php_stream_tell(fp)  totalsize) {



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 19:51:50 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   config.w32 
  Log:
  temp bandaid on broken build system, revert when snapshot build is fixed in 
win32
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.27.2.5r2=1.27.2.6diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.27.2.5 
php-src/ext/phar/config.w32:1.27.2.6
--- php-src/ext/phar/config.w32:1.27.2.5Mon Aug 18 14:58:03 2008
+++ php-src/ext/phar/config.w32 Sun Aug 31 19:51:49 2008
@@ -1,7 +1,8 @@
-// $Id: config.w32,v 1.27.2.5 2008/08/18 14:58:03 cellog Exp $
+// $Id: config.w32,v 1.27.2.6 2008/08/31 19:51:49 cellog Exp $
 // vim:ft=javascript
 
-ARG_ENABLE(phar, disable phar support, yes);
+// this next line should be changed back to yes after fixes are committed to 
the snapshot build process
+ARG_ENABLE(phar, disable phar support, false);
 ARG_ENABLE(phar-native-ssl, enable phar with native OpenSSL support, no);
 
 if (PHP_PHAR_NATIVE_SSL != no) {



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar tar.c

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 20:24:04 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar.phar tar.c 
  Log:
  use TAR_FILE instead of '0' and '\0' instead of 0
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.45r2=1.7.2.46diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.45 php-src/ext/phar/phar.phar:1.7.2.46
--- php-src/ext/phar/phar.phar:1.7.2.45 Sun Aug 31 19:46:35 2008
+++ php-src/ext/phar/phar.phar  Sun Aug 31 20:24:04 2008
@@ -1171,8 +1171,8 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?
-6-+6+ 
¶Â²Øä±÷¡JÉþs±æêÔ*,8W?°!~ýë¸YåBós.coîd!Â¨`w¡óLæÈ¹BÀí.å[aäÙs\í¹
 gß×
 óbnáN@@ -1229,6 +1229,4 @@
 ùUNøÖ[EMAIL PROTECTED][EMAIL PROTECTED] 
¬ËaYº[Ãâ¬mòvOëý]¸¹)×soSjßZæ/]ûôÞv¿Ç½T%æ:ýÚ)cÚv]¶Ebô«ÐÓ*Çê=KÕO)ò)«Ë-Ô]µLí·¡7µ¾Í¨.î
zÿ.jß?8Tù®,:«Äa·éï¤Á»hg
 ±µÉH¨#[T5$ÜßÞ¶LÐâ¯z4Ê¼è)ÿLuÒñxï;ñ©Æø³;TMe,¯¿{}4b,[EMAIL PROTECTED]
íÑèµïtúÎþ®øÚ÷Eí»ú¡ÃÏàÇGxîÓá§¾óãæ]¢Õ~fI|øðP 
j7l1ØÛPHüéÅiGH¬5´¯$ß/rªýëÐ~Ñúgìªz²¢ÎÛ¦puùäûù;â9³ä¯;[EMAIL 
PROTECTED]
-Pàø3C°-
-;Z\ No newline at end of file
+Pàø3C°\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tar.c?r1=1.55.2.20r2=1.55.2.21diff_format=u
Index: php-src/ext/phar/tar.c
diff -u php-src/ext/phar/tar.c:1.55.2.20 php-src/ext/phar/tar.c:1.55.2.21
--- php-src/ext/phar/tar.c:1.55.2.20Sun Aug 31 19:47:31 2008
+++ php-src/ext/phar/tar.c  Sun Aug 31 20:24:04 2008
@@ -369,7 +369,7 @@
return FAILURE;
}
 
-   entry.tar_type = ((old  (hdr-typeflag == 0)) ? '0' : 
hdr-typeflag);
+   entry.tar_type = ((old  (hdr-typeflag == '\0')) ? TAR_FILE : 
hdr-typeflag);
entry.offset = entry.offset_abs = pos; /* header_offset unused 
in tar */
entry.fp_type = PHAR_FP;
entry.flags = phar_tar_number(hdr-mode, sizeof(hdr-mode))  
PHAR_ENT_PERM_MASK;



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar php_phar.h

2008-08-31 Thread Greg Beaver

cellog  Sun Aug 31 20:50:09 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar.phar php_phar.h 
  Log:
  move to 2.0.0-dev
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.46r2=1.7.2.47diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.46 php-src/ext/phar/phar.phar:1.7.2.47
--- php-src/ext/phar/phar.phar:1.7.2.46 Sun Aug 31 20:24:04 2008
+++ php-src/ext/phar/phar.phar  Sun Aug 31 20:50:09 2008
@@ -1171,8 +1171,8 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?
-6-+6+ 
¶Â²Øä±÷¡JÉþs±æêÔ*,8W?°!~ýë¸YåBós.coîd!Â¨`w¡óLæÈ¹BÀí.å[aäÙs\í¹
 gß×
 óbnáN@@ -1229,4 +1229,4 @@
 ùUNøÖ[EMAIL PROTECTED][EMAIL PROTECTED] 
¬ËaYº[Ãâ¬mòvOëý]¸¹)×soSjßZæ/]ûôÞv¿Ç½T%æ:ýÚ)cÚv]¶Ebô«ÐÓ*Çê=KÕO)ò)«Ë-Ô]µLí·¡7µ¾Í¨.î
zÿ.jß?8Tù®,:«Äa·éï¤Á»hg
 ±µÉH¨#[T5$ÜßÞ¶LÐâ¯z4Ê¼è)ÿLuÒñxï;ñ©Æø³;TMe,¯¿{}4b,[EMAIL PROTECTED]
íÑèµïtúÎþ®øÚ÷Eí»ú¡ÃÏàÇGxîÓá§¾óãæ]¢Õ~fI|øðP 
j7l1ØÛPHüéÅiGH¬5´¯$ß/rªýëÐ~Ñúgìªz²¢ÎÛ¦puùäûù;â9³ä¯;[EMAIL 
PROTECTED]
-Pàø3C°\ No newline at end of file
+Pàø3C°\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/php_phar.h?r1=1.16.2.1r2=1.16.2.2diff_format=u
Index: php-src/ext/phar/php_phar.h
diff -u php-src/ext/phar/php_phar.h:1.16.2.1 
php-src/ext/phar/php_phar.h:1.16.2.2
--- php-src/ext/phar/php_phar.h:1.16.2.1Fri Aug  1 13:48:44 2008
+++ php-src/ext/phar/php_phar.h Sun Aug 31 20:50:09 2008
@@ -17,12 +17,12 @@
   +--+
 */
 
-/* $Id: php_phar.h,v 1.16.2.1 2008/08/01 13:48:44 sfox Exp $ */
+/* $Id: php_phar.h,v 1.16.2.2 2008/08/31 20:50:09 cellog Exp $ */
 
 #ifndef PHP_PHAR_H
 #define PHP_PHAR_H
 
-#define PHP_PHAR_VERSION 2.0.0b2-dev
+#define PHP_PHAR_VERSION 2.0.0-dev
 
 #include ext/standard/basic_functions.h
 extern zend_module_entry phar_module_entry;



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

[PHP-CVS] cvs: php-src /ext/phar php_phar.h

2008-08-31 Thread Steph Fox

sfoxSun Aug 31 20:55:52 2008 UTC

  Modified files:  
/php-src/ext/phar   php_phar.h 
  Log:
  - Note to self: don't try to second-guess Greg
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/php_phar.h?r1=1.18r2=1.19diff_format=u
Index: php-src/ext/phar/php_phar.h
diff -u php-src/ext/phar/php_phar.h:1.18 php-src/ext/phar/php_phar.h:1.19
--- php-src/ext/phar/php_phar.h:1.18Sun Aug 31 20:54:27 2008
+++ php-src/ext/phar/php_phar.h Sun Aug 31 20:55:52 2008
@@ -17,12 +17,12 @@
   +--+
 */
 
-/* $Id: php_phar.h,v 1.18 2008/08/31 20:54:27 sfox Exp $ */
+/* $Id: php_phar.h,v 1.19 2008/08/31 20:55:52 sfox Exp $ */
 
 #ifndef PHP_PHAR_H
 #define PHP_PHAR_H
 
-#define PHP_PHAR_VERSION 2.0.0RC2-dev
+#define PHP_PHAR_VERSION 2.0.0-dev
 
 #include ext/standard/basic_functions.h
 extern zend_module_entry phar_module_entry;



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar package.php package.xml phar.c

2008-08-31 Thread Steph Fox

sfoxSun Aug 31 21:01:12 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   package.php package.xml phar.c 
  Log:
  - cs, update package files following RC1 (just to keep it all in sync)
  http://cvs.php.net/viewvc.cgi/php-src/ext/phar/package.php?r1=1.39.2.1r2=1.39.2.2diff_format=u
Index: php-src/ext/phar/package.php
diff -u php-src/ext/phar/package.php:1.39.2.1 
php-src/ext/phar/package.php:1.39.2.2
--- php-src/ext/phar/package.php:1.39.2.1   Fri Aug  1 06:16:35 2008
+++ php-src/ext/phar/package.phpSun Aug 31 21:01:12 2008
@@ -8,8 +8,12 @@
  * phar.extract_list and Phar::getExtractList() are removed
 
 Major feature functionality release
+ * phar.cache_list allows web-based phar applications to run at equal or 
faster than
+   their on-disk equivalent [Greg]
  * new default stub allows running of phar-based phars without phar extension 
[Greg/Steph]
  * add support for tar-based and zip-based phar archives [Greg]
+ * add support for OpenSSL-based true signatures [Greg]
+ * add support for signatures to tar-based phar archives [Greg]
  * add Phar::isFileFormat() [Greg]
  * add Phar::convertToExecutable(), Phar::convertToData() [Greg]
  * add Phar::compress() [Greg]
@@ -41,6 +45,10 @@
 
 Changes since 2.0.0a2: many bugfixes, removal of phar.extract_list, 
compression API refactored,
  conversion API refactored
+Changes since 2.0.0b1: addition of phar.cache_list, many performance 
improvements and bugfixes
+ implement OpenSSL asynchronous true package signing
+ add support for package signing to tar-based archives
+ require PHP 5.2.1+
 ';
 
 if (!class_exists(Phar)  !extension_loaded(Phar)) {
@@ -81,7 +89,7 @@
 $package = PEAR_PackageFileManager2::importOptions(dirname(__FILE__) . 
'/package.xml', $options);
 
 $package-clearDeps();
-$package-setPhpDep('5.2.0');
+$package-setPhpDep('5.2.1');
 $package-setPearInstallerDep('1.4.3');
 $package-addPackageDepWithChannel('optional', 'bz2', 'pecl.php.net', false, 
false, false, false, 'bz2');
 // all this false business sets the providesextension tag that allows us to 
have hash built
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/package.xml?r1=1.56r2=1.56.2.1diff_format=u
Index: php-src/ext/phar/package.xml
diff -u php-src/ext/phar/package.xml:1.56 php-src/ext/phar/package.xml:1.56.2.1
--- php-src/ext/phar/package.xml:1.56   Mon May 12 20:43:02 2008
+++ php-src/ext/phar/package.xmlSun Aug 31 21:01:12 2008
@@ -1,5 +1,5 @@
 ?xml version=1.0 encoding=UTF-8?
-package packagerversion=1.7.1 version=2.0 
xmlns=http://pear.php.net/dtd/package-2.0; 
xmlns:tasks=http://pear.php.net/dtd/tasks-1.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://pear.php.net/dtd/tasks-1.0 
http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 
http://pear.php.net/dtd/package-2.0.xsd;
+package packagerversion=1.7.2 version=2.0 
xmlns=http://pear.php.net/dtd/package-2.0; 
xmlns:tasks=http://pear.php.net/dtd/tasks-1.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://pear.php.net/dtd/tasks-1.0 
http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 
http://pear.php.net/dtd/package-2.0.xsd;
  namephar/name
  channelpecl.php.net/channel
  summaryallows running of complete applications out of .phar files (like 
Java .jar files)/summary
@@ -42,10 +42,10 @@
   email[EMAIL PROTECTED]/email
   activeyes/active
  /developer
- date2008-05-12/date
- time15:42:58/time
+ date2008-08-31/date
+ time15:34:02/time
  version
-  release2.0.0b1/release
+  release2.0.0RC1/release
   api1.1.1/api
  /version
  stability
@@ -62,8 +62,12 @@
  * phar.extract_list and Phar::getExtractList() are removed
 
 Major feature functionality release
+ * phar.cache_list allows web-based phar applications to run at equal or 
faster than
+   their on-disk equivalent [Greg]
  * new default stub allows running of phar-based phars without phar extension 
[Greg/Steph]
  * add support for tar-based and zip-based phar archives [Greg]
+ * add support for OpenSSL-based true signatures [Greg]
+ * add support for signatures to tar-based phar archives [Greg]
  * add Phar::isFileFormat() [Greg]
  * add Phar::convertToExecutable(), Phar::convertToData() [Greg]
  * add Phar::compress() [Greg]
@@ -95,6 +99,10 @@
 
 Changes since 2.0.0a2: many bugfixes, removal of phar.extract_list, 
compression API refactored,
  conversion API refactored
+Changes since 2.0.0b1: addition of phar.cache_list, many performance 
improvements and bugfixes
+ implement OpenSSL asynchronous true package signing
+ add support for package signing to tar-based archives
+ require PHP 5.2.1+
 
  /notes
  contents
@@ -109,7 +117,84 @@
 file name=pharcommand.inc role=src /
/dir !-- /phar --
dir name=tests
+dir name=cache_list
+ dir name=files
+  file name=frontcontroller.phar role=test /
+  file name=frontcontroller.phar.inc role=test /
+  file name=frontcontroller2.phar role=test

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar_object.c

2008-08-31 Thread Steph Fox

sfoxSun Aug 31 21:02:56 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/phar   phar_object.c 
  Log:
  - unnecessary ;
  We are now 100% synched - let's keep it that way!
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.45r2=1.266.2.46diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.45 
php-src/ext/phar/phar_object.c:1.266.2.46
--- php-src/ext/phar/phar_object.c:1.266.2.45   Sun Aug 31 19:38:40 2008
+++ php-src/ext/phar/phar_object.c  Sun Aug 31 21:02:55 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar_object.c,v 1.266.2.45 2008/08/31 19:38:40 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.46 2008/08/31 21:02:55 sfox Exp $ */
 
 #include phar_internal.h
 #include func_interceptors.h
@@ -5033,12 +5033,12 @@
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_entry___construct, 0, 0, 1)
ZEND_ARG_INFO(0, filename)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_entry_chmod, 0, 0, 1)
ZEND_ARG_INFO(0, perms)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
 
 zend_function_entry php_entry_methods[] = {
PHP_ME(PharFileInfo, __construct,arginfo_entry___construct,  
ZEND_ACC_PUBLIC)



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

[PHP-CVS] cvs: php-src /ext/phar/tests/cache_list/files blog.phar blog.phar.inc config.xml extracted.inc

2008-08-31 Thread Steph Fox

sfoxSun Aug 31 21:09:10 2008 UTC

  Modified files:  
/php-src/ext/phar/tests/cache_list/filesblog.phar blog.phar.inc 
config.xml extracted.inc 
  Log:
  - Missed the files we don't use yet
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/blog.phar?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/phar/tests/cache_list/files/blog.phar
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/blog.phar.inc?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/phar/tests/cache_list/files/blog.phar.inc
diff -u /dev/null php-src/ext/phar/tests/cache_list/files/blog.phar.inc:1.2
--- /dev/null   Sun Aug 31 21:09:10 2008
+++ php-src/ext/phar/tests/cache_list/files/blog.phar.inc   Sun Aug 31 
21:09:10 2008
@@ -0,0 +1,20 @@
+?php
+
+$fname = dirname(__FILE__) . '/blog.phar';
[EMAIL PROTECTED]($fname);
+
+$phar = new Phar($fname);
+$phar-setStub('?php if(file_exists(dirname(__FILE__) . /files/config.xml)) 
{
+Phar::mount(config.xml, dirname(__FILE__) . /files/config.xml);
+}
+Phar::webPhar(blog, index.php);
+__HALT_COMPILER(); ?');
+$phar['index.php'] = '?php if (!file_exists(config.xml)) {
+   include install.php;
+   exit;
+}
+var_dump(file_get_contents(config.xml));
+?';
+$phar['install.php'] = '?php echo install\n; ?';
+
+?
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/config.xml?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/phar/tests/cache_list/files/config.xml
diff -u /dev/null php-src/ext/phar/tests/cache_list/files/config.xml:1.2
--- /dev/null   Sun Aug 31 21:09:10 2008
+++ php-src/ext/phar/tests/cache_list/files/config.xml  Sun Aug 31 21:09:10 2008
@@ -0,0 +1,9 @@
+xml version=1.0 encoding=UTF-8
+config
+ database
+  hostlocalhost/name
+  usersquirrel/user
+  passnuts/pass
+  dbhoard/db
+ /database
+/config
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/extracted.inc?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/phar/tests/cache_list/files/extracted.inc
diff -u /dev/null php-src/ext/phar/tests/cache_list/files/extracted.inc:1.2
--- /dev/null   Sun Aug 31 21:09:10 2008
+++ php-src/ext/phar/tests/cache_list/files/extracted.inc   Sun Aug 31 
21:09:10 2008
@@ -0,0 +1 @@
+?php var_dump(__FILE__); ?



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

54 matches

Mail list logo