[PHP-CVS] com php-src: There is no need to use memchr() for comparisons in these places.: ext/filter/logical_filters.c

2013-02-03 Thread Martin Jansen 
Commit:0661d03ebaab6cf1eff156a4dd203299d0385ae9
Author:Martin Jansen mar...@divbyzero.net Fri, 28 Dec 2012 
15:20:19 +0100
Parents:   2f334438836f37b82d739b20a4d0f875278e4766
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0661d03ebaab6cf1eff156a4dd203299d0385ae9

Log:
There is no need to use memchr() for comparisons in these places.

Changed paths:
  M  ext/filter/logical_filters.c


Diff:
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index 52d948b..fededcf 100644
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -799,12 +799,12 @@ void php_filter_validate_mac(PHP_INPUT_FILTER_PARAM_DECL) 
/* {{{ */
tokens = 3;
length = 4;
separator = '.';
-   } else if (17 == input_len  memchr(input + 2, '-', 1)) {
+   } else if (17 == input_len  input[2] == '-') {
/* IEEE 802 format: Six hexadecimal digits separated by 
hyphens. */
tokens = 6;
length = 2;
separator = '-';
-   } else if (17 == input_len  memchr(input + 2, ':', 1)) {
+   } else if (17 == input_len  input[2] == ':') {
/* IEEE 802 format: Six hexadecimal digits separated by colons. 
*/
tokens = 6;
length = 2;
@@ -820,7 +820,7 @@ void php_filter_validate_mac(PHP_INPUT_FILTER_PARAM_DECL) 
/* {{{ */
for (i = 0; i  tokens; i++) {
offset = i * (length + 1);
 
-   if (i  tokens - 1  !memchr(input + offset + length, 
separator, 1)) {
+   if (i  tokens - 1  input[offset + length] != separator) {
/* The current token did not end with e.g. a . */
RETURN_VALIDATION_FAILED
}


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

[PHP-CVS] com php-src: Add option to specific the expected separator character.: ext/filter/logical_filters.c ext/filter/tests/055.phpt

2013-02-03 Thread Martin Jansen 
Commit:6186b676000f74af92b979382f605ed104b6a4bc
Author:Martin Jansen mar...@divbyzero.net Sat, 5 Jan 2013 
22:46:14 +0100
Parents:   0661d03ebaab6cf1eff156a4dd203299d0385ae9
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6186b676000f74af92b979382f605ed104b6a4bc

Log:
Add option to specific the expected separator character.

Changed paths:
  M  ext/filter/logical_filters.c
  M  ext/filter/tests/055.phpt


Diff:
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index fededcf..9b436a7 100644
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -788,9 +788,18 @@ void php_filter_validate_mac(PHP_INPUT_FILTER_PARAM_DECL) 
/* {{{ */
 {
char *input = Z_STRVAL_P(value);
int input_len = Z_STRLEN_P(value);
-   int tokens, length, i, offset;
+   int tokens, length, i, offset, exp_separator_set, exp_separator_len;
char separator;
+   char *exp_separator;
long ret = 0;
+   zval **option_val;
+
+   FETCH_STRING_OPTION(exp_separator, separator);
+
+   if (exp_separator_set  exp_separator_len != 1) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Separator must be 
exactly one character long);
+   RETURN_VALIDATION_FAILED;
+   }
 
if (14 == input_len) {
/* EUI-64 format: Four hexadecimal digits separated by dots. 
Less
@@ -813,6 +822,10 @@ void php_filter_validate_mac(PHP_INPUT_FILTER_PARAM_DECL) 
/* {{{ */
RETURN_VALIDATION_FAILED;
}
 
+   if (exp_separator_set  separator != exp_separator[0]) {
+   RETURN_VALIDATION_FAILED;
+   }
+
/* Essentially what we now have is a set of tokens each consisting of
 * a hexadecimal number followed by a separator character. (With the
 * exception of the last token which does not have the separator.)
diff --git a/ext/filter/tests/055.phpt b/ext/filter/tests/055.phpt
index bf94f35..688dbb2 100644
--- a/ext/filter/tests/055.phpt
+++ b/ext/filter/tests/055.phpt
@@ -5,24 +5,32 @@ filter_var() and FILTER_VALIDATE_MAC
 --FILE--
 ?php
 $values = Array(
-   01-23-45-67-89-ab,
-   01-23-45-67-89-AB,
-   01-23-45-67-89-aB,
-   01:23:45:67:89:ab,
-   01:23:45:67:89:AB,
-   01:23:45:67:89:aB,
-   01:23:45-67:89:aB,
-   xx:23:45:67:89:aB,
-   0123.4567.89ab,
+   array(01-23-45-67-89-ab, null),
+   array(01-23-45-67-89-ab, array(options = array(separator = 
-))),
+   array(01-23-45-67-89-ab, array(options = array(separator = 
.))),
+   array(01-23-45-67-89-ab, array(options = array(separator = 
:))),
+   array(01-23-45-67-89-AB, null),
+   array(01-23-45-67-89-aB, null),
+   array(01:23:45:67:89:ab, null),
+   array(01:23:45:67:89:AB, null),
+   array(01:23:45:67:89:aB, null),
+   array(01:23:45-67:89:aB, null),
+   array(xx:23:45:67:89:aB, null),
+   array(0123.4567.89ab, null),
+   array(01-23-45-67-89-ab, array(options = array(separator = 
--))),
+   array(01-23-45-67-89-ab, array(options = array(separator = 
))),
 );
 foreach ($values as $value) {
-   var_dump(filter_var($value, FILTER_VALIDATE_MAC));
+   var_dump(filter_var($value[0], FILTER_VALIDATE_MAC, $value[1]));
 }
 
 echo Done\n;
 ?
---EXPECT-- 
+--EXPECTF--
 string(17) 01-23-45-67-89-ab
+string(17) 01-23-45-67-89-ab
+bool(false)
+bool(false)
 string(17) 01-23-45-67-89-AB
 string(17) 01-23-45-67-89-aB
 string(17) 01:23:45:67:89:ab
@@ -31,4 +39,10 @@ string(17) 01:23:45:67:89:aB
 bool(false)
 bool(false)
 string(14) 0123.4567.89ab
+
+Warning: filter_var(): Separator must be exactly one character long in 
%s055.php on line %d
+bool(false)
+
+Warning: filter_var(): Separator must be exactly one character long in 
%s055.php on line %d
+bool(false)
 Done


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

[PHP-CVS] com php-src: ext/filter support for validating MAC addresses.: ext/filter/filter.c ext/filter/filter_private.h ext/filter/logical_filters.c ext/filter/php_filter.h ext/filter/tests/008.phpt

2013-02-03 Thread Martin Jansen 
Commit:2f334438836f37b82d739b20a4d0f875278e4766
Author:Martin Jansen mar...@divbyzero.net Mon, 24 Dec 2012 
14:14:24 +0100
Parents:   8771c265a43dac2e44aa4ae7af66a6534b0c70ae
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=2f334438836f37b82d739b20a4d0f875278e4766

Log:
ext/filter support for validating MAC addresses.

Changed paths:
  M  ext/filter/filter.c
  M  ext/filter/filter_private.h
  M  ext/filter/logical_filters.c
  M  ext/filter/php_filter.h
  M  ext/filter/tests/008.phpt
  M  ext/filter/tests/033.phpt
  M  ext/filter/tests/033_run.inc
  A  ext/filter/tests/055.phpt

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 2aa8dd5..da951fe 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -47,6 +47,7 @@ static const filter_list_entry filter_list[] = {
{ validate_url,FILTER_VALIDATE_URL,   
php_filter_validate_url},
{ validate_email,  FILTER_VALIDATE_EMAIL, 
php_filter_validate_email  },
{ validate_ip, FILTER_VALIDATE_IP,
php_filter_validate_ip },
+   { validate_mac,FILTER_VALIDATE_MAC,   
php_filter_validate_mac},
 
{ string,  FILTER_SANITIZE_STRING,php_filter_string   
   },
{ stripped,FILTER_SANITIZE_STRING,php_filter_string   
   },
@@ -233,6 +234,7 @@ PHP_MINIT_FUNCTION(filter)
REGISTER_LONG_CONSTANT(FILTER_VALIDATE_URL, FILTER_VALIDATE_URL, 
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(FILTER_VALIDATE_EMAIL, FILTER_VALIDATE_EMAIL, 
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(FILTER_VALIDATE_IP, FILTER_VALIDATE_IP, 
CONST_CS | CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(FILTER_VALIDATE_MAC, FILTER_VALIDATE_MAC, 
CONST_CS | CONST_PERSISTENT);
 
REGISTER_LONG_CONSTANT(FILTER_DEFAULT, FILTER_DEFAULT, CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(FILTER_UNSAFE_RAW, FILTER_UNSAFE_RAW, CONST_CS 
| CONST_PERSISTENT);
diff --git a/ext/filter/filter_private.h b/ext/filter/filter_private.h
index 9bc53a0..65e61df 100644
--- a/ext/filter/filter_private.h
+++ b/ext/filter/filter_private.h
@@ -63,7 +63,8 @@
 #define FILTER_VALIDATE_URL   0x0111
 #define FILTER_VALIDATE_EMAIL 0x0112
 #define FILTER_VALIDATE_IP0x0113
-#define FILTER_VALIDATE_LAST  0x0113
+#define FILTER_VALIDATE_MAC   0x0114
+#define FILTER_VALIDATE_LAST  0x0114
 
 #define FILTER_VALIDATE_ALL   0x0100
 
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index 58d5870..52d948b 100644
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -784,6 +784,54 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) 
/* {{{ */
 }
 /* }}} */
 
+void php_filter_validate_mac(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
+{
+   char *input = Z_STRVAL_P(value);
+   int input_len = Z_STRLEN_P(value);
+   int tokens, length, i, offset;
+   char separator;
+   long ret = 0;
+
+   if (14 == input_len) {
+   /* EUI-64 format: Four hexadecimal digits separated by dots. 
Less
+* commonly used but valid nonetheless.
+*/
+   tokens = 3;
+   length = 4;
+   separator = '.';
+   } else if (17 == input_len  memchr(input + 2, '-', 1)) {
+   /* IEEE 802 format: Six hexadecimal digits separated by 
hyphens. */
+   tokens = 6;
+   length = 2;
+   separator = '-';
+   } else if (17 == input_len  memchr(input + 2, ':', 1)) {
+   /* IEEE 802 format: Six hexadecimal digits separated by colons. 
*/
+   tokens = 6;
+   length = 2;
+   separator = ':';
+   } else {
+   RETURN_VALIDATION_FAILED;
+   }
+
+   /* Essentially what we now have is a set of tokens each consisting of
+* a hexadecimal number followed by a separator character. (With the
+* exception of the last token which does not have the separator.)
+*/
+   for (i = 0; i  tokens; i++) {
+   offset = i * (length + 1);
+
+   if (i  tokens - 1  !memchr(input + offset + length, 
separator, 1)) {
+   /* The current token did not end with e.g. a . */
+   RETURN_VALIDATION_FAILED
+   }
+   if (php_filter_parse_hex(input + offset, length, ret)  0) {
+   /* The current token is no valid hexadecimal digit */
+   RETURN_VALIDATION_FAILED
+   }
+   }
+}
+/* }}} */
+
 /*
  * Local variables:
  * tab-width: 4
diff --git a/ext/filter/php_filter.h b/ext/filter/php_filter.h
index cbe1c47..e31f0f0 100644
--- a/ext/filter/php_filter.h
+++ b/ext/filter/php_filter.h
@@ -78,6 +78,7 @@ void php_filter_validate_regexp(PHP_INPUT_FILTER_PARAM_DECL);
 void

[PHP-CVS] com php-src: News about FR #49180.: NEWS

2013-02-03 Thread Martin Jansen 
Commit:60b5f6d4632260a90e0a59838aa672ba2376bffa
Author:Martin Jansen mar...@divbyzero.net Sun, 3 Feb 2013 
13:27:36 +0100
Parents:   6186b676000f74af92b979382f605ed104b6a4bc
Branches:  PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=60b5f6d4632260a90e0a59838aa672ba2376bffa

Log:
News about FR #49180.

Bugs:
https://bugs.php.net/49180

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 11ae31c..c343f43 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,9 @@ PHP   
 NEWS
   . Added recvmsg() and sendmsg() wrappers. (Gustavo)
 See https://wiki.php.net/rfc/sendrecvmsg
 
+- Filter:
+  . Implemented FR #49180 - added MAC address validation. (Martin)
+
 24 Jan 2013, PHP 5.5.0 Alpha 4
 
 - Core:


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

[PHP-CVS] push php-src: update branch master

2012-03-20 Thread Martin Jansen 
Branch master in php-src.git was updated
Date: Tue, 20 Mar 2012 10:16:28 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=a0c87ff53c2226ecbf451bc7ef1648ec84edb320;hp=ac38f4e113b7ba958e1e678943407b3bad789e9e


Log:
Commit:a0c87ff53c2226ecbf451bc7ef1648ec84edb320
Author:Martin Jansen m...@php.net Tue, 20 Mar 2012 11:16:09 +0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=a0c87ff53c2226ecbf451bc7ef1648ec84edb320
Shortlog:  Merge branch 'master' of git.php.net:php-src

Commit:0119f24df1852ea68eb27adae7bd0134d99b1602
Author:Martin Jansen m...@php.net Tue, 20 Mar 2012 11:15:36 +0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=0119f24df1852ea68eb27adae7bd0134d99b1602
Shortlog:  Merge branch 'PHP-5.4'

Commit:c337f69157f95402650dded274919ded47d0a78e
Author:Martin Jansen m...@php.net Tue, 20 Mar 2012 11:15:28 +0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=c337f69157f95402650dded274919ded47d0a78e
Shortlog:  Merge branch 'PHP-5.3' into PHP-5.4

Commit:52ec6f761eea3335e906f3abccbb122eb3044bb7
Author:Martin Jansen m...@php.net Tue, 20 Mar 2012 11:14:59 +0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=52ec6f761eea3335e906f3abccbb122eb3044bb7
Shortlog:  Bump copyright year.




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

[PHP-CVS] com php-src: Merge branch 'master' of git.php.net:php-src:

2012-03-20 Thread Martin Jansen 
Commit:a0c87ff53c2226ecbf451bc7ef1648ec84edb320
Author:Martin Jansen m...@php.net Tue, 20 Mar 2012 11:16:09 +0100
Parents:   0119f24df1852ea68eb27adae7bd0134d99b1602 
ac38f4e113b7ba958e1e678943407b3bad789e9e

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=a0c87ff53c2226ecbf451bc7ef1648ec84edb320

Log:
Merge branch 'master' of git.php.net:php-src

Trivial merge


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4:

2012-03-20 Thread Martin Jansen 
Commit:c337f69157f95402650dded274919ded47d0a78e
Author:Martin Jansen m...@php.net Tue, 20 Mar 2012 11:15:28 +0100
Parents:   868dbe127ac12586e5fc6a8e3514eb5007477fee 
52ec6f761eea3335e906f3abccbb122eb3044bb7

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=c337f69157f95402650dded274919ded47d0a78e

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Bump copyright year.

Trivial merge


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4':

2012-03-20 Thread Martin Jansen 
Commit:0119f24df1852ea68eb27adae7bd0134d99b1602
Author:Martin Jansen m...@php.net Tue, 20 Mar 2012 11:15:36 +0100
Parents:   4b6772f847f460a512de6f230c8bfdf866253eb2 
c337f69157f95402650dded274919ded47d0a78e

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0119f24df1852ea68eb27adae7bd0134d99b1602

Log:
Merge branch 'PHP-5.4'

* PHP-5.4:
  Bump copyright year.

Trivial merge


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

[PHP-CVS] com php-src: Bump copyright year.: LICENSE

2012-03-20 Thread Martin Jansen 
Commit:52ec6f761eea3335e906f3abccbb122eb3044bb7
Author:Martin Jansen m...@php.net Tue, 20 Mar 2012 11:14:59 +0100
Parents:   4a6d9b348febe7895a2748977898c09b6e40a7ce

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=52ec6f761eea3335e906f3abccbb122eb3044bb7

Log:
Bump copyright year.

Bug #61386

Bugs:
https://bugs.php.net/61386

Changed paths:
  M  LICENSE


Diff:
52ec6f761eea3335e906f3abccbb122eb3044bb7
diff --git a/LICENSE b/LICENSE
index 3cc8b77..42536af 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
  
   The PHP License, version 3.01
-Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2012 The PHP Group. All rights reserved.
  
 
 Redistribution and use in source and binary forms, with or without


--
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/math/ mt_rand_variation1.phpt mt_rand_variation2.phpt

2011-05-14 Thread Martin Jansen 
mj   Sat, 14 May 2011 20:29:46 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=311020

Log:
Fixed two failing tests that were caused by arbitrarily chosen
but apparently bogus upper resp. lower limits for mt_rand().

Changed paths:
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/math/mt_rand_variation1.phpt
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/math/mt_rand_variation2.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/math/mt_rand_variation1.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/math/mt_rand_variation1.phpt
2011-05-14 20:28:14 UTC (rev 311019)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/math/mt_rand_variation1.phpt
2011-05-14 20:29:46 UTC (rev 311020)
@@ -38,7 +38,7 @@
// float data
 /*6*/  10.5,
-10.5,
-   12.3456789000e10,
+   12.3456789000E8,
12.3456789000E-10,
.5,

@@ -79,7 +79,7 @@
 $iterator = 1;
 foreach($inputs as $input) {
echo \n-- Iteration $iterator --\n;
-   var_dump(mt_rand($input, 100));
+   var_dump(mt_rand($input, mt_getrandmax()));
$iterator++;
 };
 fclose($fp);

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/math/mt_rand_variation2.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/math/mt_rand_variation2.phpt
2011-05-14 20:28:14 UTC (rev 311019)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/math/mt_rand_variation2.phpt
2011-05-14 20:29:46 UTC (rev 311020)
@@ -79,7 +79,7 @@
 $iterator = 1;
 foreach($inputs as $input) {
echo \n-- Iteration $iterator --\n;
-   var_dump(mt_rand(100, $input));
+   var_dump(mt_rand(-1 * mt_getrandmax(), $input));
$iterator++;
 };
 fclose($fp);

-- 
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/math/ mt_rand_variation1.phpt mt_rand_variation2.phpt

2011-05-14 Thread Martin Jansen 
mj   Sat, 14 May 2011 20:38:47 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=311021

Log:
MFB: Fixed two failing tests that were caused by arbitrarily chosen
but apparently bogus upper resp. lower limits for mt_rand().

Changed paths:
U   php/php-src/trunk/ext/standard/tests/math/mt_rand_variation1.phpt
U   php/php-src/trunk/ext/standard/tests/math/mt_rand_variation2.phpt

Modified: php/php-src/trunk/ext/standard/tests/math/mt_rand_variation1.phpt
===
--- php/php-src/trunk/ext/standard/tests/math/mt_rand_variation1.phpt   
2011-05-14 20:29:46 UTC (rev 311020)
+++ php/php-src/trunk/ext/standard/tests/math/mt_rand_variation1.phpt   
2011-05-14 20:38:47 UTC (rev 311021)
@@ -38,7 +38,7 @@
// float data
 /*6*/  10.5,
-10.5,
-   12.3456789000e10,
+   12.3456789000E8,
12.3456789000E-10,
.5,

@@ -79,7 +79,7 @@
 $iterator = 1;
 foreach($inputs as $input) {
echo \n-- Iteration $iterator --\n;
-   var_dump(mt_rand($input, 100));
+   var_dump(mt_rand($input, mt_getrandmax()));
$iterator++;
 };
 fclose($fp);

Modified: php/php-src/trunk/ext/standard/tests/math/mt_rand_variation2.phpt
===
--- php/php-src/trunk/ext/standard/tests/math/mt_rand_variation2.phpt   
2011-05-14 20:29:46 UTC (rev 311020)
+++ php/php-src/trunk/ext/standard/tests/math/mt_rand_variation2.phpt   
2011-05-14 20:38:47 UTC (rev 311021)
@@ -79,7 +79,7 @@
 $iterator = 1;
 foreach($inputs as $input) {
echo \n-- Iteration $iterator --\n;
-   var_dump(mt_rand(100, $input));
+   var_dump(mt_rand(-1 * mt_getrandmax(), $input));
$iterator++;
 };
 fclose($fp);

-- 
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/openssl/ openssl.c xp_ssl.c

2011-04-25 Thread Martin Jansen 
mj   Mon, 25 Apr 2011 16:50:30 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=310476

Log:
The project calls itself OpenSSL and not openSSL, so let's keep it
that way in our code as well.

Changed paths:
U   php/php-src/trunk/ext/openssl/openssl.c
U   php/php-src/trunk/ext/openssl/xp_ssl.c

Modified: php/php-src/trunk/ext/openssl/openssl.c
===
--- php/php-src/trunk/ext/openssl/openssl.c 2011-04-25 15:22:09 UTC (rev 
310475)
+++ php/php-src/trunk/ext/openssl/openssl.c 2011-04-25 16:50:30 UTC (rev 
310476)
@@ -1020,8 +1020,8 @@
ERR_load_crypto_strings();
ERR_load_EVP_strings();

-   /* register a resource id number with openSSL so that we can map SSL - 
stream structures in
-* openSSL callbacks */
+   /* register a resource id number with OpenSSL so that we can map SSL - 
stream structures in
+* OpenSSL callbacks */
ssl_stream_data_index = SSL_get_ex_new_index(0, PHP stream index, 
NULL, NULL, NULL);

REGISTER_STRING_CONSTANT(OPENSSL_VERSION_TEXT, OPENSSL_VERSION_TEXT, 
CONST_CS|CONST_PERSISTENT);

Modified: php/php-src/trunk/ext/openssl/xp_ssl.c
===
--- php/php-src/trunk/ext/openssl/xp_ssl.c  2011-04-25 15:22:09 UTC (rev 
310475)
+++ php/php-src/trunk/ext/openssl/xp_ssl.c  2011-04-25 16:50:30 UTC (rev 
310476)
@@ -330,7 +330,7 @@
break;
case STREAM_CRYPTO_METHOD_SSLv2_CLIENT:
 #ifdef OPENSSL_NO_SSL2
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, SSLv2 
support is not compiled into the openSSL library PHP is linked against);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, SSLv2 
support is not compiled into the OpenSSL library PHP is linked against);
return -1;
 #else
