[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun May 18 01:31:50 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3049r2=1.3050diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3049 php-src/ChangeLog:1.3050 --- php-src/ChangeLog:1.3049Sat May 17 01:31:41 2008 +++ php-src/ChangeLog Sun May 18 01:31:49 2008 @@ -1,3 +1,219 @@ +2008-05-17 David Soria Parra [EMAIL PROTECTED] + +* (PHP_5_2) + ext/mcrypt/tests/mcrypt_cbc.phpt + ext/mcrypt/tests/mcrypt_cbc.phpt + ext/mcrypt/tests/mcrypt_cbf.phpt + ext/mcrypt/tests/mcrypt_cbf.phpt + ext/mcrypt/tests/mcrypt_create_iv.phpt + ext/mcrypt/tests/mcrypt_create_iv.phpt + ext/mcrypt/tests/mcrypt_create_iv.phpt~ + ext/mcrypt/tests/mcrypt_decrypt.phpt + ext/mcrypt/tests/mcrypt_ecb.phpt + ext/mcrypt/tests/mcrypt_enc_get_algorithms_name.phpt + ext/mcrypt/tests/mcrypt_enc_get_block_size.phpt + ext/mcrypt/tests/mcrypt_enc_get_iv_size.phpt + ext/mcrypt/tests/mcrypt_enc_get_key_size.phpt + ext/mcrypt/tests/mcrypt_enc_get_mode_name.phpt + ext/mcrypt/tests/mcrypt_enc_get_supported_key_sizes.phpt + ext/mcrypt/tests/mcrypt_enc_is_block_algorithm.phpt + ext/mcrypt/tests/mcrypt_enc_is_block_algorithm_mode.phpt + ext/mcrypt/tests/mcrypt_enc_is_block_mode.phpt + ext/mcrypt/tests/mcrypt_enc_self_test.phpt + ext/mcrypt/tests/mcrypt_get_block_size.phpt + ext/mcrypt/tests/mcrypt_get_cipher_name.phpt + ext/mcrypt/tests/mcrypt_get_iv_size.phpt + ext/mcrypt/tests/mcrypt_get_key_size.phpt + ext/mcrypt/tests/mcrypt_list_algorithms.phpt + ext/mcrypt/tests/mcrypt_list_modes.phpt + ext/mcrypt/tests/mcrypt_module_get_algo_block_size.phpt + ext/mcrypt/tests/mcrypt_module_get_algo_key_size.phpt + ext/mcrypt/tests/mcrypt_module_get_supported_key_sizes.phpt + ext/mcrypt/tests/mcrypt_module_is_block_algorithm.phpt + ext/mcrypt/tests/mcrypt_module_is_block_algorithm_mode.phpt + ext/mcrypt/tests/mcrypt_module_is_block_mode.phpt + ext/mcrypt/tests/mcrypt_module_open.phpt + ext/mcrypt/tests/mcrypt_module_self_test.phpt + ext/mcrypt/tests/mcrypt_ofb.phpt: + MFH: Tests from Munich PHP Testfest 2008 + +* ext/mcrypt/tests/mcrypt_create_iv.phpt~ + ext/mcrypt/tests/mcrypt_create_iv.phpt~ + ext/mcrypt/tests/mcrypt_create_iv.phpt~ + ext/mcrypt/tests/mcrypt_decrypt.phpt + ext/mcrypt/tests/mcrypt_ecb.phpt + ext/mcrypt/tests/mcrypt_enc_get_algorithms_name.phpt + ext/mcrypt/tests/mcrypt_enc_get_block_size.phpt + ext/mcrypt/tests/mcrypt_enc_get_iv_size.phpt + ext/mcrypt/tests/mcrypt_enc_get_key_size.phpt + ext/mcrypt/tests/mcrypt_enc_get_mode_name.phpt + ext/mcrypt/tests/mcrypt_enc_get_supported_key_sizes.phpt + ext/mcrypt/tests/mcrypt_enc_is_block_algorithm.phpt + ext/mcrypt/tests/mcrypt_enc_is_block_algorithm_mode.phpt + ext/mcrypt/tests/mcrypt_enc_is_block_mode.phpt + ext/mcrypt/tests/mcrypt_enc_self_test.phpt + ext/mcrypt/tests/mcrypt_get_block_size.phpt + ext/mcrypt/tests/mcrypt_get_cipher_name.phpt + ext/mcrypt/tests/mcrypt_get_iv_size.phpt + ext/mcrypt/tests/mcrypt_get_key_size.phpt + ext/mcrypt/tests/mcrypt_list_algorithms.phpt + ext/mcrypt/tests/mcrypt_list_modes.phpt + ext/mcrypt/tests/mcrypt_module_get_algo_block_size.phpt + ext/mcrypt/tests/mcrypt_module_get_algo_key_size.phpt + ext/mcrypt/tests/mcrypt_module_get_supported_key_sizes.phpt + ext/mcrypt/tests/mcrypt_module_is_block_algorithm.phpt + ext/mcrypt/tests/mcrypt_module_is_block_algorithm_mode.phpt + ext/mcrypt/tests/mcrypt_module_is_block_mode.phpt + ext/mcrypt/tests/mcrypt_module_open.phpt + ext/mcrypt/tests/mcrypt_module_self_test.phpt + ext/mcrypt/tests/mcrypt_ofb.phpt: +1.1.4; + file mcrypt_create_iv.phpt~ was initially added on branch PHP_5_3. + +* ext/mcrypt/tests/mcrypt_cbc.phpt + ext/mcrypt/tests/mcrypt_cbc.phpt + ext/mcrypt/tests/mcrypt_cbc.phpt + ext/mcrypt/tests/mcrypt_cbf.phpt + ext/mcrypt/tests/mcrypt_cbf.phpt + ext/mcrypt/tests/mcrypt_cbf.phpt + ext/mcrypt/tests/mcrypt_create_iv.phpt + ext/mcrypt/tests/mcrypt_create_iv.phpt + ext/mcrypt/tests/mcrypt_create_iv.phpt + ext/mcrypt/tests/mcrypt_decrypt.phpt + ext/mcrypt/tests/mcrypt_decrypt.phpt + ext/mcrypt/tests/mcrypt_decrypt.phpt + ext/mcrypt/tests/mcrypt_ecb.phpt + ext/mcrypt/tests/mcrypt_ecb.phpt + ext/mcrypt/tests/mcrypt_ecb.phpt + ext/mcrypt/tests/mcrypt_enc_get_algorithms_name.phpt + ext/mcrypt/tests/mcrypt_enc_get_algorithms_name.phpt + ext/mcrypt/tests/mcrypt_enc_get_algorithms_name.phpt + ext/mcrypt/tests/mcrypt_enc_get_block_size.phpt + ext/mcrypt/tests/mcrypt_enc_get_block_size.phpt + ext/mcrypt/tests/mcrypt_enc_get_block_size.phpt +
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom/tests DOMComment_replaceData_basic.phpt DOMComment_replaceData_error1.phpt DOMComment_replaceData_error2.phpt
zoe Sat May 17 11:20:55 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/dom/tests DOMComment_replaceData_error2.phpt DOMComment_replaceData_error1.phpt DOMComment_replaceData_basic.phpt Log: Tests from London test fest 2008 http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt?view=markuprev=1.1 Index: php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt +++ php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt?view=markuprev=1.1 Index: php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt +++ php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt?view=markuprev=1.1 Index: php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt +++ php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Sat May 17 13:01:22 2008 UTC Modified files: /CVSROOTavail Log: - pecl karma for David http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1397r2=1.1398diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1397 CVSROOT/avail:1.1398 --- CVSROOT/avail:1.1397Tue May 13 14:00:51 2008 +++ CVSROOT/avail Sat May 17 13:01:22 2008 @@ -91,7 +91,7 @@ avail|dbs|peclweb # General pecl -avail|auroraeosrose,ohill,csilles,t2k269,jhannus,moriyoshi,spankin,pqf,lebsack,acmurthy,markus,omar|pecl +avail|auroraeosrose,ohill,csilles,t2k269,jhannus,moriyoshi,spankin,pqf,lebsack,acmurthy,markus,omar,dsp|pecl # access to gcov.php.net website. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom/tests DOMComment_replaceData_basic.phpt DOMComment_replaceData_error1.phpt DOMComment_replaceData_error2.phpt
zoe Sat May 17 13:26:51 2008 UTC
Modified files:
/php-src/ext/dom/tests DOMComment_replaceData_error1.phpt
DOMComment_replaceData_basic.phpt
DOMComment_replaceData_error2.phpt
Log:
Tests from London test fest 2008
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt
diff -u /dev/null php-src/ext/dom/tests/DOMComment_replaceData_error1.phpt:1.2
--- /dev/null Sat May 17 13:26:51 2008
+++ php-src/ext/dom/tests/DOMComment_replaceData_error1.phptSat May 17
13:26:51 2008
@@ -0,0 +1,24 @@
+--TEST--
+Test replacing data into a DOMComment basic test
+--CREDITS--
+Andrew Larssen [EMAIL PROTECTED]
+London TestFest 2008
+--SKIPIF--
+?php require_once('skipif.inc'); ?
+--FILE--
+?php
+
+//Negative offset
+$dom = new DomDocument();
+$comment = $dom-createComment('test-comment');
+try {
+ $comment-replaceData(-1,4,'-inserted');
+} catch (DOMException $e ) {
+ if ($e-getMessage() == 'Index Size Error'){
+echo Throws DOMException for -ve offest\n;
+ }
+}
+
+?
+--EXPECTF--
+Throws DOMException for -ve offest
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt
diff -u /dev/null php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt:1.2
--- /dev/null Sat May 17 13:26:51 2008
+++ php-src/ext/dom/tests/DOMComment_replaceData_basic.phpt Sat May 17
13:26:51 2008
@@ -0,0 +1,29 @@
+--TEST--
+Test replacing data into a DOMComment basic test
+--CREDITS--
+Andrew Larssen [EMAIL PROTECTED]
+London TestFest 2008
+--SKIPIF--
+?php // require_once('skipif.inc'); ?
+--FILE--
+?php
+
+$dom = new DomDocument();
+$comment = $dom-createComment('test-comment');
+$comment-replaceData(4,1,'replaced');
+$dom-appendChild($comment);
+echo $dom-saveXML();
+
+// Replaces rest of string if count is greater than length of existing string
+$dom = new DomDocument();
+$comment = $dom-createComment('test-comment');
+$comment-replaceData(0,50,'replaced');
+$dom-appendChild($comment);
+echo $dom-saveXML();
+
+?
+--EXPECTF--
+?xml version=1.0?
+!--testreplacedcomment--
+?xml version=1.0?
+!--replaced--
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt
diff -u /dev/null php-src/ext/dom/tests/DOMComment_replaceData_error2.phpt:1.2
--- /dev/null Sat May 17 13:26:51 2008
+++ php-src/ext/dom/tests/DOMComment_replaceData_error2.phptSat May 17
13:26:51 2008
@@ -0,0 +1,24 @@
+--TEST--
+Test replacing data into a DOMComment basic test
+--CREDITS--
+Andrew Larssen [EMAIL PROTECTED]
+London TestFest 2008
+--SKIPIF--
+?php require_once('skipif.inc'); ?
+--FILE--
+?php
+
+//offset to large
+$dom = new DomDocument();
+$comment = $dom-createComment('test-comment');
+try {
+ $comment-replaceData(999,4,'-inserted');
+} catch (DOMException $e ) {
+ if ($e-getMessage() == 'Index Size Error'){
+echo Throws DOMException for offest too large\n;
+ }
+}
+
+?
+--EXPECTF--
+Throws DOMException for offest too large
\ 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/tests phpinfo_003.phpt
cellog Sat May 17 20:02:27 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar/tests phpinfo_003.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phpinfo_003.phpt?r1=1.3r2=1.3.2.1diff_format=u Index: php-src/ext/phar/tests/phpinfo_003.phpt diff -u php-src/ext/phar/tests/phpinfo_003.phpt:1.3 php-src/ext/phar/tests/phpinfo_003.phpt:1.3.2.1 --- php-src/ext/phar/tests/phpinfo_003.phpt:1.3 Wed May 7 05:38:30 2008 +++ php-src/ext/phar/tests/phpinfo_003.phpt Sat May 17 20:02:27 2008 @@ -19,7 +19,7 @@ Phar: PHP Archive support = enabled Phar EXT version = %s Phar API version = 1.1.1 -CVS revision = $Revision: 1.3 $ +CVS revision = $Revision: 1.3.2.1 $ Phar-based phar archives = enabled Tar-based phar archives = enabled 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 /ext/phar/tests phpinfo_003.phpt
cellog Sat May 17 20:03:07 2008 UTC Modified files: /php-src/ext/phar/tests phpinfo_003.phpt Log: MFB fix test http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phpinfo_003.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/phar/tests/phpinfo_003.phpt diff -u php-src/ext/phar/tests/phpinfo_003.phpt:1.3 php-src/ext/phar/tests/phpinfo_003.phpt:1.4 --- php-src/ext/phar/tests/phpinfo_003.phpt:1.3 Wed May 7 05:38:30 2008 +++ php-src/ext/phar/tests/phpinfo_003.phpt Sat May 17 20:03:07 2008 @@ -19,7 +19,7 @@ Phar: PHP Archive support = enabled Phar EXT version = %s Phar API version = 1.1.1 -CVS revision = $Revision: 1.3 $ +CVS revision = $Revision: 1.4 $ Phar-based phar archives = enabled Tar-based phar archives = enabled 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/tests phpinfo_003.phpt
cellog Sat May 17 20:04:06 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar/tests phpinfo_003.phpt Log: fix test (again) http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phpinfo_003.phpt?r1=1.3.2.1r2=1.3.2.2diff_format=u Index: php-src/ext/phar/tests/phpinfo_003.phpt diff -u php-src/ext/phar/tests/phpinfo_003.phpt:1.3.2.1 php-src/ext/phar/tests/phpinfo_003.phpt:1.3.2.2 --- php-src/ext/phar/tests/phpinfo_003.phpt:1.3.2.1 Sat May 17 20:02:27 2008 +++ php-src/ext/phar/tests/phpinfo_003.phpt Sat May 17 20:04:06 2008 @@ -19,7 +19,7 @@ Phar: PHP Archive support = enabled Phar EXT version = %s Phar API version = 1.1.1 -CVS revision = $Revision: 1.3.2.1 $ +CVS revision = %cRevision: %s $ Phar-based phar archives = enabled Tar-based phar archives = enabled 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 config.m4 config.w32 phar.c phar_internal.h phar_object.c zip.c
cellog Sat May 17 20:07:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar config.m4 config.w32 phar.c phar_internal.h
phar_object.c zip.c
Log:
enable by default statically instead of shared
this is done by removing zlib/bz2 explicit dependencies because they are
unnecessary
we only ever use the stream filter, and the check for existence has
been moved to runtime where it is after startup
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.2r2=1.27.2.3diff_format=u
Index: php-src/ext/phar/config.m4
diff -u php-src/ext/phar/config.m4:1.27.2.2 php-src/ext/phar/config.m4:1.27.2.3
--- php-src/ext/phar/config.m4:1.27.2.2 Fri May 16 00:11:42 2008
+++ php-src/ext/phar/config.m4 Sat May 17 20:07:22 2008
@@ -1,15 +1,13 @@
-dnl $Id: config.m4,v 1.27.2.2 2008/05/16 00:11:42 cellog Exp $
+dnl $Id: config.m4,v 1.27.2.3 2008/05/17 20:07:22 cellog Exp $
dnl config.m4 for extension phar
PHP_ARG_ENABLE(phar, for phar archive support,
-[ --disable-phar Disable phar support], shared)
+[ --disable-phar Disable phar support], yes)
if test $PHP_PHAR != no; then
PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c
dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared)
PHP_ADD_BUILD_DIR($ext_builddir/lib, 1)
PHP_SUBST(PHAR_SHARED_LIBADD)
- PHP_ADD_EXTENSION_DEP(phar, zlib, true)
- PHP_ADD_EXTENSION_DEP(phar, bz2, true)
PHP_ADD_EXTENSION_DEP(phar, spl, true)
PHP_ADD_MAKEFILE_FRAGMENT
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.27.2.1r2=1.27.2.2diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.27.2.1
php-src/ext/phar/config.w32:1.27.2.2
--- php-src/ext/phar/config.w32:1.27.2.1Fri May 16 00:01:56 2008
+++ php-src/ext/phar/config.w32 Sat May 17 20:07:22 2008
@@ -1,14 +1,12 @@
-// $Id: config.w32,v 1.27.2.1 2008/05/16 00:01:56 cellog Exp $
+// $Id: config.w32,v 1.27.2.2 2008/05/17 20:07:22 cellog Exp $
// vim:ft=javascript
-ARG_ENABLE(phar, disable phar support, shared);
+ARG_ENABLE(phar, disable phar support, yes);
if (PHP_PHAR != no) {
EXTENSION(phar, dirstream.c func_interceptors.c phar.c phar_object.c
phar_path_check.c stream.c tar.c util.c zip.c);
if (PHP_PHAR_SHARED) {
ADD_FLAG(CFLAGS_PHAR, /D COMPILE_DL_PHAR );
}
- ADD_EXTENSION_DEP('phar', 'bz2', true);
ADD_EXTENSION_DEP('phar', 'spl', true);
- ADD_EXTENSION_DEP('phar', 'zlib', true);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.2r2=1.370.2.3diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.370.2.2 php-src/ext/phar/phar.c:1.370.2.3
--- php-src/ext/phar/phar.c:1.370.2.2 Wed May 14 21:29:50 2008
+++ php-src/ext/phar/phar.c Sat May 17 20:07:22 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar.c,v 1.370.2.2 2008/05/14 21:29:50 sfox Exp $ */
+/* $Id: phar.c,v 1.370.2.3 2008/05/17 20:07:22 cellog Exp $ */
#define PHAR_MAIN 1
#include phar_internal.h
@@ -25,8 +25,6 @@
#include func_interceptors.h
ZEND_DECLARE_MODULE_GLOBALS(phar)
-int phar_has_bz2;
-int phar_has_zlib;
#if PHP_VERSION_ID = 50300
char *(*phar_save_resolve_path)(const char *filename, int filename_len
TSRMLS_DC);
#endif
@@ -886,7 +884,7 @@
offset += entry.compressed_filesize;
switch (entry.flags PHAR_ENT_COMPRESSION_MASK) {
case PHAR_ENT_COMPRESSED_GZ:
- if (!phar_has_zlib) {
+ if (!PHAR_G(has_zlib)) {
if (entry.metadata) {
zval_ptr_dtor(entry.metadata);
}
@@ -895,7 +893,7 @@
}
break;
case PHAR_ENT_COMPRESSED_BZ2:
- if (!phar_has_bz2) {
+ if (!PHAR_G(has_bz2)) {
if (entry.metadata) {
zval_ptr_dtor(entry.metadata);
}
@@ -1307,7 +1305,7 @@
/* to properly decompress, we have to tell zlib
to look for a zlib or gzip header */
zval filterparams;
- if (!phar_has_zlib) {
+ if (!PHAR_G(has_zlib)) {
MAPPHAR_ALLOC_FAIL(unable to
decompress gzipped phar archive \%s\ to temporary file, enable zlib extension
in php.ini)
}
array_init(filterparams);
@@ -1358,7 +1356,7 @@
php_stream_filter *filter;
php_stream *temp;
- if (!phar_has_bz2) {
+ if
[PHP-CVS] cvs: php-src /ext/phar config.m4 config.w32 phar.c phar_internal.h phar_object.c zip.c
cellog Sat May 17 20:07:38 2008 UTC
Modified files:
/php-src/ext/phar config.m4 config.w32 phar.c phar_internal.h
phar_object.c zip.c
Log:
enable by default statically instead of shared
this is done by removing zlib/bz2 explicit dependencies because they are
unnecessary
we only ever use the stream filter, and the check for existence has
been moved to runtime where it is after startup
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27r2=1.28diff_format=u
Index: php-src/ext/phar/config.m4
diff -u php-src/ext/phar/config.m4:1.27 php-src/ext/phar/config.m4:1.28
--- php-src/ext/phar/config.m4:1.27 Mon Jan 28 08:52:06 2008
+++ php-src/ext/phar/config.m4 Sat May 17 20:07:38 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.27 2008/01/28 08:52:06 cellog Exp $
+dnl $Id: config.m4,v 1.28 2008/05/17 20:07:38 cellog Exp $
dnl config.m4 for extension phar
PHP_ARG_ENABLE(phar, for phar archive support,
@@ -8,8 +8,6 @@
PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c
dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared)
PHP_ADD_BUILD_DIR($ext_builddir/lib, 1)
PHP_SUBST(PHAR_SHARED_LIBADD)
- PHP_ADD_EXTENSION_DEP(phar, zlib, true)
- PHP_ADD_EXTENSION_DEP(phar, bz2, true)
PHP_ADD_EXTENSION_DEP(phar, spl, true)
PHP_ADD_MAKEFILE_FRAGMENT
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.27r2=1.28diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.27 php-src/ext/phar/config.w32:1.28
--- php-src/ext/phar/config.w32:1.27Mon Jan 28 14:39:16 2008
+++ php-src/ext/phar/config.w32 Sat May 17 20:07:38 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.27 2008/01/28 14:39:16 sfox Exp $
+// $Id: config.w32,v 1.28 2008/05/17 20:07:38 cellog Exp $
// vim:ft=javascript
ARG_ENABLE(phar, enable phar support, no);
@@ -8,7 +8,5 @@
if (PHP_PHAR_SHARED) {
ADD_FLAG(CFLAGS_PHAR, /D COMPILE_DL_PHAR );
}
- ADD_EXTENSION_DEP('phar', 'bz2', true);
ADD_EXTENSION_DEP('phar', 'spl', true);
- ADD_EXTENSION_DEP('phar', 'zlib', true);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.373r2=1.374diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.373 php-src/ext/phar/phar.c:1.374
--- php-src/ext/phar/phar.c:1.373 Wed May 14 21:27:31 2008
+++ php-src/ext/phar/phar.c Sat May 17 20:07:38 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar.c,v 1.373 2008/05/14 21:27:31 sfox Exp $ */
+/* $Id: phar.c,v 1.374 2008/05/17 20:07:38 cellog Exp $ */
#define PHAR_MAIN 1
#include phar_internal.h
@@ -25,8 +25,6 @@
#include func_interceptors.h
ZEND_DECLARE_MODULE_GLOBALS(phar)
-int phar_has_bz2;
-int phar_has_zlib;
#if PHP_VERSION_ID = 50300
char *(*phar_save_resolve_path)(const char *filename, int filename_len
TSRMLS_DC);
#endif
@@ -886,7 +884,7 @@
offset += entry.compressed_filesize;
switch (entry.flags PHAR_ENT_COMPRESSION_MASK) {
case PHAR_ENT_COMPRESSED_GZ:
- if (!phar_has_zlib) {
+ if (!PHAR_G(has_zlib)) {
if (entry.metadata) {
zval_ptr_dtor(entry.metadata);
}
@@ -895,7 +893,7 @@
}
break;
case PHAR_ENT_COMPRESSED_BZ2:
- if (!phar_has_bz2) {
+ if (!PHAR_G(has_bz2)) {
if (entry.metadata) {
zval_ptr_dtor(entry.metadata);
}
@@ -1307,7 +1305,7 @@
/* to properly decompress, we have to tell zlib
to look for a zlib or gzip header */
zval filterparams;
- if (!phar_has_zlib) {
+ if (!PHAR_G(has_zlib)) {
MAPPHAR_ALLOC_FAIL(unable to
decompress gzipped phar archive \%s\ to temporary file, enable zlib extension
in php.ini)
}
array_init(filterparams);
@@ -1358,7 +1356,7 @@
php_stream_filter *filter;
php_stream *temp;
- if (!phar_has_bz2) {
+ if (!PHAR_G(has_bz2)) {
MAPPHAR_ALLOC_FAIL(unable to
decompress bzipped phar archive \%s\ to temporary file, enable bz2 extension
in php.ini)
}
/* entire file is bzip-compressed, uncompress
to temporary file */
@@ -2943,8 +2941,6 @@
ZEND_INIT_MODULE_GLOBALS(phar, php_phar_init_globals_module, NULL);
[PHP-CVS] cvs: win-installer / ExtensionsFeatures.wxs WixUI_en-us.wxl
jmertic Sat May 17 20:27:56 2008 UTC Modified files: /win-installer ExtensionsFeatures.wxs WixUI_en-us.wxl Log: Added feature descriptions for params and phk extensions, and updated the one for pdflib http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures.wxs?r1=1.17r2=1.18diff_format=u Index: win-installer/ExtensionsFeatures.wxs diff -u win-installer/ExtensionsFeatures.wxs:1.17 win-installer/ExtensionsFeatures.wxs:1.18 --- win-installer/ExtensionsFeatures.wxs:1.17 Wed Apr 16 21:16:55 2008 +++ win-installer/ExtensionsFeatures.wxsSat May 17 20:27:56 2008 @@ -258,6 +258,15 @@ Feature AllowAdvertise=no Id=ext_php_pdf Title=$(loc.Featureext_php_pdfTitle) Description=$(loc.Featureext_php_pdfDescription) Level=10 ComponentRef Id=php_pdf/ /Feature + Feature AllowAdvertise=no Id=ext_php_pdflib Title=$(loc.Featureext_php_pdflibTitle) Description=$(loc.Featureext_php_pdflibDescription) Level=10 + ComponentRef Id=php_pdflib/ + /Feature + Feature AllowAdvertise=no Id=ext_php_params Title=$(loc.Featureext_php_paramsTitle) Description=$(loc.Featureext_php_paramsDescription) Level=10 + ComponentRef Id=php_params/ + /Feature + Feature AllowAdvertise=no Id=ext_php_phk Title=$(loc.Featureext_php_phkTitle) Description=$(loc.Featureext_php_phkDescription) Level=10 + ComponentRef Id=php_phk/ + /Feature Feature AllowAdvertise=no Id=ext_php_pdo Title=$(loc.Featureext_php_pdoTitle) Description=$(loc.Featureext_php_pdoDescription) Level=10 ComponentRef Id=php_pdo/ Feature AllowAdvertise=no Id=ext_php_pdo_firebird Title=$(loc.Featureext_php_pdo_firebirdTitle) Description=$(loc.Featureext_php_pdo_firebirdDescription) Level=10 http://cvs.php.net/viewvc.cgi/win-installer/WixUI_en-us.wxl?r1=1.22r2=1.23diff_format=u Index: win-installer/WixUI_en-us.wxl diff -u win-installer/WixUI_en-us.wxl:1.22 win-installer/WixUI_en-us.wxl:1.23 --- win-installer/WixUI_en-us.wxl:1.22 Wed Apr 16 21:16:55 2008 +++ win-installer/WixUI_en-us.wxl Sat May 17 20:27:56 2008 @@ -730,6 +730,12 @@ String Id=Featureext_php_parsekitDescriptionPHP Opcode Analyser/String String Id=Featureext_php_pdfTitlePDFlib/String String Id=Featureext_php_pdfDescriptionCreating PDF on the fly with the PDFlib library/String + String Id=Featureext_php_pdflibTitlePDFlib/String + String Id=Featureext_php_pdflibDescriptionCreating PDF on the fly with the PDFlib library/String + String Id=Featureext_php_phkTitlePHK Accelerator/String + String Id=Featureext_php_phkDescriptionPHK is a PHP-oriented package/archive system. Basically, it can be considered as a PHP-oriented equivalent of the Java jar format. As jar, PHK allows to distribute and run a library or an application as a single file. The PHK accelerator transparently makes PHK runtime faster./String + String Id=Featureext_php_paramsTitleParameter Parsing Utility/String + String Id=Featureext_php_paramsDescriptionParameter Parsing Utility/String String Id=Featureext_php_pdoTitlePDO/String String Id=Featureext_php_pdoDescriptionPHP Data Objects support. Enable the driver you want to use below/String String Id=Featureext_php_pdo_firebirdTitleFirebird/Interbase 6/String -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mcrypt/tests mcrypt_cbc.phpt mcrypt_cbf.phpt mcrypt_create_iv.phpt mcrypt_decrypt.phpt mcrypt_ecb.phpt mcrypt_enc_get_algorithms_name.phpt mcrypt_enc_get_block_size.phpt mc
dsp Sat May 17 23:27:43 2008 UTC Added files: /php-src/ext/mcrypt/tests mcrypt_cbc.phpt mcrypt_cbf.phpt mcrypt_create_iv.phpt mcrypt_decrypt.phpt mcrypt_ecb.phpt mcrypt_enc_get_algorithms_name.phpt mcrypt_enc_get_block_size.phpt mcrypt_enc_get_iv_size.phpt mcrypt_enc_get_key_size.phpt mcrypt_enc_get_mode_name.phpt mcrypt_enc_get_supported_key_sizes.phpt mcrypt_enc_is_block_algorithm.phpt mcrypt_enc_is_block_algorithm_mode.phpt mcrypt_enc_is_block_mode.phpt mcrypt_enc_self_test.phpt mcrypt_get_block_size.phpt mcrypt_get_cipher_name.phpt mcrypt_get_iv_size.phpt mcrypt_get_key_size.phpt mcrypt_list_algorithms.phpt mcrypt_list_modes.phpt mcrypt_module_get_algo_block_size.phpt mcrypt_module_get_algo_key_size.phpt mcrypt_module_get_supported_key_sizes.phpt mcrypt_module_is_block_algorithm.phpt mcrypt_module_is_block_algorithm_mode.phpt mcrypt_module_is_block_mode.phpt mcrypt_module_open.phpt mcrypt_module_self_test.phpt mcrypt_ofb.phpt Log: Tests from Munich PHP Testfest 2008 http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_cbc.phpt?view=markuprev=1.1 Index: php-src/ext/mcrypt/tests/mcrypt_cbc.phpt +++ php-src/ext/mcrypt/tests/mcrypt_cbc.phpt --TEST-- mcrypt_cbc --SKIPIF-- ?php if (!extension_loaded(mcrypt) || unicode_semantics()) print skip; ? --FILE-- ?php $key = FooBar; $secret = PHP Testfest 2008; $cipher = MCRYPT_RIJNDAEL_128; $iv = mcrypt_create_iv(mcrypt_get_iv_size($cipher, MCRYPT_MODE_ECB), MCRYPT_RAND); $enc_data = mcrypt_cbc($cipher, $key, $secret, MCRYPT_ENCRYPT, $iv); // we have to trim as AES rounds the blocks and decrypt doesnt detect that echo trim(mcrypt_cbc($cipher, $key, $enc_data, MCRYPT_DECRYPT, $iv)) . \n; // a warning must be issued if we don't use a IV on a AES cipher, that usually requires an IV mcrypt_cbc($cipher, $key, $enc_data, MCRYPT_DECRYPT); --EXPECTF-- PHP Testfest 2008 Warning: mcrypt_cbc(): Attempt to use an empty IV, which is NOT recommended in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_cbf.phpt?view=markuprev=1.1 Index: php-src/ext/mcrypt/tests/mcrypt_cbf.phpt +++ php-src/ext/mcrypt/tests/mcrypt_cbf.phpt --TEST-- mcrypt_cbf --SKIPIF-- ?php if (!extension_loaded(mcrypt) || unicode_semantics()) print skip; ? --FILE-- ?php $key = FooBar; $secret = PHP Testfest 2008; $cipher = MCRYPT_RIJNDAEL_128; $iv = mcrypt_create_iv(mcrypt_get_iv_size($cipher, MCRYPT_MODE_ECB), MCRYPT_RAND); $enc_data = mcrypt_cfb($cipher, $key, $secret, MCRYPT_ENCRYPT, $iv); // we have to trim as AES rounds the blocks and decrypt doesnt detect that echo trim(mcrypt_cfb($cipher, $key, $enc_data, MCRYPT_DECRYPT, $iv)) . \n; // a warning must be issued if we don't use a IV on a AES cipher, that usually requires an IV mcrypt_cfb($cipher, $key, $enc_data, MCRYPT_DECRYPT); --EXPECTF-- PHP Testfest 2008 Warning: mcrypt_cfb(): Attempt to use an empty IV, which is NOT recommended in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_create_iv.phpt?view=markuprev=1.1 Index: php-src/ext/mcrypt/tests/mcrypt_create_iv.phpt +++ php-src/ext/mcrypt/tests/mcrypt_create_iv.phpt --TEST-- mcrypt_create_iv --SKIPIF-- ?php if (!extension_loaded(mcrypt)) print skip; ? --FILE-- ?php $iv1 = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_ECB), MCRYPT_RAND); $iv2 = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_192, MCRYPT_MODE_ECB), MCRYPT_DEV_URANDOM); $iv3 = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB), MCRYPT_DEV_RANDOM); echo strlen($iv1) . \n; echo strlen($iv2) . \n; echo strlen($iv3) . \n; --EXPECT-- 16 24 32 http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_decrypt.phpt?view=markuprev=1.1 Index: php-src/ext/mcrypt/tests/mcrypt_decrypt.phpt +++ php-src/ext/mcrypt/tests/mcrypt_decrypt.phpt --TEST-- mcrypt_decrypt --SKIPIF-- ?php if (!extension_loaded(mcrypt) || unicode_semantics()) print skip; ? --FILE-- ?php $key = FooBar; $secret = PHP Testfest 2008; $mode = MCRYPT_MODE_CBC; $cipher =
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mcrypt/tests mcrypt_cbc.phpt mcrypt_cbf.phpt mcrypt_create_iv.phpt mcrypt_create_iv.phpt~ mcrypt_decrypt.phpt mcrypt_ecb.phpt mcrypt_enc_get_algorithms_name.phpt m
dsp Sat May 17 23:29:14 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/mcrypt/tests mcrypt_cbc.phpt mcrypt_cbf.phpt mcrypt_create_iv.phpt mcrypt_create_iv.phpt~ mcrypt_decrypt.phpt mcrypt_ecb.phpt mcrypt_enc_get_algorithms_name.phpt mcrypt_enc_get_block_size.phpt mcrypt_enc_get_iv_size.phpt mcrypt_enc_get_key_size.phpt mcrypt_enc_get_mode_name.phpt mcrypt_enc_get_supported_key_sizes.phpt mcrypt_enc_is_block_algorithm.phpt mcrypt_enc_is_block_algorithm_mode.phpt mcrypt_enc_is_block_mode.phpt mcrypt_enc_self_test.phpt mcrypt_get_block_size.phpt mcrypt_get_cipher_name.phpt mcrypt_get_iv_size.phpt mcrypt_get_key_size.phpt mcrypt_list_algorithms.phpt mcrypt_list_modes.phpt mcrypt_module_get_algo_block_size.phpt mcrypt_module_get_algo_key_size.phpt mcrypt_module_get_supported_key_sizes.phpt mcrypt_module_is_block_algorithm.phpt mcrypt_module_is_block_algorithm_mode.phpt mcrypt_module_is_block_mode.phpt mcrypt_module_open.phpt mcrypt_module_self_test.phpt mcrypt_ofb.phpt Log: MFH: Tests from Munich PHP Testfest 2008 http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_cbc.phpt?view=markuprev=1.1 Index: php-src/ext/mcrypt/tests/mcrypt_cbc.phpt +++ php-src/ext/mcrypt/tests/mcrypt_cbc.phpt --TEST-- mcrypt_cbc --SKIPIF-- ?php if (!extension_loaded(mcrypt) || unicode_semantics()) print skip; ? --FILE-- ?php $key = FooBar; $secret = PHP Testfest 2008; $cipher = MCRYPT_RIJNDAEL_128; $iv = mcrypt_create_iv(mcrypt_get_iv_size($cipher, MCRYPT_MODE_ECB), MCRYPT_RAND); $enc_data = mcrypt_cbc($cipher, $key, $secret, MCRYPT_ENCRYPT, $iv); // we have to trim as AES rounds the blocks and decrypt doesnt detect that echo trim(mcrypt_cbc($cipher, $key, $enc_data, MCRYPT_DECRYPT, $iv)) . \n; // a warning must be issued if we don't use a IV on a AES cipher, that usually requires an IV mcrypt_cbc($cipher, $key, $enc_data, MCRYPT_DECRYPT); --EXPECTF-- PHP Testfest 2008 Warning: mcrypt_cbc(): Attempt to use an empty IV, which is NOT recommended in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_cbf.phpt?view=markuprev=1.1 Index: php-src/ext/mcrypt/tests/mcrypt_cbf.phpt +++ php-src/ext/mcrypt/tests/mcrypt_cbf.phpt --TEST-- mcrypt_cbf --SKIPIF-- ?php if (!extension_loaded(mcrypt) || unicode_semantics()) print skip; ? --FILE-- ?php $key = FooBar; $secret = PHP Testfest 2008; $cipher = MCRYPT_RIJNDAEL_128; $iv = mcrypt_create_iv(mcrypt_get_iv_size($cipher, MCRYPT_MODE_ECB), MCRYPT_RAND); $enc_data = mcrypt_cfb($cipher, $key, $secret, MCRYPT_ENCRYPT, $iv); // we have to trim as AES rounds the blocks and decrypt doesnt detect that echo trim(mcrypt_cfb($cipher, $key, $enc_data, MCRYPT_DECRYPT, $iv)) . \n; // a warning must be issued if we don't use a IV on a AES cipher, that usually requires an IV mcrypt_cfb($cipher, $key, $enc_data, MCRYPT_DECRYPT); --EXPECTF-- PHP Testfest 2008 Warning: mcrypt_cfb(): Attempt to use an empty IV, which is NOT recommended in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_create_iv.phpt?view=markuprev=1.1 Index: php-src/ext/mcrypt/tests/mcrypt_create_iv.phpt +++ php-src/ext/mcrypt/tests/mcrypt_create_iv.phpt --TEST-- mcrypt_create_iv --SKIPIF-- ?php if (!extension_loaded(mcrypt)) print skip; ? --FILE-- ?php $iv1 = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_ECB), MCRYPT_RAND); $iv2 = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_192, MCRYPT_MODE_ECB), MCRYPT_DEV_URANDOM); $iv3 = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB), MCRYPT_DEV_RANDOM); echo strlen($iv1) . \n; echo strlen($iv2) . \n; echo strlen($iv3) . \n; --EXPECT-- 16 24 32 http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_create_iv.phpt~?view=markuprev=1.1 Index: php-src/ext/mcrypt/tests/mcrypt_create_iv.phpt~ +++ php-src/ext/mcrypt/tests/mcrypt_create_iv.phpt~ http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_decrypt.phpt?view=markuprev=1.1 Index:
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mcrypt/tests mcrypt_cbc.phpt mcrypt_cbf.phpt mcrypt_create_iv.phpt mcrypt_create_iv.phpt~ mcrypt_decrypt.phpt mcrypt_ecb.phpt mcrypt_enc_get_algorithms_name.phpt m
dsp Sat May 17 23:31:32 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/mcrypt/tests mcrypt_cbc.phpt mcrypt_cbf.phpt mcrypt_create_iv.phpt mcrypt_create_iv.phpt~ mcrypt_decrypt.phpt mcrypt_ecb.phpt mcrypt_enc_get_algorithms_name.phpt mcrypt_enc_get_block_size.phpt mcrypt_enc_get_iv_size.phpt mcrypt_enc_get_key_size.phpt mcrypt_enc_get_mode_name.phpt mcrypt_enc_get_supported_key_sizes.phpt mcrypt_enc_is_block_algorithm.phpt mcrypt_enc_is_block_algorithm_mode.phpt mcrypt_enc_is_block_mode.phpt mcrypt_enc_self_test.phpt mcrypt_get_block_size.phpt mcrypt_get_cipher_name.phpt mcrypt_get_iv_size.phpt mcrypt_get_key_size.phpt mcrypt_list_algorithms.phpt mcrypt_list_modes.phpt mcrypt_module_get_algo_block_size.phpt mcrypt_module_get_algo_key_size.phpt mcrypt_module_get_supported_key_sizes.phpt mcrypt_module_is_block_algorithm.phpt mcrypt_module_is_block_algorithm_mode.phpt mcrypt_module_is_block_mode.phpt mcrypt_module_open.phpt mcrypt_module_self_test.phpt mcrypt_ofb.phpt Log: MFH: Tests from Munich PHP Testfest 2008 http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_cbc.phpt?view=markuprev=1.1 Index: php-src/ext/mcrypt/tests/mcrypt_cbc.phpt +++ php-src/ext/mcrypt/tests/mcrypt_cbc.phpt --TEST-- mcrypt_cbc --SKIPIF-- ?php if (!extension_loaded(mcrypt) || unicode_semantics()) print skip; ? --FILE-- ?php $key = FooBar; $secret = PHP Testfest 2008; $cipher = MCRYPT_RIJNDAEL_128; $iv = mcrypt_create_iv(mcrypt_get_iv_size($cipher, MCRYPT_MODE_ECB), MCRYPT_RAND); $enc_data = mcrypt_cbc($cipher, $key, $secret, MCRYPT_ENCRYPT, $iv); // we have to trim as AES rounds the blocks and decrypt doesnt detect that echo trim(mcrypt_cbc($cipher, $key, $enc_data, MCRYPT_DECRYPT, $iv)) . \n; // a warning must be issued if we don't use a IV on a AES cipher, that usually requires an IV mcrypt_cbc($cipher, $key, $enc_data, MCRYPT_DECRYPT); --EXPECTF-- PHP Testfest 2008 Warning: mcrypt_cbc(): Attempt to use an empty IV, which is NOT recommended in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_cbf.phpt?view=markuprev=1.1 Index: php-src/ext/mcrypt/tests/mcrypt_cbf.phpt +++ php-src/ext/mcrypt/tests/mcrypt_cbf.phpt --TEST-- mcrypt_cbf --SKIPIF-- ?php if (!extension_loaded(mcrypt) || unicode_semantics()) print skip; ? --FILE-- ?php $key = FooBar; $secret = PHP Testfest 2008; $cipher = MCRYPT_RIJNDAEL_128; $iv = mcrypt_create_iv(mcrypt_get_iv_size($cipher, MCRYPT_MODE_ECB), MCRYPT_RAND); $enc_data = mcrypt_cfb($cipher, $key, $secret, MCRYPT_ENCRYPT, $iv); // we have to trim as AES rounds the blocks and decrypt doesnt detect that echo trim(mcrypt_cfb($cipher, $key, $enc_data, MCRYPT_DECRYPT, $iv)) . \n; // a warning must be issued if we don't use a IV on a AES cipher, that usually requires an IV mcrypt_cfb($cipher, $key, $enc_data, MCRYPT_DECRYPT); --EXPECTF-- PHP Testfest 2008 Warning: mcrypt_cfb(): Attempt to use an empty IV, which is NOT recommended in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_create_iv.phpt?view=markuprev=1.1 Index: php-src/ext/mcrypt/tests/mcrypt_create_iv.phpt +++ php-src/ext/mcrypt/tests/mcrypt_create_iv.phpt --TEST-- mcrypt_create_iv --SKIPIF-- ?php if (!extension_loaded(mcrypt)) print skip; ? --FILE-- ?php $iv1 = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_ECB), MCRYPT_RAND); $iv2 = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_192, MCRYPT_MODE_ECB), MCRYPT_DEV_URANDOM); $iv3 = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB), MCRYPT_DEV_RANDOM); echo strlen($iv1) . \n; echo strlen($iv2) . \n; echo strlen($iv3) . \n; --EXPECT-- 16 24 32 http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_create_iv.phpt~?view=markuprev=1.1 Index: php-src/ext/mcrypt/tests/mcrypt_create_iv.phpt~ +++ php-src/ext/mcrypt/tests/mcrypt_create_iv.phpt~ http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_decrypt.phpt?view=markuprev=1.1 Index:
[PHP-CVS] cvs: php-src /ext/phar/tests/zip refcount1.phpt
felipe Sun May 18 00:47:22 2008 UTC
Modified files:
/php-src/ext/phar/tests/zip refcount1.phpt
Log:
- Added UEXPECTF
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/refcount1.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/phar/tests/zip/refcount1.phpt
diff -u php-src/ext/phar/tests/zip/refcount1.phpt:1.4
php-src/ext/phar/tests/zip/refcount1.phpt:1.5
--- php-src/ext/phar/tests/zip/refcount1.phpt:1.4 Wed May 14 21:27:31 2008
+++ php-src/ext/phar/tests/zip/refcount1.phpt Sun May 18 00:47:22 2008
@@ -50,6 +50,27 @@
--EXPECTF--
===CLOSE===
object(PharFileInfo)#%d (2) {
+ [pathName:SplFileInfo:private]=
+ string(%d) phar://%srefcount1.phar.zip/b
+ [fileName:SplFileInfo:private]=
+ string(%d) phar://%srefcount1.phar.zip/b/c.php
+}
+string(5) extra
+===UNLINK===
+
+Warning: unlink(): phar error: b/c.php in phar %srefcount1.phar.zip, has
open file pointers, cannot unlink in %srefcount1.php on line %d
+object(PharFileInfo)#%d (2) {
+ [pathName:SplFileInfo:private]=
+ string(%d) phar://%srefcount1.phar.zip/b
+ [fileName:SplFileInfo:private]=
+ string(%s) phar://%srefcount1.phar.zip/b/c.php
+}
+string(5) extra
+extra
+===DONE===
+--UEXPECTF--
+===CLOSE===
+object(PharFileInfo)#%d (2) {
[upathName:uSplFileInfo:private]=
string(%d) phar://%srefcount1.phar.zip/b
[ufileName:uSplFileInfo:private]=
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
