Re: [PHP-CVS] svn: /php/php-src/trunk/ext/hash/ hash_joaat.c php_hash_joaat.h tests/hash_copy_001.phpt
On Sun, Mar 28, 2010 at 10:01, Martin Jansen m...@php.net wrote:
mj Sun, 28 Mar 2010 10:01:02 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=296963
Log:
JOAAT hashing now supports incremental hashing.
Changed paths:
U php/php-src/trunk/ext/hash/hash_joaat.c
U php/php-src/trunk/ext/hash/php_hash_joaat.h
U php/php-src/trunk/ext/hash/tests/hash_copy_001.phpt
Modified: php/php-src/trunk/ext/hash/hash_joaat.c
===
--- php/php-src/trunk/ext/hash/hash_joaat.c 2010-03-28 09:04:51 UTC (rev
296962)
+++ php/php-src/trunk/ext/hash/hash_joaat.c 2010-03-28 10:01:02 UTC (rev
296963)
@@ -42,7 +42,7 @@
PHP_HASH_API void PHP_JOAATUpdate(PHP_JOAAT_CTX *context, const unsigned
char *input, unsigned int inputLen)
{
- context-state = joaat_buf((void *)input, inputLen);
+ context-state = joaat_buf((void *)input, inputLen, context-state);
}
PHP_HASH_API void PHP_JOAATFinal(unsigned char digest[4], PHP_JOAAT_CTX *
context)
@@ -71,9 +71,8 @@
* 32 bit hash as a static hash type
*/
static php_hash_uint32
-joaat_buf(void *buf, size_t len)
+joaat_buf(void *buf, size_t len, php_hash_uint32 hval)
{
- php_hash_uint32 hval = 0;
size_t i;
unsigned char *input = (unsigned char *)buf;
Modified: php/php-src/trunk/ext/hash/php_hash_joaat.h
===
--- php/php-src/trunk/ext/hash/php_hash_joaat.h 2010-03-28 09:04:51 UTC (rev
296962)
+++ php/php-src/trunk/ext/hash/php_hash_joaat.h 2010-03-28 10:01:02 UTC (rev
296963)
@@ -29,7 +29,7 @@
PHP_HASH_API void PHP_JOAATUpdate(PHP_JOAAT_CTX *context, const unsigned
char *input, unsigned int inputLen);
PHP_HASH_API void PHP_JOAATFinal(unsigned char digest[16], PHP_JOAAT_CTX *
context);
-static php_hash_uint32 joaat_buf(void *buf, size_t len);
+static php_hash_uint32 joaat_buf(void *buf, size_t len, php_hash_uint32
hval);
#endif
Modified: php/php-src/trunk/ext/hash/tests/hash_copy_001.phpt
===
--- php/php-src/trunk/ext/hash/tests/hash_copy_001.phpt 2010-03-28 09:04:51
UTC (rev 296962)
+++ php/php-src/trunk/ext/hash/tests/hash_copy_001.phpt 2010-03-28 10:01:02
UTC (rev 296963)
@@ -253,7 +253,7 @@
string(16) 5e8c64fba6a5ffcf
string(5) joaat
string(8) aaebf370
-string(8) 72e280c2
+string(8) 513479b4
Changing existing hash testcases looks creepy.
Is this something that should be mentioned in UPDATING notes?
-Hannes
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/reflection/php_reflection.c ext/reflection/tests/ReflectionExtension_isPersistant.phpt ext/reflection/tests/ReflectionExtension_isTemporary.phpt
2010/3/30 Johannes Schlüter johan...@php.net: johannes Tue, 30 Mar 2010 20:50:42 + Revision: http://svn.php.net/viewvc?view=revisionrevision=297202 Log: Add ReflectionExtension::isTemporary() and ReflectionExtension::isPersistent(). Whattaheck is a temporary extension? dl()ed? -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/reflection/php_reflection.c ext/reflection/tests/ReflectionExtension_isPersistant.phpt ext/reflection/tests/ReflectionExtension_isTemporary.phpt
2010/4/3 Hannes Magnusson hannes.magnus...@gmail.com: 2010/3/30 Johannes Schlüter johan...@php.net: johannes Tue, 30 Mar 2010 20:50:42 + Revision: http://svn.php.net/viewvc?view=revisionrevision=297202 Log: Add ReflectionExtension::isTemporary() and ReflectionExtension::isPersistent(). Whattaheck is a temporary extension? dl()ed? -Hannes Indeed, a persistent extension is an extension loaded via php.ini, temporary is via dl() =) -- regards, Kalle Sommer Nielsen ka...@php.net -- 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_2/ext/ json/tests/003.phpt json/tests/004.phpt standard/tests/serialize/bug28325.phpt standard/tests/serialize/serialization_arrays_001.phpt standard/tests/s
felipe Sat, 03 Apr 2010 16:21:15 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=297426
Log:
- Fixed tests
Changed paths:
U php/php-src/branches/PHP_5_2/ext/json/tests/003.phpt
U php/php-src/branches/PHP_5_2/ext/json/tests/004.phpt
U php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/bug28325.phpt
U
php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_arrays_001.phpt
U
php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_arrays_004.phpt
U
php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_arrays_005.phpt
U
php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_objects_015.phpt
Modified: php/php-src/branches/PHP_5_2/ext/json/tests/003.phpt
===
--- php/php-src/branches/PHP_5_2/ext/json/tests/003.phpt 2010-04-03 16:20:24 UTC (rev 297425)
+++ php/php-src/branches/PHP_5_2/ext/json/tests/003.phpt 2010-04-03 16:21:15 UTC (rev 297426)
@@ -21,10 +21,7 @@
[0]=
array(1) {
[0]=
-array(1) {
- [0]=
- *RECURSION*
-}
+*RECURSION*
}
}
Modified: php/php-src/branches/PHP_5_2/ext/json/tests/004.phpt
===
--- php/php-src/branches/PHP_5_2/ext/json/tests/004.phpt 2010-04-03 16:20:24 UTC (rev 297425)
+++ php/php-src/branches/PHP_5_2/ext/json/tests/004.phpt 2010-04-03 16:21:15 UTC (rev 297426)
@@ -16,10 +16,7 @@
--EXPECTF--
object(stdClass)#%d (1) {
[prop]=
- object(stdClass)#%d (1) {
-[prop]=
-*RECURSION*
- }
+ *RECURSION*
}
Warning: json_encode(): recursion detected in %s on line %d
Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/bug28325.phpt
===
--- php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/bug28325.phpt 2010-04-03 16:20:24 UTC (rev 297425)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/bug28325.phpt 2010-04-03 16:21:15 UTC (rev 297426)
@@ -24,16 +24,7 @@
[c]=
object(c)#%d (1) {
[d]=
- object(a)#%d (1) {
-[b]=
-object(b)#%d (1) {
- [c]=
- object(c)#%d (1) {
-[d]=
-*RECURSION*
- }
-}
- }
+ *RECURSION*
}
}
}
Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_arrays_001.phpt
===
--- php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_arrays_001.phpt 2010-04-03 16:20:24 UTC (rev 297425)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_arrays_001.phpt 2010-04-03 16:21:15 UTC (rev 297426)
@@ -36,7 +36,6 @@
echo \nDone;
?
--EXPECTF--
-
--- Testing Circular reference of an array ---
-- Normal array --
string(238) a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.330101437080957111902534961700439453125;i:4;s:1:a;i:5;a:0:{}i:6;a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.330101437080957111902534961700439453125;i:4;s:1:a;i:5;a:0:{}i:6;R:8;}}
@@ -70,23 +69,7 @@
array(0) {
}
[6]=
-array(7) {
- [0]=
- int(0)
- [1]=
- int(1)
- [2]=
- int(-2)
- [3]=
- float(3.33)
- [4]=
- string(1) a
- [5]=
- array(0) {
- }
- [6]=
- *RECURSION*
-}
+*RECURSION*
}
}
Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_arrays_004.phpt
===
--- php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_arrays_004.phpt 2010-04-03 16:20:24 UTC (rev 297425)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/serialize/serialization_arrays_004.phpt 2010-04-03 16:21:15 UTC (rev 297426)
@@ -59,21 +59,12 @@
echo Done;
?
--EXPECTF--
-
-
--- 1 refs container:
array(3) {
[0]=
array(3) {
[0]=
-array(3) {
- [0]=
- *RECURSION*
- [1]=
- int(1)
- [2]=
- int(1)
-}
+*RECURSION*
[1]=
int(1)
[2]=
@@ -89,14 +80,7 @@
[0]=
array(3) {
[0]=
-array(3) {
- [0]=
- *RECURSION*
- [1]=
- int(1)
- [2]=
- int(1)
-}
+*RECURSION*
[1]=
int(1)
[2]=
@@ -109,7 +93,7 @@
}
array(3) {
[0]=
- %string(10) b0.changed
+ string(10) b0.changed
[1]=
int(1)
[2]=
@@ -117,7 +101,7 @@
}
array(3) {
[0]=
- %string(10) b0.changed
+ string(10) b0.changed
[1]=
string(10) b1.changed
[2]=
@@ -125,7 +109,7 @@
}
array(3) {
[0]=
- %string(10) b0.changed
+ string(10) b0.changed
[1]=
string(10) b1.changed
[2]=
@@ -138,46 +122,18 @@
[0]=
array(3) {
[0]=
-array(3) {
- [0]=
- *RECURSION*
- [1]=
- *RECURSION*
- [2]=
- int(1)
-}
+
Re: [PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/reflection/php_reflection.c ext/reflection/tests/ReflectionExtension_isPersistant.phpt ext/reflection/tests/ReflectionExtension_isTemporary.phpt
On Sat, 2010-04-03 at 14:53 +, Hannes Magnusson wrote: 2010/3/30 Johannes Schlüter johan...@php.net: johannes Tue, 30 Mar 2010 20:50:42 + Revision: http://svn.php.net/viewvc?view=revisionrevision=297202 Log: Add ReflectionExtension::isTemporary() and ReflectionExtension::isPersistent(). Whattaheck is a temporary extension? dl()ed? dl()ed or loaded using the extension directive in php.ini, persistent is statically compiled-in. Documentation is almost ready, will be committed once I convinced PhD to render it. johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/reflection/php_reflection.c ext/reflection/tests/ReflectionExtension_isPersistant.phpt ext/reflection/tests/ReflectionExtension_isTemporary.phpt
On Sat, 2010-04-03 at 18:21 +0200, Johannes Schlüter wrote: dl()ed or loaded using the extension directive in php.ini, persistent is statically compiled-in. eh I meant to write dl()ed is temporary, persistent is statically compiled-in or loaded using the extension directive in php.ini Documentation is almost ready, will be committed once I convinced PhD to render it. There I have it correct. johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/ext/hash/ hash_joaat.c php_hash_joaat.h tests/hash_copy_001.phpt
On 03.04.10 16:51, Hannes Magnusson wrote: On Sun, Mar 28, 2010 at 10:01, Martin Jansen m...@php.net wrote: mj Sun, 28 Mar 2010 10:01:02 + Revision: http://svn.php.net/viewvc?view=revisionrevision=296963 Modified: php/php-src/trunk/ext/hash/tests/hash_copy_001.phpt === --- php/php-src/trunk/ext/hash/tests/hash_copy_001.phpt 2010-03-28 09:04:51 UTC (rev 296962) +++ php/php-src/trunk/ext/hash/tests/hash_copy_001.phpt 2010-03-28 10:01:02 UTC (rev 296963) @@ -253,7 +253,7 @@ string(16) 5e8c64fba6a5ffcf string(5) joaat string(8) aaebf370 -string(8) 72e280c2 +string(8) 513479b4 Changing existing hash testcases looks creepy. Is this something that should be mentioned in UPDATING notes? There hasn't been a release with JOAAT hashing. The change to the test case was necessary because rev 296963 fixes an issue in the initial JOAAT implementation. - Martin -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
johannes Sat, 03 Apr 2010 22:47:32 + Revision: http://svn.php.net/viewvc?view=revisionrevision=297440 Log: Give Pieter access to pecl/amqp for his extension. Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2010-04-03 22:30:22 UTC (rev 297439) +++ SVNROOT/global_avail2010-04-03 22:47:32 UTC (rev 297440) @@ -322,6 +322,7 @@ avail|bd808|pecl/yaml,phpdoc avail|dchill42pecl|pecl/xdom,phpdoc avail|hradtke|pecl/memcache,phpdoc +avail|pdezwart|pecl/amqp,phpdoc # Objective-C bridge avail|wez,jan|php/php-objc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