sslsock-is_client = 1;
@@ -355,7 +355,7 @@
break;
case STREAM_CRYPTO_METHOD_SSLv2_SERVER:
 #ifdef OPENSSL_NO_SSL2
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, SSLv2 
support is not compiled into the openSSL library PHP is linked against);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, SSLv2 
support is not compiled into the OpenSSL library PHP is linked against);
return -1;
 #else
sslsock-is_client = 0;
@@ -923,7 +923,7 @@
sslsock-method = STREAM_CRYPTO_METHOD_SSLv23_CLIENT;
} else if (strncmp(proto, sslv2, protolen) == 0) {
 #ifdef OPENSSL_NO_SSL2
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, SSLv2 support is 
not compiled into the openSSL library PHP is linked against);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, SSLv2 support is 
not compiled into the OpenSSL library PHP is linked against);
return NULL;
 #else
sslsock-enable_on_connect = 1;

-- 
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/openssl/ openssl.c xp_ssl.c

2011-04-25 Thread Martin Jansen 
mj   Mon, 25 Apr 2011 16:51:12 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=310477

Log:
MFH: The project calls itself OpenSSL and not openSSL, so let's keep it
that way in our code as well.

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/openssl/openssl.c
U   php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c

Modified: php/php-src/branches/PHP_5_3/ext/openssl/openssl.c
===
--- php/php-src/branches/PHP_5_3/ext/openssl/openssl.c  2011-04-25 16:50:30 UTC 
(rev 310476)
+++ php/php-src/branches/PHP_5_3/ext/openssl/openssl.c  2011-04-25 16:51:12 UTC 
(rev 310477)
@@ -988,8 +988,8 @@
ERR_load_crypto_strings();
ERR_load_EVP_strings();

