[PHP-CVS] com php-src: Fix a typo in the ZipArchive error messages: ext/zip/php_zip.c
Commit:c3acefd9ea9f1c0b0900f75d05c14a1e6ab2b671
Author:Joey Smith joeysm...@gmail.com Tue, 8 Jan 2013 14:18:31
-0700
Parents: c41291feb9d8b713684331307147bbaef43bc22a
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=c3acefd9ea9f1c0b0900f75d05c14a1e6ab2b671
Log:
Fix a typo in the ZipArchive error messages
Changed paths:
M ext/zip/php_zip.c
Diff:
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index 727cc85..5fd470a 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -410,7 +410,7 @@ static int php_zip_parse_options(zval *options, long
*remove_all_path,
ze_zip_object *obj = (ze_zip_object*)
zend_object_store_get_object(object TSRMLS_CC); \
intern = obj-za; \
if (!intern) { \
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid or
unitialized Zip object); \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid or
uninitialized Zip object); \
RETURN_FALSE; \
} \
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/tests/lang/ bug45392.phpt
joey Wed, 24 Aug 2011 15:56:12 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315430
Log:
Fix tests/lang/bug45392.phpt to log expected error when run with -n flag
Bug: https://bugs.php.net/45392 (Closed) ob_start()/ob_end_clean() and
memory_limit
Changed paths:
U php/php-src/branches/PHP_5_3/tests/lang/bug45392.phpt
Modified: php/php-src/branches/PHP_5_3/tests/lang/bug45392.phpt
===
--- php/php-src/branches/PHP_5_3/tests/lang/bug45392.phpt 2011-08-24
15:32:42 UTC (rev 315429)
+++ php/php-src/branches/PHP_5_3/tests/lang/bug45392.phpt 2011-08-24
15:56:12 UTC (rev 315430)
@@ -6,6 +6,7 @@
?php
echo __LINE__ . \n;
ini_set('memory_limit', 100);
+ini_set('log_errors', 1);
ob_start();
$i = 0;
while($i++ 5000) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/tests/lang/ bug45392.phpt
joey Wed, 24 Aug 2011 16:15:35 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315436
Log:
Revert my previous change - getting different results in different
environments, shouldn't have committed it
Changed paths:
U php/php-src/branches/PHP_5_3/tests/lang/bug45392.phpt
Modified: php/php-src/branches/PHP_5_3/tests/lang/bug45392.phpt
===
--- php/php-src/branches/PHP_5_3/tests/lang/bug45392.phpt 2011-08-24
16:15:05 UTC (rev 315435)
+++ php/php-src/branches/PHP_5_3/tests/lang/bug45392.phpt 2011-08-24
16:15:35 UTC (rev 315436)
@@ -6,7 +6,6 @@
?php
echo __LINE__ . \n;
ini_set('memory_limit', 100);
-ini_set('log_errors', 1);
ob_start();
$i = 0;
while($i++ 5000) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/sqlite3/libsqlite/ sqlite3.c
joey Tue, 09 Aug 2011 06:36:47 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314585 Log: Fix an unchecked return - change was back-migrated from version 3.7.6.3 of sqlite.c from upstream. Changed paths: U php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c Modified: php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c === --- php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c 2011-08-09 05:11:19 UTC (rev 314584) +++ php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c 2011-08-09 06:36:47 UTC (rev 314585) @@ -17818,7 +17818,7 @@ sqlite3_int64 priorLimit; sqlite3_int64 excess; #ifndef SQLITE_OMIT_AUTOINIT - sqlite3_initialize(); + if( sqlite3_initialize() ) return 0; #endif sqlite3_mutex_enter(mem0.mutex); priorLimit = mem0.alarmThreshold; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ crypt.c
joey Tue, 30 Mar 2010 10:10:20 + Revision: http://svn.php.net/viewvc?view=revisionrevision=297166 Log: Don't assume the SHA-based crypt constants are registered this is a partial fix for 51435. Changed paths: U php/php-src/trunk/ext/standard/crypt.c Modified: php/php-src/trunk/ext/standard/crypt.c === --- php/php-src/trunk/ext/standard/crypt.c 2010-03-30 10:09:34 UTC (rev 297165) +++ php/php-src/trunk/ext/standard/crypt.c 2010-03-30 10:10:20 UTC (rev 297166) @@ -107,10 +107,15 @@ REGISTER_LONG_CONSTANT(CRYPT_EXT_DES, PHP_EXT_DES_CRYPT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(CRYPT_MD5, PHP_MD5_CRYPT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(CRYPT_BLOWFISH, PHP_BLOWFISH_CRYPT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(CRYPT_SHA256, PHP_SHA256_CRYPT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(CRYPT_SHA512, PHP_SHA512_CRYPT, CONST_CS | CONST_PERSISTENT); +#ifdef PHP_SHA256_CRYPT + REGISTER_LONG_CONSTANT(CRYPT_SHA256, PHP_SHA256_CRYPT, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef PHP_SHA512_CRYPT + REGISTER_LONG_CONSTANT(CRYPT_SHA512, PHP_SHA512_CRYPT, CONST_CS | CONST_PERSISTENT); +#endif + #ifdef PHP_USE_PHP_CRYPT_R php_init_crypt_r(); #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/tests/strings/ bug51059.phpt crypt_blowfish_invalid_rounds.phpt
joey Tue, 23 Feb 2010 20:24:51 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=295436
Log:
Update crypt() tests to use binary strings and do stricter comparisons
Changed paths:
U php/php-src/trunk/ext/standard/tests/strings/bug51059.phpt
U
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
Modified: php/php-src/trunk/ext/standard/tests/strings/bug51059.phpt
===
--- php/php-src/trunk/ext/standard/tests/strings/bug51059.phpt 2010-02-23
19:41:15 UTC (rev 295435)
+++ php/php-src/trunk/ext/standard/tests/strings/bug51059.phpt 2010-02-23
20:24:51 UTC (rev 295436)
@@ -2,8 +2,8 @@
Bug #51059 crypt() segfaults on certain salts
--FILE--
?php
-$res = crypt('a', '_');
-if ($res == '*0' || $res == '*1') echo 'OK';
+$res = crypt(b'a', b'_');
+if ($res === b'*0' || $res === b'*1') echo 'OK';
else echo 'Not OK';
?
Modified:
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
===
---
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
2010-02-23 19:41:15 UTC (rev 295435)
+++
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
2010-02-23 20:24:51 UTC (rev 295436)
@@ -3,8 +3,17 @@
--FILE--
?php
-foreach(range(32, 38) as $i) {
- if (crypt('U*U', '$2a$'.$i.'$CC$') === FALSE) {
+$salts = array(b'32' = b'$2a$32$CC$',
+ b'33' = b'$2a$33$CC$',
+ b'34' = b'$2a$34$CC$',
+ b'35' = b'$2a$35$CC$',
+ b'36' = b'$2a$36$CC$',
+ b'37' = b'$2a$37$CC$',
+ b'38' = b'$2a$38$CC$',);
+
+foreach($salts as $i=$salt) {
+ $crypt = crypt(b'U*U', $salt);
+ if ($crypt === b'*0' || $crypt === b'*1') {
echo $i. OK\n;
} else {
echo $i. Not OK\n;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/tests/strings/ crypt_blowfish_invalid_rounds.phpt crypt_blowfish_variation1.phpt crypt_blowfish_variation2.phpt
joey Tue, 23 Feb 2010 20:53:58 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=295440
Log:
Rename crypt_blowfish_invalid_rounds.phpt to crypt_blowfish_variation1.phpt
to follow phpt naming conventions.
Added SKIPIF test to crypt_blowfish_variation1.phpt
Added crypt_blowfish_variation2.phpt, which tests the DES-fallback as when
blowfish salt is missing rounds.
Changed paths:
D
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
A +
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
(from
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt:r295436)
A
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_variation2.phpt
Deleted:
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
===
---
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
2010-02-23 20:40:03 UTC (rev 295439)
+++
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
2010-02-23 20:53:58 UTC (rev 295440)
@@ -1,31 +0,0 @@
---TEST--
-Test Blowfish crypt() with invalid rounds
---FILE--
-?php
-
-$salts = array(b'32' = b'$2a$32$CC$',
- b'33' = b'$2a$33$CC$',
- b'34' = b'$2a$34$CC$',
- b'35' = b'$2a$35$CC$',
- b'36' = b'$2a$36$CC$',
- b'37' = b'$2a$37$CC$',
- b'38' = b'$2a$38$CC$',);
-
-foreach($salts as $i=$salt) {
- $crypt = crypt(b'U*U', $salt);
- if ($crypt === b'*0' || $crypt === b'*1') {
-echo $i. OK\n;
- } else {
-echo $i. Not OK\n;
- }
-}
-
-?
---EXPECT--
-32. OK
-33. OK
-34. OK
-35. OK
-36. OK
-37. OK
-38. OK
Copied:
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
(from rev 295436,
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt)
===
--- php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
(rev 0)
+++ php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
2010-02-23 20:53:58 UTC (rev 295440)
@@ -0,0 +1,37 @@
+--TEST--
+Test Blowfish crypt() with invalid rounds
+--SKIPIF--
+?php
+if (!function_exists('crypt') || !defined(CRYPT_BLOWFISH)) {
+die(SKIP crypt()-blowfish is not available);
+}
+?
+--FILE--
+?php
+
+$salts = array(b'32' = b'$2a$32$CC$',
+ b'33' = b'$2a$33$CC$',
+ b'34' = b'$2a$34$CC$',
+ b'35' = b'$2a$35$CC$',
+ b'36' = b'$2a$36$CC$',
+ b'37' = b'$2a$37$CC$',
+ b'38' = b'$2a$38$CC$',);
+
+foreach($salts as $i=$salt) {
+ $crypt = crypt(b'U*U', $salt);
+ if ($crypt === b'*0' || $crypt === b'*1') {
+echo $i. OK\n;
+ } else {
+echo $i. Not OK\n;
+ }
+}
+
+?
+--EXPECT--
+32. OK
+33. OK
+34. OK
+35. OK
+36. OK
+37. OK
+38. OK
Added:
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_variation2.phpt
===
--- php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_variation2.phpt
(rev 0)
+++ php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_variation2.phpt
2010-02-23 20:53:58 UTC (rev 295440)
@@ -0,0 +1,14 @@
+--TEST--
+Test Blowfish crypt() falls back to DES when rounds are not specified,
+or Blowfish is not available.
+--FILE--
+?php
+$crypt = crypt(b'U*U',
b'$2a$C.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW');
+if ($crypt===b'$2SHYF.wPGyfE') {
+echo OK\n;
+} else {
+echo Not OK\n;
+}
+?
+--EXPECT--
+OK
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/tests/strings/ bug51059.phpt crypt_blowfish_invalid_rounds.phpt crypt_blowfish_variation1.phpt crypt_blowfish_variation2.phpt
joey Tue, 23 Feb 2010 21:14:51 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=295441
Log:
MFH'd crypt() tests - renamed to fit phpt schema, tests for DES-fallback,
use b'' on strings.
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51059.phpt
D
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
A +
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
(from
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt:r295433)
A
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_variation2.phpt
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51059.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51059.phpt
2010-02-23 20:53:58 UTC (rev 295440)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51059.phpt
2010-02-23 21:14:51 UTC (rev 295441)
@@ -2,8 +2,8 @@
Bug #51059 crypt() segfaults on certain salts
--FILE--
?php
-$res = crypt('a', '_');
-if ($res == '*0' || $res == '*1') echo 'OK';
+$res = crypt(b'a', b'_');
+if ($res === b'*0' || $res === b'*1') echo 'OK';
else echo 'Not OK';
?
Deleted:
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
===
---
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
2010-02-23 20:53:58 UTC (rev 295440)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
2010-02-23 21:14:51 UTC (rev 295441)
@@ -1,22 +0,0 @@
---TEST--
-Test Blowfish crypt() with invalid rounds
---FILE--
-?php
-
-foreach(range(32, 38) as $i) {
- if (crypt('U*U', '$2a$'.$i.'$CC$') === FALSE) {
-echo $i. OK\n;
- } else {
-echo $i. Not OK\n;
- }
-}
-
-?
---EXPECT--
-32. OK
-33. OK
-34. OK
-35. OK
-36. OK
-37. OK
-38. OK
Copied:
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
(from rev 295433,
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt)
===
---
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
(rev 0)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
2010-02-23 21:14:51 UTC (rev 295441)
@@ -0,0 +1,37 @@
+--TEST--
+Test Blowfish crypt() with invalid rounds
+--SKIPIF--
+?php
+if (!function_exists('crypt') || !defined(CRYPT_BLOWFISH)) {
+die(SKIP crypt()-blowfish is not available);
+}
+?
+--FILE--
+?php
+
+$salts = array(b'32' = b'$2a$32$CC$',
+ b'33' = b'$2a$33$CC$',
+ b'34' = b'$2a$34$CC$',
+ b'35' = b'$2a$35$CC$',
+ b'36' = b'$2a$36$CC$',
+ b'37' = b'$2a$37$CC$',
+ b'38' = b'$2a$38$CC$',);
+
+foreach($salts as $i=$salt) {
+ $crypt = crypt(b'U*U', $salt);
+ if ($crypt === b'*0' || $crypt === b'*1') {
+echo $i. OK\n;
+ } else {
+echo $i. Not OK\n;
+ }
+}
+
+?
+--EXPECT--
+32. OK
+33. OK
+34. OK
+35. OK
+36. OK
+37. OK
+38. OK
Added:
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_variation2.phpt
===
---
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_variation2.phpt
(rev 0)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_variation2.phpt
2010-02-23 21:14:51 UTC (rev 295441)
@@ -0,0 +1,14 @@
+--TEST--
+Test Blowfish crypt() falls back to DES when rounds are not specified,
+or Blowfish is not available.
+--FILE--
+?php
+$crypt = crypt(b'U*U',
b'$2a$C.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW');
+if ($crypt===b'$2SHYF.wPGyfE') {
+echo OK\n;
+} else {
+echo Not OK\n;
+}
+?
+--EXPECT--
+OK
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/ config.m4
joey Sun, 21 Feb 2010 18:50:14 + Revision: http://svn.php.net/viewvc?view=revisionrevision=295314 Log: Not sure how I screwed up that MFH so badly. Proper fix to config.m4 applied for when checking different crypt() types. Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/config.m4 Modified: php/php-src/branches/PHP_5_3/ext/standard/config.m4 === --- php/php-src/branches/PHP_5_3/ext/standard/config.m4 2010-02-21 18:31:02 UTC (rev 295313) +++ php/php-src/branches/PHP_5_3/ext/standard/config.m4 2010-02-21 18:50:14 UTC (rev 295314) @@ -272,8 +272,8 @@ AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 1, [Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5]) AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, 1, [Whether the system supports standard DES salt]) AC_DEFINE_UNQUOTED(PHP_BLOWFISH_CRYPT, 1, [Whether the system supports BlowFish salt]) + AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, 1, [Whether the system supports extended DES salt]) AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, 1, [Whether the system supports MD5 salt]) - AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, 1, [Whether the system supports extended DES salt]) AC_DEFINE_UNQUOTED(PHP_SHA512_CRYPT, 1, [Whether the system supports SHA512 salt]) AC_DEFINE_UNQUOTED(PHP_SHA256_CRYPT, 1, [Whether the system supports SHA256 salt]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ config.m4
joey Sat, 20 Feb 2010 17:58:17 + Revision: http://svn.php.net/viewvc?view=revisionrevision=295293 Log: Fixing a typo found in the m4 file while trying to understand/document crypt() better - the MD5 check was reporting itself as Extended DES Changed paths: U php/php-src/trunk/ext/standard/config.m4 Modified: php/php-src/trunk/ext/standard/config.m4 === --- php/php-src/trunk/ext/standard/config.m42010-02-20 15:36:21 UTC (rev 295292) +++ php/php-src/trunk/ext/standard/config.m42010-02-20 17:58:17 UTC (rev 295293) @@ -274,7 +274,7 @@ AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, 1, [Whether the system supports standard DES salt]) AC_DEFINE_UNQUOTED(PHP_BLOWFISH_CRYPT, 1, [Whether the system supports BlowFish salt]) AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, 1, [Whether the system supports extended DES salt]) - AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, 1, [Whether the system supports extended DES salt]) + AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, 1, [Whether the system supports MD5 salt]) AC_DEFINE_UNQUOTED(PHP_SHA512_CRYPT, 1, [Whether the system supports SHA512 salt]) AC_DEFINE_UNQUOTED(PHP_SHA256_CRYPT, 1, [Whether the system supports SHA256 salt]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/tests/strings/ bug51059.phpt crypt_blowfish_invalid_rounds.phpt
joey Sat, 20 Feb 2010 19:13:09 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=295294
Log:
MFH crypt() tests
Changed paths:
A php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51059.phpt
A
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
Added: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51059.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51059.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51059.phpt
2010-02-20 19:13:09 UTC (rev 295294)
@@ -0,0 +1,13 @@
+--TEST--
+Bug #51059 crypt() segfaults on certain salts
+--XFAIL--
+Needs a patch from Pierre
+--FILE--
+?php
+
+if (crypt('a', '_') === FALSE) echo 'OK';
+else echo 'Not OK';
+
+?
+--EXPECT--
+OK
Added:
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
===
---
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
(rev 0)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
2010-02-20 19:13:09 UTC (rev 295294)
@@ -0,0 +1,24 @@
+--TEST--
+Test Blowfish crypt() with invalid rounds
+--XFAIL--
+Needs a patch from Pierre
+--FILE--
+?php
+
+foreach(range(32, 38) as $i) {
+ if (crypt('U*U', '$2a$'.$i.'$CC$') === FALSE) {
+echo $i. OK\n;
+ } else {
+echo $i. Not OK\n;
+ }
+}
+
+?
+--EXPECT--
+32. OK
+33. OK
+34. OK
+35. OK
+36. OK
+37. OK
+38. OK
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/ config.m4
joey Sat, 20 Feb 2010 19:28:39 + Revision: http://svn.php.net/viewvc?view=revisionrevision=295295 Log: MFH fix to config.m4 to make MD5 check label accurate Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/config.m4 Modified: php/php-src/branches/PHP_5_3/ext/standard/config.m4 === --- php/php-src/branches/PHP_5_3/ext/standard/config.m4 2010-02-20 19:13:09 UTC (rev 295294) +++ php/php-src/branches/PHP_5_3/ext/standard/config.m4 2010-02-20 19:28:39 UTC (rev 295295) @@ -272,7 +272,7 @@ AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 1, [Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5]) AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, 1, [Whether the system supports standard DES salt]) AC_DEFINE_UNQUOTED(PHP_BLOWFISH_CRYPT, 1, [Whether the system supports BlowFish salt]) - AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, 1, [Whether the system supports extended DES salt]) + AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, 1, [Whether the system supports MD5 salt]) AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, 1, [Whether the system supports extended DES salt]) AC_DEFINE_UNQUOTED(PHP_SHA512_CRYPT, 1, [Whether the system supports SHA512 salt]) AC_DEFINE_UNQUOTED(PHP_SHA256_CRYPT, 1, [Whether the system supports SHA256 salt]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/tests/strings/ bug51059.phpt crypt_blowfish_invalid_rounds.phpt
joey Fri, 19 Feb 2010 21:08:35 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=295264
Log:
Tests for upcoming patches to crypt, as discussed with Pierre over IRC.
Changed paths:
A php/php-src/trunk/ext/standard/tests/strings/bug51059.phpt
A
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
Added: php/php-src/trunk/ext/standard/tests/strings/bug51059.phpt
===
--- php/php-src/trunk/ext/standard/tests/strings/bug51059.phpt
(rev 0)
+++ php/php-src/trunk/ext/standard/tests/strings/bug51059.phpt 2010-02-19
21:08:35 UTC (rev 295264)
@@ -0,0 +1,11 @@
+--TEST--
+Bug #51059 crypt() segfaults on certain salts
+--FILE--
+?php
+
+if (crypt('a', '_') === FALSE) echo 'OK';
+else echo 'Not OK';
+
+?
+--EXPECT--
+OK
Added:
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
===
---
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
(rev 0)
+++
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
2010-02-19 21:08:35 UTC (rev 295264)
@@ -0,0 +1,22 @@
+--TEST--
+Test Blowfish crypt() with invalid rounds
+--FILE--
+?php
+
+foreach(range(32, 38) as $i) {
+ if (crypt('U*U', '$2a$'.$i.'$CC$') === FALSE) {
+echo $i. OK\n;
+ } else {
+echo $i. Not OK\n;
+ }
+}
+
+?
+--EXPECT--
+32. OK
+33. OK
+34. OK
+35. OK
+36. OK
+37. OK
+38. OK
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/tests/strings/ bug51059.phpt crypt_blowfish_invalid_rounds.phpt
joey Fri, 19 Feb 2010 21:11:38 + Revision: http://svn.php.net/viewvc?view=revisionrevision=295265 Log: Marked XFAIL as requested by Pierre Changed paths: U php/php-src/trunk/ext/standard/tests/strings/bug51059.phpt U php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt Modified: php/php-src/trunk/ext/standard/tests/strings/bug51059.phpt === --- php/php-src/trunk/ext/standard/tests/strings/bug51059.phpt 2010-02-19 21:08:35 UTC (rev 295264) +++ php/php-src/trunk/ext/standard/tests/strings/bug51059.phpt 2010-02-19 21:11:38 UTC (rev 295265) @@ -1,5 +1,7 @@ --TEST-- Bug #51059 crypt() segfaults on certain salts +--XFAIL-- +Needs a patch from Pierre --FILE-- ?php Modified: php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt === --- php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt 2010-02-19 21:08:35 UTC (rev 295264) +++ php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt 2010-02-19 21:11:38 UTC (rev 295265) @@ -1,5 +1,7 @@ --TEST-- Test Blowfish crypt() with invalid rounds +--XFAIL-- +Needs a patch from Pierre --FILE-- ?php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/sapi/cli/ php.1.in
joey Wed, 02 Dec 2009 02:01:18 + Revision: http://svn.php.net/viewvc?view=revisionrevision=291577 Log: Merge some spelling corrections found in the Debian patch base. Changed paths: U php/php-src/trunk/sapi/cli/php.1.in Modified: php/php-src/trunk/sapi/cli/php.1.in === --- php/php-src/trunk/sapi/cli/php.1.in 2009-12-02 00:54:58 UTC (rev 291576) +++ php/php-src/trunk/sapi/cli/php.1.in 2009-12-02 02:01:18 UTC (rev 291577) @@ -69,7 +69,7 @@ You can access the input line by \fB$argn\fP. While processing the input lines .B $argi contains the number of the actual line being processed. Further more -the paramters \-B and \-E can be used to execute +the parameters \-B and \-E can be used to execute .IR code (see \-r) before and after all input lines have been processed respectively. Notice that the @@ -318,7 +318,7 @@ cannot be found. .SH EXAMPLES .TP 5 -\fIphp -r 'echo Hello World\\n;'\fP +\fIphp \-r 'echo Hello World\\n;'\fP This command simply writes the text Hello World to standard out. .TP \fIphp \-r 'print_r(gd_info());'\fP @@ -342,7 +342,7 @@ Using this PHP command you can count the lines being input. .TP \fIphp \-R '@$l+=count(file($argn));' \-E 'echo Lines:$l\\n;'\fP -In this example PHP expects each input line beeing a file. It counts all lines +In this example PHP expects each input line being a file. It counts all lines of the files specified by each input line and shows the summarized result. You may combine this with tools like find and change the php scriptlet. .TP -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended
joeyMon Mar 28 02:26:06 2005 EDT Modified files: /php-srcphp.ini-dist php.ini-recommended Log: Adding comments to .ini files at [EMAIL PROTECTED]'s request. http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.225r2=1.226ty=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.225 php-src/php.ini-dist:1.226 --- php-src/php.ini-dist:1.225 Mon Feb 28 19:23:31 2005 +++ php-src/php.ini-distMon Mar 28 02:26:06 2005 @@ -550,9 +550,11 @@ ; extension_dir directive above. -;Windows Extensions -;Note that ODBC support is built in, so no dll is needed for it. -; +; Windows Extensions +; Note that ODBC support is built in, so no dll is needed for it. +; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) +; extension folders as well as the separate PECL DLL download (PHP 5). +; Be sure to appropriately set the extensions_dir directive. ;extension=php_bz2.dll ;extension=php_cpdf.dll http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.170r2=1.171ty=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.170 php-src/php.ini-recommended:1.171 --- php-src/php.ini-recommended:1.170 Mon Feb 28 19:23:31 2005 +++ php-src/php.ini-recommended Mon Mar 28 02:26:06 2005 @@ -608,9 +608,11 @@ ; extension_dir directive above. -;Windows Extensions -;Note that ODBC support is built in, so no dll is needed for it. -; +; Windows Extensions +; Note that ODBC support is built in, so no dll is needed for it. +; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) +; extension folders as well as the separate PECL DLL download (PHP 5). +; Be sure to appropriately set the extensions_dir directive. ;extension=php_bz2.dll ;extension=php_cpdf.dll -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