-   /* register a resource id number with openSSL so that we can map SSL - 
stream structures in
-* openSSL callbacks */
+   /* register a resource id number with OpenSSL so that we can map SSL - 
stream structures in
+* OpenSSL callbacks */
ssl_stream_data_index = SSL_get_ex_new_index(0, PHP stream index, 
NULL, NULL, NULL);

REGISTER_STRING_CONSTANT(OPENSSL_VERSION_TEXT, OPENSSL_VERSION_TEXT, 
CONST_CS|CONST_PERSISTENT);

Modified: php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c
===
--- php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c   2011-04-25 16:50:30 UTC 
(rev 310476)
+++ php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c   2011-04-25 16:51:12 UTC 
(rev 310477)
@@ -330,7 +330,7 @@
break;
case STREAM_CRYPTO_METHOD_SSLv2_CLIENT:
 #ifdef OPENSSL_NO_SSL2
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, SSLv2 
support is not compiled into the openSSL library PHP is linked against);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, SSLv2 
support is not compiled into the OpenSSL library PHP is linked against);
return -1;
 #else
sslsock-is_client = 1;
@@ -355,7 +355,7 @@
break;
case STREAM_CRYPTO_METHOD_SSLv2_SERVER:
 #ifdef OPENSSL_NO_SSL2
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, SSLv2 
support is not compiled into the openSSL library PHP is linked against);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, SSLv2 
support is not compiled into the OpenSSL library PHP is linked against);
return -1;
 #else
sslsock-is_client = 0;
@@ -923,7 +923,7 @@
sslsock-method = STREAM_CRYPTO_METHOD_SSLv23_CLIENT;
} else if (strncmp(proto, sslv2, protolen) == 0) {
 #ifdef OPENSSL_NO_SSL2
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, SSLv2 support is 
not compiled into the openSSL library PHP is linked against);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, SSLv2 support is 
not compiled into the OpenSSL library PHP is linked against);
return NULL;
 #else
sslsock-enable_on_connect = 1;

-- 
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/gd/ gd.c

2010-12-11 Thread Martin Jansen 
mj   Sat, 11 Dec 2010 20:10:39 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306236

Log:
Merge from trunk:

* Fixed parameter check introduced with the recent fix for bug #53492.

* Improved the error message along the way.

Bug: http://bugs.php.net/53492 (Closed) Stack buffer overflow in imagepstext
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/gd/gd.c

Modified: php/php-src/branches/PHP_5_3/ext/gd/gd.c
===
--- php/php-src/branches/PHP_5_3/ext/gd/gd.c2010-12-11 20:10:15 UTC (rev 
306235)
+++ php/php-src/branches/PHP_5_3/ext/gd/gd.c2010-12-11 20:10:39 UTC (rev 
306236)
@@ -4228,8 +4228,8 @@
return;
}

-   if (aa_steps != 4 || aa_steps != 16) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, AA steps must be 4 
or 16);
+   if (aa_steps != 4  aa_steps != 16) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Antialias steps 
must be 4 or 16);
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_2/ext/gd/ gd.c

2010-12-11 Thread Martin Jansen 
mj   Sat, 11 Dec 2010 20:10:15 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306235

Log:
Merge from trunk:

* Fixed parameter check introduced with the recent fix for bug #53492.

* Improved the error message along the way.

Bug: http://bugs.php.net/53492 (Closed) Stack buffer overflow in imagepstext
  
Changed paths:
U   php/php-src/branches/PHP_5_2/ext/gd/gd.c

Modified: php/php-src/branches/PHP_5_2/ext/gd/gd.c
===
--- php/php-src/branches/PHP_5_2/ext/gd/gd.c2010-12-11 20:09:39 UTC (rev 
306234)
+++ php/php-src/branches/PHP_5_2/ext/gd/gd.c2010-12-11 20:10:15 UTC (rev 
306235)
@@ -4593,8 +4593,8 @@
return;
}

-   if (aa_steps != 4 || aa_steps != 16) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, AA steps must be 4 
or 16);
+   if (aa_steps != 4  aa_steps != 16) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Antialias steps 
must be 4 or 16);
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/ NEWS

2010-11-19 Thread Martin Jansen 
mj   Fri, 19 Nov 2010 18:38:23 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305564

Log:
Fixed two typos in NEWS.

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-11-19 17:22:05 UTC (rev 305563)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-11-19 18:38:23 UTC (rev 305564)
@@ -37,7 +37,7 @@
 - Added a 3rd parameter to get_html_translation_table. It now takes a charset
   hint, like htmlentities et al. (Gustavo)

-- Path with NULL in them (foo\obar.txt) are now considered as invalid. (Rasmus)
+- Paths with NULL in them (foo\0bar.txt) are now considered as invalid. 
(Rasmus)
 - Fixed a possible double free in imap extension (Identified by Mateusz
   Kocielski). (CVE-2010-4150). (Ilia)
 - Fixed NULL pointer dereference in ZipArchive::getArchiveComment.

-- 
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/network/ getmxrr.phpt

2010-05-24 Thread Martin Jansen 
mj   Tue, 25 May 2010 05:01:03 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=299730

Log:
Changed test case to use our new dummy MX records.

Changed paths:
U   php/php-src/trunk/ext/standard/tests/network/getmxrr.phpt

Modified: php/php-src/trunk/ext/standard/tests/network/getmxrr.phpt
===
--- php/php-src/trunk/ext/standard/tests/network/getmxrr.phpt   2010-05-25 
02:16:46 UTC (rev 299729)
+++ php/php-src/trunk/ext/standard/tests/network/getmxrr.phpt   2010-05-25 
05:01:03 UTC (rev 299730)
@@ -8,7 +8,7 @@
 ?
 --FILE--
 ?php
-$domains = array( 'php.net', 'lists.php.net' );
+$domains = array( 'mx1.tests.php.net', 'mx2.tests.php.net' );
 foreach ( $domains as $domain )
 {
 if ( getmxrr( $domain, $hosts, $weights ) )
@@ -18,5 +18,5 @@
 }
 ?
 --EXPECT--
+Hosts: 1, weights: 1
 Hosts: 2, weights: 2
-Hosts: 1, weights: 1

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

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/dns_win32.c trunk/ext/standard/dns_win32.c

2010-05-17 Thread Martin Jansen 
On 18.05.10 05:22, Adam Harvey wrote:
 2010/5/18 Pierre Joye pierre@gmail.com:
 2010/5/17 Johannes Schlüter johan...@schlueters.de:
 test? (lookup php.net or so ... previously there were discussions about
 adding test.php.net or so to our zone ...)

 yes, I wanted to be sure what we use prior to add a test.
 
 Last I heard, Martin had sent a proposal to the systems list to add a
 couple of test domains. Haven't heard back since.

Right.  I'll query the systems folks today to see what the status is.

- Martin

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

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/network/getmxrr.phpt trunk/ext/standard/tests/network/getmxrr.phpt

2010-05-04 Thread Martin Jansen 
On 4.5.2010 11:41, Adam Harvey wrote:
 aharvey  Tue, 04 May 2010 09:41:47 +
 
 Revision: http://svn.php.net/viewvc?view=revisionrevision=298949
 
 Log:
 Alter the getmxrr() test to use lists.php.net (which we presumably control)
 instead of ez.no (which we presumably don't) for the single MX record test.

We could probably rig something like

mx1.tests.php.net
mx2.tests.php.net
...

up in our DNS zone in order to have a stable scaffolding for those tests.

- Martin

-- 
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

2010-04-03 Thread Martin Jansen 
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: /php/php-src/trunk/ext/hash/ hash_joaat.c php_hash_joaat.h tests/hash_copy_001.phpt

2010-03-28 Thread Martin Jansen 
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
 string(10) haval128,3
 string(32) 86362472c8895e68e223ef8b3711d8d9
 string(32) ebeeeb05c18af1e53d2d127b561d5e0d

-- 
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/hash/tests/ hash_copy_001.phpt

2010-03-25 Thread Martin Jansen 
mj   Thu, 25 Mar 2010 16:05:27 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296791

Log:
Fixed test for the recently added algorithmus and made it more
debuggable by adding the names of the algorithmus to the output.

Changed paths:
U   php/php-src/trunk/ext/hash/tests/hash_copy_001.phpt

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-25 15:36:37 UTC (rev 296790)
+++ php/php-src/trunk/ext/hash/tests/hash_copy_001.phpt	2010-03-25 16:05:27 UTC (rev 296791)
@@ -6,6 +6,7 @@
 $algos = hash_algos();

 foreach ($algos as $algo) {
+	var_dump($algo);
 	$orig = hash_init($algo);
 	hash_update($orig, bI can't remember anything);
 	$copy = hash_copy($orig);
@@ -15,6 +16,7 @@
 }

 foreach ($algos as $algo) {
+	var_dump($algo);
 	$orig = hash_init($algo);
 	hash_update($orig, bI can't remember anything);
 	$copy = hash_copy($orig);
@@ -27,172 +29,274 @@
 echo Done\n;
 ?
 --EXPECTF--
+string(3) md2
 string(32) d5ac4ffd08f6a57b9bd402b8068392ff
 string(32) d5ac4ffd08f6a57b9bd402b8068392ff
+string(3) md4
 string(32) 302c45586b53a984bd3a1237cb81c15f
 string(32) 302c45586b53a984bd3a1237cb81c15f
+string(3) md5
 string(32) e35759f6ea35db254e415b5332269435
 string(32) e35759f6ea35db254e415b5332269435
+string(4) sha1
 string(40) 29f62a228f726cd728efa7a0ac6a2aba318baf15
 string(40) 29f62a228f726cd728efa7a0ac6a2aba318baf15
+string(6) sha224
 string(56) 51fd0aa76a00b4a86103895cad5c7c2651ec7da9f4fc1e50c43ede29
 string(56) 51fd0aa76a00b4a86103895cad5c7c2651ec7da9f4fc1e50c43ede29
+string(6) sha256
 string(64) d3a13cf52af8e9390caed78b77b6b1e06e102204e3555d111dfd149bc5d54dba
 string(64) d3a13cf52af8e9390caed78b77b6b1e06e102204e3555d111dfd149bc5d54dba
+string(6) sha384
 string(96) 6950d861ace4102b803ab8b3779d2f471968233010d2608974ab89804cef6f76162b4433d6e554e11e40a7cdcf510ea3
 string(96) 6950d861ace4102b803ab8b3779d2f471968233010d2608974ab89804cef6f76162b4433d6e554e11e40a7cdcf510ea3
+string(6) sha512
 string(128) caced3db8e9e3a5543d5b933bcbe9e7834e6667545c3f5d4087b58ec8d78b4c8a4a5500c9b88f65f7368810ba9905e51f1cff3b25a5dccf76634108fb4e7ce13
 string(128) caced3db8e9e3a5543d5b933bcbe9e7834e6667545c3f5d4087b58ec8d78b4c8a4a5500c9b88f65f7368810ba9905e51f1cff3b25a5dccf76634108fb4e7ce13
+string(9) ripemd128
 string(32) 5f1bc5f5aeaf747574dd34a6535cd94a
 string(32) 5f1bc5f5aeaf747574dd34a6535cd94a
+string(9) ripemd160
 string(40) 02a2a535ee10404c6b5cf9acb178a04fbed67269
 string(40) 02a2a535ee10404c6b5cf9acb178a04fbed67269
+string(9) ripemd256
 string(64) 547d2ed85ca0a0e3208b5ecf4fc6a7fc1e64db8ff13493e4beaf11e4d71648e2
 string(64) 547d2ed85ca0a0e3208b5ecf4fc6a7fc1e64db8ff13493e4beaf11e4d71648e2
+string(9) ripemd320
 string(80) 785a7df56858f550966cddfd59ce14b13bf4b18e7892c4c1ad91bf23bf67639bd2c96749ba29cfa6
 string(80) 785a7df56858f550966cddfd59ce14b13bf4b18e7892c4c1ad91bf23bf67639bd2c96749ba29cfa6
+string(9) whirlpool
 string(128) 6e60597340640e621e25f975cef2b000b0c4c09a7af7d240a52d193002b0a8426fa7da7acc5b37ed9608016d4f396db834a0ea2f2c35f900461c9ac7e5604082
 string(128) 6e60597340640e621e25f975cef2b000b0c4c09a7af7d240a52d193002b0a8426fa7da7acc5b37ed9608016d4f396db834a0ea2f2c35f900461c9ac7e5604082
+string(10) tiger128,3
 string(32) a92be6c58be7688dc6cf9585a47aa625
 string(32) a92be6c58be7688dc6cf9585a47aa625
+string(10) tiger160,3
 string(40) a92be6c58be7688dc6cf9585a47aa62535fc2482
 string(40) a92be6c58be7688dc6cf9585a47aa62535fc2482
+string(10) tiger192,3
 string(48) a92be6c58be7688dc6cf9585a47aa62535fc2482e0e5d12c
 string(48) a92be6c58be7688dc6cf9585a47aa62535fc2482e0e5d12c
+string(10) tiger128,4
 string(32) 32fb748ef5a36ca222511bcb99b044ee
 string(32) 32fb748ef5a36ca222511bcb99b044ee
+string(10) tiger160,4
 string(40) 32fb748ef5a36ca222511bcb99b044ee1d740bf3
 string(40) 32fb748ef5a36ca222511bcb99b044ee1d740bf3
+string(10) tiger192,4
 string(48) 32fb748ef5a36ca222511bcb99b044ee1d740bf300593703
 string(48) 32fb748ef5a36ca222511bcb99b044ee1d740bf300593703
+string(6) snefru
 string(64) fbe88daa74c89b9e29468fa3cd3a657d31845e21bb58dd3f8d806f5179a85c26
 string(64) fbe88daa74c89b9e29468fa3cd3a657d31845e21bb58dd3f8d806f5179a85c26
+string(9) snefru256
 string(64) fbe88daa74c89b9e29468fa3cd3a657d31845e21bb58dd3f8d806f5179a85c26
 string(64) fbe88daa74c89b9e29468fa3cd3a657d31845e21bb58dd3f8d806f5179a85c26
+string(4) gost
 string(64) 5820c7c4a0650587538b30ef4099f2b5993069758d5c847a552e6ef7360766a5
 string(64) 5820c7c4a0650587538b30ef4099f2b5993069758d5c847a552e6ef7360766a5
+string(7) adler32
 string(8) 6f7c0928
 string(8) 6f7c0928
+string(5) crc32
 string(8) e5cfc160
 string(8) e5cfc160
+string(6) crc32b
 string(8) 69147a4e
 string(8) 69147a4e
+string(7) salsa10
 string(128) aa39bc97c2bbcb0d79bbebfddca0bf8d769c7919c9e537e456efb5fc67f33f161758dd9da3ddcec7bbbd9c04553a03f74d2dbd26175dd75c353e9300674caa4e
 string(128)

[PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/hash/config.m4 ext/hash/hash.c ext/hash/hash_joaat.c ext/hash/php_hash.h ext/hash/php_hash_joaat.h ext/hash/tests/hash_algos.phpt ext/hash/tests/joaat.phpt

2010-03-24 Thread Martin Jansen 
mj   Wed, 24 Mar 2010 15:47:40 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296728

Log:
Added Jenkins's one-at-a-time hash support to ext/hash.

Changed paths:
U   php/php-src/trunk/NEWS
U   php/php-src/trunk/ext/hash/config.m4
U   php/php-src/trunk/ext/hash/hash.c
A   php/php-src/trunk/ext/hash/hash_joaat.c
U   php/php-src/trunk/ext/hash/php_hash.h
A   php/php-src/trunk/ext/hash/php_hash_joaat.h
U   php/php-src/trunk/ext/hash/tests/hash_algos.phpt
A   php/php-src/trunk/ext/hash/tests/joaat.phpt

Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS	2010-03-24 15:43:52 UTC (rev 296727)
+++ php/php-src/trunk/NEWS	2010-03-24 15:47:40 UTC (rev 296728)
@@ -1,6 +1,7 @@
 PHPNEWS
 |||
 ?? ??? 201?, PHP 5.3.99
+- Added Jenkins's one-at-a-time hash support to ext/hash. (Martin Jansen)
 - Added FNV-1 hash support to ext/hash. (Michael Maclean)
 - default_charset if not specified is now UTF-8 instead of ISO-8859-1. (Rasmus)


Modified: php/php-src/trunk/ext/hash/config.m4
===
--- php/php-src/trunk/ext/hash/config.m4	2010-03-24 15:43:52 UTC (rev 296727)
+++ php/php-src/trunk/ext/hash/config.m4	2010-03-24 15:47:40 UTC (rev 296728)
@@ -27,11 +27,11 @@

   EXT_HASH_SOURCES=hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c \
 hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c hash_adler32.c \
-hash_crc32.c hash_salsa.c hash_fnv.c
+hash_crc32.c hash_salsa.c hash_fnv.c hash_joaat.c
   EXT_HASH_HEADERS=php_hash.h php_hash_md.h php_hash_sha.h php_hash_ripemd.h \
 php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h \
 php_hash_whirlpool.h php_hash_adler32.h php_hash_crc32.h php_hash_salsa.h \
-php_hash_fnv.h php_hash_types.h
+php_hash_fnv.h php_hash_joaat.h php_hash_types.h

   PHP_NEW_EXTENSION(hash, $EXT_HASH_SOURCES, $ext_shared)
   ifdef([PHP_INSTALL_HEADERS], [

Modified: php/php-src/trunk/ext/hash/hash.c
===
--- php/php-src/trunk/ext/hash/hash.c	2010-03-24 15:43:52 UTC (rev 296727)
+++ php/php-src/trunk/ext/hash/hash.c	2010-03-24 15:47:40 UTC (rev 296728)
@@ -79,6 +79,7 @@
 	{FNV1A32, fnv1a32, 30},
 	{FNV164, fnv164, 31},
 	{FNV1A64, fnv1a64, 32},
+	{JOAAT, joaat, 33},
 };
 #endif

@@ -847,6 +848,7 @@
 	php_hash_register_algo(salsa20,		php_hash_salsa20_ops);
 	php_hash_register_algo(fnv132,		php_hash_fnv132_ops);
 	php_hash_register_algo(fnv164,		php_hash_fnv164_ops);
+	php_hash_register_algo(joaat,			php_hash_joaat_ops);

 	PHP_HASH_HAVAL_REGISTER(3,128);
 	PHP_HASH_HAVAL_REGISTER(3,160);

Added: php/php-src/trunk/ext/hash/hash_joaat.c
===
--- php/php-src/trunk/ext/hash/hash_joaat.c	(rev 0)
+++ php/php-src/trunk/ext/hash/hash_joaat.c	2010-03-24 15:47:40 UTC (rev 296728)
@@ -0,0 +1,100 @@
+/*
+  +--+
+  | PHP Version 5|
+  +--+
+  | Copyright (c) 1997-2010 The PHP Group|
+  +--+
+  | This source file is subject to version 3.01 of the PHP license,  |
+  | that is bundled with this package in the file LICENSE, and is|
+  | available through the world-wide-web at the following url:   |
+  | http://www.php.net/license/3_01.txt  |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | obtain it through the world-wide-web, please send a note to  |
+  | lice...@php.net so we can mail you a copy immediately.   |
+  +--+
+  | Author: Martin Jansen m...@php.net   |
+  +--+
+*/
+
+/* $Id$ */
+
+/* Implements Jenkins's one-at-a-time hashing algorithm as presented on
+ * http://www.burtleburtle.net/bob/hash/doobs.html.
+ */
+
+#include php_hash.h
+#include php_hash_joaat.h
+
+const php_hash_ops php_hash_joaat_ops = {
+	(php_hash_init_func_t) PHP_JOAATInit,
+	(php_hash_update_func_t) PHP_JOAATUpdate,
+	(php_hash_final_func_t) PHP_JOAATFinal,
+	(php_hash_copy_func_t) php_hash_copy,
+	4,
+	4,
+	sizeof(PHP_JOAAT_CTX)
+};
+
+PHP_HASH_API void PHP_JOAATInit(PHP_JOAAT_CTX *context)
+{
+	context-state = 0;
+}
+
+PHP_HASH_API void PHP_JOAATUpdate(PHP_JOAAT_CTX *context, const unsigned char *input, unsigned int inputLen

[PHP-CVS] svn: /php/php-src/trunk/ext/hash/ config.w32

2010-03-24 Thread Martin Jansen 
mj   Wed, 24 Mar 2010 16:30:37 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296732

Log:
Added FNV and Jenkins's one-at-a-time support to the Windows build.

Changed paths:
U   php/php-src/trunk/ext/hash/config.w32

Modified: php/php-src/trunk/ext/hash/config.w32
===
--- php/php-src/trunk/ext/hash/config.w32   2010-03-24 16:23:50 UTC (rev 
296731)
+++ php/php-src/trunk/ext/hash/config.w32   2010-03-24 16:30:37 UTC (rev 
296732)
@@ -15,6 +15,6 @@
AC_DEFINE('HAVE_HASH_EXT', 1);
EXTENSION(hash, hash.c hash_md.c hash_sha.c hash_ripemd.c 
hash_haval.c 
+ hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c 
-   + hash_adler32.c hash_crc32.c hash_salsa.c);
+   + hash_adler32.c hash_crc32.c hash_salsa.c hash_joaat.c 
hash_fnv.c);
 }


-- 
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/hash/config.m4 ext/hash/hash.c ext/hash/hash_joaat.c ext/hash/php_hash.h ext/hash/php_hash_joaat.h ext/hash/tests/hash_algos.phpt ext/hash/tests/joaat

2010-03-24 Thread Martin Jansen 
On 24.03.10 17:03, Pierre Joye wrote:
 What's about config.w32?

Fixed.  I also added FNV support which was missing, too.

Martin

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

[PHP-CVS] cvs: CVSROOT / avail

2007-03-27 Thread Martin Jansen 
mj  Tue Mar 27 10:42:34 2007 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * pear/PEAR_Frontend_Web karma 
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1258r2=1.1259diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1258 CVSROOT/avail:1.1259
--- CVSROOT/avail:1.1258Fri Mar 23 08:15:05 2007
+++ CVSROOT/avail   Tue Mar 27 10:42:34 2007
@@ -382,6 +382,7 @@
 avail|sankazim|pecl/amfext
 avail|doury|pecl/ims
 avail|janisto|pear/Validate,peardoc
+avail|tias|pear/PEAR_Frontend_Web,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer


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

[PHP-CVS] cvs: CVSROOT / avail

2007-03-15 Thread Martin Jansen 
mj  Thu Mar 15 20:07:04 2007 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * Karma for Jakob Westhoff
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1252r2=1.1253diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1252 CVSROOT/avail:1.1253
--- CVSROOT/avail:1.1252Thu Mar  8 01:07:00 2007
+++ CVSROOT/avail   Thu Mar 15 20:07:04 2007
@@ -377,6 +377,7 @@
 avail|void|pecl/bbcode
 avail|electroteque|pear/Structures_DataGrid_Renderer_Flexy,peardoc
 avail|sankazim|pecl/amf
+avail|jakob|pear/Image_3D,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

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

[PHP-CVS] cvs: CVSROOT / avail

2007-02-22 Thread Martin Jansen 
mj  Thu Feb 22 09:31:10 2007 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * Karma for Daniel Rossi
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1247r2=1.1248diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1247 CVSROOT/avail:1.1248
--- CVSROOT/avail:1.1247Mon Feb 19 15:43:52 2007
+++ CVSROOT/avail   Thu Feb 22 09:31:10 2007
@@ -375,6 +375,7 @@
 avail|shangxiao|pear/HTML_QuickForm_altselect
 avail|schmidt|pear/OLE,peardoc
 avail|void|pecl/bbcode
+avail|electroteque|pear/Structures_DataGrid_Renderer_Flexy,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

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

[PHP-CVS] cvs: CVSROOT / avail

2007-02-13 Thread Martin Jansen 
mj  Tue Feb 13 18:41:56 2007 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * PEAR karma for Christian Schmidt
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1242r2=1.1243diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1242 CVSROOT/avail:1.1243
--- CVSROOT/avail:1.1242Tue Feb 13 07:48:15 2007
+++ CVSROOT/avail   Tue Feb 13 18:41:56 2007
@@ -373,6 +373,7 @@
 avail|ssttoo|pear/Image_Text,pear/Text_Highlighter
 avail|wharmby|php-src
 avail|shangxiao|pear/HTML_QuickForm_altselect
+avail|schmidt|pear/OLE,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

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

[PHP-CVS] cvs: CVSROOT / avail

2007-01-12 Thread Martin Jansen 
mj  Fri Jan 12 21:22:29 2007 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * Karma for Stoyan Stefanov
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1232r2=1.1233diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1232 CVSROOT/avail:1.1233
--- CVSROOT/avail:1.1232Tue Jan  2 15:24:53 2007
+++ CVSROOT/avail   Fri Jan 12 21:22:29 2007
@@ -370,6 +370,7 @@
 avail|wormus|pear/Validate,peardoc
 avail|aharvey|pear/Auth,pear/Config,pear/DB,peardoc
 avail|hudeldudel|pear/Net_IMAP,peardoc
+avail|ssttoo|pear/Image_Text,pear/Text_Highlighter
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

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

[PHP-CVS] cvs: CVSROOT / avail

2006-12-30 Thread Martin Jansen 
mj  Sat Dec 30 20:22:18 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * Karma for Andrew Teixeira.
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1229r2=1.1230diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1229 CVSROOT/avail:1.1230
--- CVSROOT/avail:1.1229Thu Dec 28 21:45:26 2006
+++ CVSROOT/avail   Sat Dec 30 20:22:18 2006
@@ -155,7 +155,7 @@
 
 avail|sterling,derick,imajes,phanto,sebastian,helly,jan|pecl/adt
 avail|beckerr,val,shire|pecl/apc
-avail|atex|pecl/rpmreader
+avail|atex|pecl/rpmreader,pear/Net_MAC,peardoc
 avail|wez,sterling,edink,derick,tal,bs,magnus|embed,embed-web
 avail|hholzgra,stas,derick|functable
 avail|alan_k|php-gtk/ext/gtkhtml,php-gtk/ext/scintilla

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

[PHP-CVS] cvs: CVSROOT / avail

2006-12-28 Thread Martin Jansen 
mj  Thu Dec 28 21:45:26 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * Net_IMAP karma for Sebastian Ebling
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1228r2=1.1229diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1228 CVSROOT/avail:1.1229
--- CVSROOT/avail:1.1228Fri Dec 22 16:22:53 2006
+++ CVSROOT/avail   Thu Dec 28 21:45:26 2006
@@ -369,6 +369,7 @@
 avail|zhaowei|pecl/mailparse
 avail|wormus|pear/Validate,peardoc
 avail|aharvey|pear/Auth,pear/Config,pear/DB,peardoc
+avail|hudeldudel|pear/Net_IMAP,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

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

[PHP-CVS] cvs: CVSROOT / avail

2006-12-22 Thread Martin Jansen 
mj  Fri Dec 22 16:22:53 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * PEAR::DB karma
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1227r2=1.1228diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1227 CVSROOT/avail:1.1228
--- CVSROOT/avail:1.1227Thu Dec 21 17:00:12 2006
+++ CVSROOT/avail   Fri Dec 22 16:22:53 2006
@@ -368,7 +368,7 @@
 avail|ashnazg|pear/PhpDocumentor,peardoc
 avail|zhaowei|pecl/mailparse
 avail|wormus|pear/Validate,peardoc
-avail|aharvey|pear/Auth,pear/Config,peardoc
+avail|aharvey|pear/Auth,pear/Config,pear/DB,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

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

[PHP-CVS] cvs: CVSROOT / avail

2006-12-21 Thread Martin Jansen 
mj  Thu Dec 21 17:00:12 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * PEAR karma for Adam Harvey
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1226r2=1.1227diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1226 CVSROOT/avail:1.1227
--- CVSROOT/avail:1.1226Wed Dec 20 16:07:31 2006
+++ CVSROOT/avail   Thu Dec 21 17:00:12 2006
@@ -368,6 +368,7 @@
 avail|ashnazg|pear/PhpDocumentor,peardoc
 avail|zhaowei|pecl/mailparse
 avail|wormus|pear/Validate,peardoc
+avail|aharvey|pear/Auth,pear/Config,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

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

[PHP-CVS] cvs: CVSROOT / avail

2006-12-19 Thread Martin Jansen 
mj  Tue Dec 19 14:24:48 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * pear/Validate karma for Aaron Wormus.
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1224r2=1.1225diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1224 CVSROOT/avail:1.1225
--- CVSROOT/avail:1.1224Mon Dec 18 22:33:19 2006
+++ CVSROOT/avail   Tue Dec 19 14:24:48 2006
@@ -367,6 +367,7 @@
 avail|saltybeagle|pear/Services_W3C_HTMLValidator,peardoc
 avail|ashnazg|pear/PhpDocumentor,peardoc
 avail|zhaowei|pecl/mailparse
+avail|wormus|pear/Validate,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

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

[PHP-CVS] cvs: CVSROOT / avail

2006-12-15 Thread Martin Jansen 
mj  Fri Dec 15 18:48:21 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * PEAR karma for new users
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1221r2=1.1222diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1221 CVSROOT/avail:1.1222
--- CVSROOT/avail:1.1221Thu Dec 14 20:46:48 2006
+++ CVSROOT/avail   Fri Dec 15 18:48:21 2006
@@ -364,6 +364,8 @@
 avail|crafics|pecl/iptcdata
 avail|beni|pear/Net_LDAP,peardoc
 avail|morse|pear/DB_Table,pear/MDB_Table2,peardoc
+avail|saltybeagle|pear/Services_W3C_HTMLValidator,peardoc
+avail|ashnazg|pear/PhpDocumentor,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

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

[PHP-CVS] cvs: CVSROOT / avail

2006-12-14 Thread Martin Jansen 
mj  Thu Dec 14 20:46:49 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * Karma for Justin Patrin
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1220r2=1.1221diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1220 CVSROOT/avail:1.1221
--- CVSROOT/avail:1.1220Wed Dec 13 17:14:48 2006
+++ CVSROOT/avail   Thu Dec 14 20:46:48 2006
@@ -271,7 +271,7 @@
 avail|jstump,cyberscribe|pear/Payment_Process
 avail|johannes|pecl/idn
 avail|jimi|smbc
-avail|justinpatrin|pear/DB_DataObject_FormBuilder,pear/MDB2
+avail|justinpatrin|pear/DB_DataObject_FormBuilder,pear/MDB2,pear/HTML_QuickForm_ElementGrid
 avail|schst,luckec|pecl/id3
 avail|gabe,jlesueur|pecl/zeroconf
 avail|curt|pecl/postparser

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

[PHP-CVS] cvs: CVSROOT / avail

2006-12-04 Thread Martin Jansen 
mj  Mon Dec  4 09:46:17 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * Corrected karma for morse.
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1216r2=1.1217diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1216 CVSROOT/avail:1.1217
--- CVSROOT/avail:1.1216Sun Dec  3 13:05:49 2006
+++ CVSROOT/avail   Mon Dec  4 09:46:16 2006
@@ -363,7 +363,7 @@
 avail|instance|pear/XML_RPC2,peardoc
 avail|crafics|pecl/iptcdata
 avail|beni|pear/Net_LDAP,peardoc
-avail|morse|pear/DB_Table,pear/DB_Table2,peardoc
+avail|morse|pear/DB_Table,pear/MDB_Table2,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

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

[PHP-CVS] cvs: CVSROOT / avail

2006-12-03 Thread Martin Jansen 
mj  Sun Dec  3 13:05:49 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * CVS karma for David Morse.
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1215r2=1.1216diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1215 CVSROOT/avail:1.1216
--- CVSROOT/avail:1.1215Thu Nov 23 10:25:43 2006
+++ CVSROOT/avail   Sun Dec  3 13:05:49 2006
@@ -363,6 +363,7 @@
 avail|instance|pear/XML_RPC2,peardoc
 avail|crafics|pecl/iptcdata
 avail|beni|pear/Net_LDAP,peardoc
+avail|morse|pear/DB_Table,pear/DB_Table2,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

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

[PHP-CVS] cvs: CVSROOT / avail

2006-11-16 Thread Martin Jansen 
mj  Thu Nov 16 14:03:00 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * PEAR karma for Benedikt Hallinger.
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1212r2=1.1213diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1212 CVSROOT/avail:1.1213
--- CVSROOT/avail:1.1212Thu Nov 16 09:09:04 2006
+++ CVSROOT/avail   Thu Nov 16 14:03:00 2006
@@ -362,6 +362,7 @@
 avail|iwarner|pear/HTML_Page2,peardoc
 avail|instance|pear/XML_RPC2,peardoc
 avail|crafics|pecl/iptcdata
+avail|beni|pear/Net_LDAP,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

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

[PHP-CVS] cvs: CVSROOT / avail

2006-10-30 Thread Martin Jansen 
mj  Mon Oct 30 20:16:47 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * Fixed karma for Shin Ohno.
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1202r2=1.1203diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1202 CVSROOT/avail:1.1203
--- CVSROOT/avail:1.1202Thu Oct 26 06:54:29 2006
+++ CVSROOT/avail   Mon Oct 30 20:16:47 2006
@@ -351,7 +351,7 @@
 avail|tommeh|pear/Audio_CAPTCHA
 avail|irokez|pear/OpenDocument
 avail|terrafrost|pear/Math_BigInteger
-avail|shin|pear/Services_YouTube,pear/Selenium,peardoc
+avail|shin|pear/Services_YouTube,pear/Testing_Selenium,peardoc
 avail|squiz|pear/PHP_CodeSniffer,peardoc
 avail|shomas|pear/HTML_TagCloud,peardoc
 avail|nandika|pecl/axis2

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

[PHP-CVS] cvs: CVSROOT / avail

2006-10-26 Thread Martin Jansen 
mj  Thu Oct 26 06:54:29 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * pear/XML_RPC2 karma for Alan Langford.
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1201r2=1.1202diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1201 CVSROOT/avail:1.1202
--- CVSROOT/avail:1.1201Thu Oct 26 00:47:44 2006
+++ CVSROOT/avail   Thu Oct 26 06:54:29 2006
@@ -360,6 +360,7 @@
 avail|itrebal|pear/Net_MPD,peardoc
 avail|mic|pear/Text_Wiki,peardoc
 avail|iwarner|pear/HTML_Page2,peardoc
+avail|instance|pear/XML_RPC2,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

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

[PHP-CVS] cvs: CVSROOT / avail

2006-10-25 Thread Martin Jansen 
mj  Wed Oct 25 08:09:24 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * HTML_Page2 karma for Ian Warner.
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1199r2=1.1200diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1199 CVSROOT/avail:1.1200
--- CVSROOT/avail:1.1199Fri Oct 20 16:43:05 2006
+++ CVSROOT/avail   Wed Oct 25 08:09:23 2006
@@ -359,6 +359,7 @@
 avail|kouichi66|pear/PHP_Annotation,peardoc
 avail|itrebal|pear/Net_MPD,peardoc
 avail|mic|pear/Text_Wiki,peardoc
+avail|iwarner|pear/HTML_Page2,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

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

[PHP-CVS] cvs: CVSROOT / avail

2006-10-20 Thread Martin Jansen 
mj  Fri Oct 20 16:43:05 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * Text_Wiki karma for Michele Tomaiuolo and peardoc for some recently added
accounts.
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1198r2=1.1199diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1198 CVSROOT/avail:1.1199
--- CVSROOT/avail:1.1198Thu Oct 19 14:17:13 2006
+++ CVSROOT/avail   Fri Oct 20 16:43:05 2006
@@ -356,8 +356,9 @@
 avail|shomas|pear/HTML_TagCloud,peardoc
 avail|nandika|pecl/axis2
 avail|wudicgi|pear/Crypt_XXTEA,peardoc
-avail|kouichi66|pear/PHP_Annotation
-avail|itrebal|pear/Net_MPD
+avail|kouichi66|pear/PHP_Annotation,peardoc
+avail|itrebal|pear/Net_MPD,peardoc
+avail|mic|pear/Text_Wiki,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

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

[PHP-CVS] cvs: CVSROOT / avail

2006-10-03 Thread Martin Jansen 
mj  Tue Oct  3 08:57:11 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * pearweb karma for Arnaud Limbourg
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1188r2=1.1189diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1188 CVSROOT/avail:1.1189
--- CVSROOT/avail:1.1188Mon Oct  2 09:47:13 2006
+++ CVSROOT/avail   Tue Oct  3 08:57:11 2006
@@ -68,7 +68,7 @@
 
avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog,pajoye,timj,clay|php-src/pear,pear-core
 
 # PEAR website and weekly news
-avail|wez,alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,antonio,alexmerz,jan,toby,draber,cellog,dufuz,danielc,lsmith|pearweb
+avail|wez,alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,antonio,alexmerz,jan,toby,draber,cellog,dufuz,danielc,lsmith,arnaud|pearweb
 
avail|arnaud,bjoern,chregu,dams,david,jmcastagnetto,rashid,tuupola,silvano|pearweb/weeklynews
 # PEAR website QA
 avail|arnaud|pearweb/public_html/qa

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

[PHP-CVS] cvs: CVSROOT / avail

2006-10-02 Thread Martin Jansen 
mj  Mon Oct  2 09:47:13 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * pear/Crypt_XXTEA for Wudi.
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1187r2=1.1188diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1187 CVSROOT/avail:1.1188
--- CVSROOT/avail:1.1187Fri Sep 29 06:50:35 2006
+++ CVSROOT/avail   Mon Oct  2 09:47:13 2006
@@ -356,6 +356,7 @@
 avail|squiz|pear/PHP_CodeSniffer,peardoc
 avail|shomas|pear/HTML_TagCloud,peardoc
 avail|nandika|pecl/axis2
+avail|wudicgi|pear/Crypt_XXTEA,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

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

[PHP-CVS] cvs: CVSROOT / avail

2006-09-29 Thread Martin Jansen 
mj  Fri Sep 29 06:50:35 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * pear/PEAR_Frontend_Web karma for Clay Loveless.
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1186r2=1.1187diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1186 CVSROOT/avail:1.1187
--- CVSROOT/avail:1.1186Thu Sep 28 10:46:08 2006
+++ CVSROOT/avail   Fri Sep 29 06:50:35 2006
@@ -201,7 +201,7 @@
 
avail|jah,chriskl|php-src/ext/pgsql,phpdoc/en/reference/pgsql,php-src/NEWS,php-src/ext/pdo_pgsql
 avail|ostborn|php-src/ext/phpdoc,pecl/phpdoc,pecl/soap
 avail|delatbabel,justinpatrin|pear/Text_Wiki
-avail|clay|pear/VersionControl,pear/XML_RSS
+avail|clay|pear/VersionControl,pear/XML_RSS,pear/PEAR_Frontend_Web
 avail|mfonda|pear/Crypt_HMAC
 avail|mfonda|pear/Crypt_Blowfish
 
avail|firman|pear/Math,pear/Math_Numerical_RootFinding,pear/Contact_AddressBook,pear/File

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

[PHP-CVS] cvs: CVSROOT / avail

2006-09-28 Thread Martin Jansen 
mj  Thu Sep 28 07:01:26 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * pear-core karma for Clay Loveless.
  
  # Requested by Greg Beaver.
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1183r2=1.1184diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1183 CVSROOT/avail:1.1184
--- CVSROOT/avail:1.1183Thu Sep 14 18:26:54 2006
+++ CVSROOT/avail   Thu Sep 28 07:01:26 2006
@@ -65,7 +65,7 @@
 
avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,datenpunk,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,!
 
darknoise,tarjei,toby,danielc,ieure,metz,gurugeek,rich_y,asnagy,muesli,hcebay,khassani,zamana,aidan,dufuz,sergiosgc,kouber,enemerson,iridium,ortega,guillaume,koyama,scottmattocks,eric,wenz,goetsch,tacker,aph,bolk,cweiske,amt,jinxidoru,cbleek,nosey,abaker,jayeshsh,fredericpoeydome,sean,toggg,navin,pfischer,davidc,markus,cross,crafics,roychri,kore,troehr,sfrausch,bdunlap,drewish,firman,epte,timj,taak,ssuceveanu,bate,anant,hirose31,amistry,thesee,jausions,ostborn,wiesemann|pear,peardoc
 
 # PEAR bits in the main php-src module
-avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog,pajoye,timj|php-src/pear,pear-core
+avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog,pajoye,timj,clay|php-src/pear,pear-core
 
 # PEAR website and weekly news
 
avail|wez,alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,antonio,alexmerz,jan,toby,draber,cellog,dufuz,danielc,lsmith|pearweb

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

[PHP-CVS] cvs: CVSROOT / avail

2006-09-28 Thread Martin Jansen 
mj  Thu Sep 28 07:51:52 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * HTML_TagCloud karma for Shoma Suzuki
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1184r2=1.1185diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1184 CVSROOT/avail:1.1185
--- CVSROOT/avail:1.1184Thu Sep 28 07:01:26 2006
+++ CVSROOT/avail   Thu Sep 28 07:51:51 2006
@@ -354,6 +354,7 @@
 avail|terrafrost|pear/Math_BigInteger
 avail|shin|pear/Services_YouTube,pear/Selenium,peardoc
 avail|squiz|pear/PHP_CodeSniffer,peardoc
+avail|shomas|pear/HTML_TagCloud,peardoc
 
 
 # php windows installer

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

[PHP-CVS] cvs: CVSROOT / avail

2006-09-08 Thread Martin Jansen 
mj  Fri Sep  8 08:05:57 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * peardoc karma for Adam Ashley
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1179r2=1.1180diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1179 CVSROOT/avail:1.1180
--- CVSROOT/avail:1.1179Thu Sep  7 14:08:45 2006
+++ CVSROOT/avail   Fri Sep  8 08:05:56 2006
@@ -74,7 +74,7 @@
 avail|arnaud|pearweb/public_html/qa
 
 # Some people get access to the peardoc
-avail|vincentlascaux,damian,techtonik,sroebke,thierry_bo,schst,mcgyver5,sousk,gurugeek,norbert_m,didou,poz,romain,haruki,jurbo,kusor,cipri,yannick,radzaw,adamg,justinpatrin,peterhuewe,ssttoo,mfonda,shimooka,jystewart,xolphin,takagi|peardoc
+avail|vincentlascaux,damian,techtonik,sroebke,thierry_bo,schst,mcgyver5,sousk,gurugeek,norbert_m,didou,poz,romain,haruki,jurbo,kusor,cipri,yannick,radzaw,adamg,justinpatrin,peterhuewe,ssttoo,mfonda,shimooka,jystewart,xolphin,takagi,aashley|peardoc
 avail|elf|peardoc/ja
 
 # Some people get only access to specific languages for phpdoc

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

[PHP-CVS] cvs: CVSROOT / avail

2005-11-14 Thread Martin Jansen 
mj  Mon Nov 14 07:33:02 2005 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  * XML_RSS karma for Clay Loveless.
  
  
http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1045r2=1.1046ty=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1045 CVSROOT/avail:1.1046
--- CVSROOT/avail:1.1045Sat Oct 29 07:00:53 2005
+++ CVSROOT/avail   Mon Nov 14 07:33:01 2005
@@ -191,7 +191,7 @@
 
avail|jah,chriskl|php-src/ext/pgsql,phpdoc/en/reference/pgsql,php-src/NEWS,php-src/ext/pdo_pgsql
 avail|ostborn|php-src/ext/phpdoc,pecl/phpdoc,pecl/soap,pear/Image_GIS
 avail|delatbabel,justinpatrin|pear/Text_Wiki
-avail|clay|pear/VersionControl
+avail|clay|pear/VersionControl,pear/XML_RSS
 avail|mfonda|pear/Crypt_HMAC
 avail|mfonda|pear/Crypt_Blowfish
 
avail|firman|pear/Math,pear/Math_Numerical_RootFinding,pear/Contact_AddressBook,pear/File

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

[PHP-CVS] cvs: CVSROOT / avail

2005-10-11 Thread Martin Jansen 
mj  Tue Oct 11 09:57:25 2005 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  * pear/XML_Feed_Parser for James Stewart.
  
  
http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1037r2=1.1038ty=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1037 CVSROOT/avail:1.1038
--- CVSROOT/avail:1.1037Sun Oct  9 04:46:01 2005
+++ CVSROOT/avail   Tue Oct 11 09:57:24 2005
@@ -273,7 +273,7 @@
 avail|ksadlocha|pecl/simplesql
 avail|cipri|pear/Mail_Mime,pear/File_DNS
 avail|luckec|pear/HTTP_SessionServer,pear/Services_Ebay,pear/Date_Holidays
-avail|jystewart|pear/Services_Technorati
+avail|jystewart|pear/Services_Technorati,pear/XML_Feed_Parser
 avail|msmarcal|pear/Image_Barcode
 avail|uw|pecl/maxdb
 avail|magnus,michael|Zend/tests,ZendEngine2/tests

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

[PHP-CVS] cvs: CVSROOT / avail

2005-09-10 Thread Martin Jansen 
mj  Sat Sep 10 08:54:09 2005 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  * Karma for peardoc and pear/HTML_Table for Mark Wiesemann.
  
  
http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1021r2=1.1022ty=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1021 CVSROOT/avail:1.1022
--- CVSROOT/avail:1.1021Fri Sep  9 19:39:26 2005
+++ CVSROOT/avail   Sat Sep 10 08:54:08 2005
@@ -68,7 +68,7 @@
 
avail|arnaud,bjoern,chregu,dams,david,jmcastagnetto,rashid,tuupola,silvano|pearweb/weeklynews
 
 # Some people get access to the peardoc
-avail|vincentlascaux,damian,techtonik,sroebke,thierry_bo,schst,mcgyver5,sousk,gurugeek,norbert_m,didou,poz,romain,haruki,jurbo,kusor,cipri,yannick,radzaw,adamg,justinpatrin,peterhuewe,ssttoo,jausions,mfonda,shimooka,jystewart|peardoc
+avail|vincentlascaux,damian,techtonik,sroebke,thierry_bo,schst,mcgyver5,sousk,gurugeek,norbert_m,didou,poz,romain,haruki,jurbo,kusor,cipri,yannick,radzaw,adamg,justinpatrin,peterhuewe,ssttoo,jausions,mfonda,shimooka,jystewart,wiesemann|peardoc
 avail|elf|peardoc/ja
 
 # Some people get only access to specific languages for phpdoc
@@ -256,7 +256,7 @@
 avail|johannes|pecl/idn
 avail|jimi|smbc
 avail|justinpatrin|pear/DB_DataObject_FormBuilder
-avail|wiesemann|pear/DB_Table
+avail|wiesemann|pear/DB_Table,pear/HTML_Table
 avail|jausions|pear/Template
 avail|schst,luckec|pecl/id3
 avail|gabe,jlesueur|pecl/zeroconf

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