Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard pack.c /ext/standard/tests/strings pack.phpt
FYI: Reverted my bad pack test changes, just verified that the latest
gcc-4.2 branch on Darwin returns 0 rather than -1 for the following
code:
#include
int main() {
double foo = (double)4294967296LL;
printf("%d\n", (unsigned long)(foo));
}
- Shire
[EMAIL PROTECTED]
[EMAIL PROTECTED]
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/strings pack.phpt
shire Fri Apr 13 02:15:13 2007 UTC Modified files: /php-src/ext/standard/tests/strings pack.phpt Log: MFB: reverting incorrect changes to pack test # only a problem on darwin, latest gcc-4.2 branch works as expected. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/pack.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/standard/tests/strings/pack.phpt diff -u php-src/ext/standard/tests/strings/pack.phpt:1.4 php-src/ext/standard/tests/strings/pack.phpt:1.5 --- php-src/ext/standard/tests/strings/pack.phpt:1.4Tue Apr 3 19:50:43 2007 +++ php-src/ext/standard/tests/strings/pack.phptFri Apr 13 02:15:12 2007 @@ -145,7 +145,7 @@ ) Array ( -[1] => -1 +[1] => 0 ) Array ( @@ -185,7 +185,7 @@ ) Array ( -[1] => -1 +[1] => 0 ) Array ( @@ -233,7 +233,7 @@ ) Array ( -[1] => -1 +[1] => 0 ) Array ( @@ -305,7 +305,7 @@ ) Array ( -[1] => -1 +[1] => 0 ) Array ( -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings pack.phpt
shire Fri Apr 13 02:15:07 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings pack.phpt Log: reverting incorrect changes to pack test # only a problem on darwin, latest gcc-4.2 branch works as expected. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/pack.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/standard/tests/strings/pack.phpt diff -u php-src/ext/standard/tests/strings/pack.phpt:1.1.2.3 php-src/ext/standard/tests/strings/pack.phpt:1.1.2.4 --- php-src/ext/standard/tests/strings/pack.phpt:1.1.2.3Tue Apr 3 19:50:40 2007 +++ php-src/ext/standard/tests/strings/pack.phptFri Apr 13 02:15:07 2007 @@ -145,7 +145,7 @@ ) Array ( -[1] => -1 +[1] => 0 ) Array ( @@ -185,7 +185,7 @@ ) Array ( -[1] => -1 +[1] => 0 ) Array ( @@ -233,7 +233,7 @@ ) Array ( -[1] => -1 +[1] => 0 ) Array ( @@ -305,7 +305,7 @@ ) Array ( -[1] => -1 +[1] => 0 ) Array ( -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS
stasFri Apr 13 00:55:48 2007 UTC Modified files: (Branch: PHP_4_4) /php-srcNEWS Log: fix for #38236 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.221&r2=1.1247.2.920.2.222&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.221 php-src/NEWS:1.1247.2.920.2.222 --- php-src/NEWS:1.1247.2.920.2.221 Wed Apr 11 06:13:02 2007 +++ php-src/NEWSFri Apr 13 00:55:48 2007 @@ -1,6 +1,8 @@ PHP 4 NEWS ||| ?? ??? 2007, Version 4.4.7 +- Fixed bug #38236 (binary data gets corrupted on multipart/formdata POST) + (patch by [EMAIL PROTECTED]) 11 Apr 2007, Version 4.4.7RC1 - Fixed MOPB-33-2007 (PHP mail() Message ASCIIZ Byte Truncation). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /main php_variables.c rfc1867.c
stasFri Apr 13 00:42:48 2007 UTC
Modified files: (Branch: PHP_4_4)
/php-src/main rfc1867.c php_variables.c
Log:
fix for #38236 (patch by [EMAIL PROTECTED])
http://cvs.php.net/viewvc.cgi/php-src/main/rfc1867.c?r1=1.122.2.34.2.3&r2=1.122.2.34.2.4&diff_format=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.122.2.34.2.3
php-src/main/rfc1867.c:1.122.2.34.2.4
--- php-src/main/rfc1867.c:1.122.2.34.2.3 Mon Jan 1 09:46:50 2007
+++ php-src/main/rfc1867.c Fri Apr 13 00:42:48 2007
@@ -16,7 +16,7 @@
| Jani Taskinen <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: rfc1867.c,v 1.122.2.34.2.3 2007/01/01 09:46:50 sebastian Exp $ */
+/* $Id: rfc1867.c,v 1.122.2.34.2.4 2007/04/13 00:42:48 stas Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -37,7 +37,7 @@
#if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING)
#include "ext/mbstring/mbstring.h"
-static void safe_php_register_variable(char *var, char *strval, zval
*track_vars_array, zend_bool override_protection TSRMLS_DC);
+static void safe_php_register_variable(char *var, char *strval, int val_len,
zval *track_vars_array, zend_bool override_protection TSRMLS_DC);
#define SAFE_RETURN { \
php_mb_flush_gpc_variables(num_vars, val_list, len_list, array_ptr
TSRMLS_CC); \
@@ -61,7 +61,7 @@
php_mb_gpc_encoding_converter(val_list, len_list,
num_vars, NULL, NULL TSRMLS_CC);
}
for (i=0; i filename) {
- safe_php_register_variable(lbuf, s+1, NULL, 0
TSRMLS_CC);
+ safe_php_register_variable(lbuf, s+1,
strlen(s+1), NULL, 0 TSRMLS_CC);
} else {
- safe_php_register_variable(lbuf, filename,
NULL, 0 TSRMLS_CC);
+ safe_php_register_variable(lbuf, filename,
strlen(filename), NULL, 0 TSRMLS_CC);
}
/* Add $foo[name] */
@@ -1140,7 +1141,7 @@
} else {
sprintf(lbuf, "%s_type", param);
}
- safe_php_register_variable(lbuf, cd, NULL, 0 TSRMLS_CC);
+ safe_php_register_variable(lbuf, cd, strlen(cd), NULL,
0 TSRMLS_CC);
/* Add $foo[type] */
if (is_arr_upload) {
@@ -1162,7 +1163,7 @@
magic_quotes_gpc = PG(magic_quotes_gpc);
PG(magic_quotes_gpc) = 0;
/* if param is of form xxx[.*] this will cut it to xxx
*/
- safe_php_register_variable(param, temp_filename, NULL,
1 TSRMLS_CC);
+ safe_php_register_variable(param, temp_filename,
strlen(temp_filename), NULL, 1 TSRMLS_CC);
/* Add $foo[tmp_name] */
if (is_arr_upload) {
http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.45.2.13.2.9&r2=1.45.2.13.2.10&diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.45.2.13.2.9
php-src/main/php_variables.c:1.45.2.13.2.10
--- php-src/main/php_variables.c:1.45.2.13.2.9 Mon Mar 26 11:19:37 2007
+++ php-src/main/php_variables.cFri Apr 13 00:42:48 2007
@@ -16,7 +16,7 @@
| Zeev Suraski <[EMAIL PROTECTED]>|
+--+
*/
-/* $Id: php_variables.c,v 1.45.2.13.2.9 2007/03/26 11:19:37 tony2001 Exp $ */
+/* $Id: php_variables.c,v 1.45.2.13.2.10 2007/04/13 00:42:48 stas Exp $ */
#include
#include "php.h"
@@ -225,27 +225,33 @@
SAPI_API SAPI_POST_HANDLER_FUNC(php_std_post_handler)
{
- char *var, *val;
- char *strtok_buf = NULL;
+ char *var, *val, *e, *s, *p;
zval *array_ptr = (zval *) arg;
if (SG(request_info).post_data==NULL) {
return;
}
- var = php_strtok_r(SG(request_info).post_data, "&", &strtok_buf);
+ s = SG(request_info).post_data;
+ e = s + SG(request_info).post_data_length;
- while (var) {
- val = strchr(var, '=');
- if (val) { /* have a value */
+ while (s < e && (p = memchr(s, '&', (e - s {
+last_value:
+ if ((val = memchr(s, '=', (p - s { /* have a value */
int val_len;
- *val++ = '\0';
- php_url_decode(var, strlen(var));
- val_len = php_url_decode(val, strlen(val));
+ var = s;
+
+ php_url_decode(var, (val - s));
+ val++;
+ val_len = php_url_decode(val, (p - val));
php_register_varia
Re: [PHP-CVS] cvs: php-src /main snprintf.c
Hey Marcus,
Yes, SIZEOF_LONG_LONG is defined to 8 in main/config.w32.h
#define SIZEOF_LONG_LONG 8 /* defined as __int64 */
Edin
Marcus Boerger wrote:
> Hello Antony,
>
> under windows, where this is coming from (iirc), there is "__int64". Is
> that mapped to SIZEOF_LONG_LONG and don't you need to check for the
> actual value being 8?
>
> best regards
> marcus
>
> Friday, April 13, 2007, 12:00:56 AM, you wrote:
>
>> tony2001Thu Apr 12 22:00:56 2007 UTC
>
>> Modified files:
>> /php-src/main snprintf.c
>> Log:
>> add support for %I64(u|d) to sprintf() utilities
>>
>>
>> http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.54&r2=1.55&diff_format=u
>> Index: php-src/main/snprintf.c
>> diff -u php-src/main/snprintf.c:1.54 php-src/main/snprintf.c:1.55
>> --- php-src/main/snprintf.c:1.54Mon Apr 9 15:35:49 2007
>> +++ php-src/main/snprintf.c Thu Apr 12 22:00:56 2007
>> @@ -16,7 +16,7 @@
>>+--+
>> */
>>
>> -/* $Id: snprintf.c,v 1.54 2007/04/09 15:35:49 dmitry Exp $ */
>> +/* $Id: snprintf.c,v 1.55 2007/04/12 22:00:56 tony2001 Exp $ */
>>
>>
>> #include "php.h"
>> @@ -706,6 +706,16 @@
>> fmt++;
>> modifier = LM_LONG_DOUBLE;
>> break;
>> + case 'I':
>> + fmt++;
>> +#if SIZEOF_LONG_LONG
>> + if (*fmt == '6' && *(fmt+1) == '4') {
>> + fmt += 2;
>> + modifier = LM_LONG_LONG;
>> + } else
>> +#endif
>> + modifier = LM_LONG;
>> + break;
>> case 'l':
>> fmt++;
>> #if SIZEOF_LONG_LONG
>
>
>
>
> Best regards,
> Marcus
>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main snprintf.c
Hello Antony,
under windows, where this is coming from (iirc), there is "__int64". Is
that mapped to SIZEOF_LONG_LONG and don't you need to check for the
actual value being 8?
best regards
marcus
Friday, April 13, 2007, 12:00:56 AM, you wrote:
> tony2001Thu Apr 12 22:00:56 2007 UTC
> Modified files:
> /php-src/main snprintf.c
> Log:
> add support for %I64(u|d) to sprintf() utilities
>
>
> http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.54&r2=1.55&diff_format=u
> Index: php-src/main/snprintf.c
> diff -u php-src/main/snprintf.c:1.54 php-src/main/snprintf.c:1.55
> --- php-src/main/snprintf.c:1.54Mon Apr 9 15:35:49 2007
> +++ php-src/main/snprintf.c Thu Apr 12 22:00:56 2007
> @@ -16,7 +16,7 @@
>+--+
> */
>
> -/* $Id: snprintf.c,v 1.54 2007/04/09 15:35:49 dmitry Exp $ */
> +/* $Id: snprintf.c,v 1.55 2007/04/12 22:00:56 tony2001 Exp $ */
>
>
> #include "php.h"
> @@ -706,6 +706,16 @@
> fmt++;
> modifier = LM_LONG_DOUBLE;
> break;
> + case 'I':
> + fmt++;
> +#if SIZEOF_LONG_LONG
> + if (*fmt == '6' && *(fmt+1) == '4') {
> + fmt += 2;
> + modifier = LM_LONG_LONG;
> + } else
> +#endif
> + modifier = LM_LONG;
> + break;
> case 'l':
> fmt++;
> #if SIZEOF_LONG_LONG
Best regards,
Marcus
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main snprintf.c
tony2001Thu Apr 12 22:01:20 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main snprintf.c
Log:
MFH: add support for %I64(u|d) to sprintf() utilities
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.37.2.4.2.10&r2=1.37.2.4.2.11&diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.37.2.4.2.10
php-src/main/snprintf.c:1.37.2.4.2.11
--- php-src/main/snprintf.c:1.37.2.4.2.10 Mon Feb 26 12:05:52 2007
+++ php-src/main/snprintf.c Thu Apr 12 22:01:20 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: snprintf.c,v 1.37.2.4.2.10 2007/02/26 12:05:52 tony2001 Exp $ */
+/* $Id: snprintf.c,v 1.37.2.4.2.11 2007/04/12 22:01:20 tony2001 Exp $ */
#include "php.h"
@@ -708,6 +708,16 @@
fmt++;
modifier = LM_LONG_DOUBLE;
break;
+ case 'I':
+ fmt++;
+#if SIZEOF_LONG_LONG
+ if (*fmt == '6' && *(fmt+1) == '4') {
+ fmt += 2;
+ modifier = LM_LONG_LONG;
+ } else
+#endif
+ modifier = LM_LONG;
+ break;
case 'l':
fmt++;
#if SIZEOF_LONG_LONG
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main snprintf.c
tony2001Thu Apr 12 22:00:56 2007 UTC
Modified files:
/php-src/main snprintf.c
Log:
add support for %I64(u|d) to sprintf() utilities
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.54&r2=1.55&diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.54 php-src/main/snprintf.c:1.55
--- php-src/main/snprintf.c:1.54Mon Apr 9 15:35:49 2007
+++ php-src/main/snprintf.c Thu Apr 12 22:00:56 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: snprintf.c,v 1.54 2007/04/09 15:35:49 dmitry Exp $ */
+/* $Id: snprintf.c,v 1.55 2007/04/12 22:00:56 tony2001 Exp $ */
#include "php.h"
@@ -706,6 +706,16 @@
fmt++;
modifier = LM_LONG_DOUBLE;
break;
+ case 'I':
+ fmt++;
+#if SIZEOF_LONG_LONG
+ if (*fmt == '6' && *(fmt+1) == '4') {
+ fmt += 2;
+ modifier = LM_LONG_LONG;
+ } else
+#endif
+ modifier = LM_LONG;
+ break;
case 'l':
fmt++;
#if SIZEOF_LONG_LONG
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/json json.c /ext/json/tests 002.phpt bug41034.phpt
On 04/12/2007 11:40 PM, Ilia Alshanetsky wrote: iliaa Thu Apr 12 19:40:38 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/json/tests bug41034.phpt Modified files: /php-src NEWS /php-src/ext/json json.c /php-src/ext/json/tests 002.phpt Log: Fixed bug #41034 (json_encode() ignores null byte started keys in arrays) MFB ? -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/json json.c /ext/json/tests 002.phpt bug41034.phpt
iliaa Thu Apr 12 19:40:38 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/json/tests bug41034.phpt
Modified files:
/php-srcNEWS
/php-src/ext/json json.c
/php-src/ext/json/tests 002.phpt
Log:
Fixed bug #41034 (json_encode() ignores null byte started keys in arrays)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.640&r2=1.2027.2.547.2.641&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.640 php-src/NEWS:1.2027.2.547.2.641
--- php-src/NEWS:1.2027.2.547.2.640 Thu Apr 12 18:39:45 2007
+++ php-src/NEWSThu Apr 12 19:40:38 2007
@@ -4,6 +4,8 @@
- Fixed bug #41063 (chdir doesn't like root paths). (Dmitry)
- Fixed bug #41061 ("visibility error" in ReflectionFunction::export()).
(Johannes)
+- Fixed bug #41034 (json_encode() ignores null byte started keys in arrays).
+ (Ilia)
- Fixed bug #40861 (strtotime() doesn't handle double negative relative time
units correctly). (Derick)
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.12&r2=1.9.2.13&diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.9.2.12 php-src/ext/json/json.c:1.9.2.13
--- php-src/ext/json/json.c:1.9.2.12Sun Feb 18 16:54:59 2007
+++ php-src/ext/json/json.c Thu Apr 12 19:40:38 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: json.c,v 1.9.2.12 2007/02/18 16:54:59 iliaa Exp $ */
+/* $Id: json.c,v 1.9.2.13 2007/04/12 19:40:38 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -177,7 +177,7 @@
json_encode_r(buf, *data TSRMLS_CC);
} else if (r == 1) {
if (i == HASH_KEY_IS_STRING) {
-if (key[0] == '\0') {
+if (key[0] == '\0' && Z_TYPE_PP(val) == IS_OBJECT) {
/* Skip protected and private members. */
continue;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/002.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/json/tests/002.phpt
diff -u php-src/ext/json/tests/002.phpt:1.1.2.2
php-src/ext/json/tests/002.phpt:1.1.2.3
--- php-src/ext/json/tests/002.phpt:1.1.2.2 Thu Jul 20 08:56:57 2006
+++ php-src/ext/json/tests/002.phpt Thu Apr 12 19:40:38 2007
@@ -21,7 +21,7 @@
string(2)
string(4) "null"
string(4) "true"
-string(2) "{}"
+string(7) "{"":""}"
string(5) "[[1]]"
string(1) "1"
string(38) ""\u0440\u0443\u0441\u0441\u0438\u0448""
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug41034.phpt?view=markup&rev=1.1
Index: php-src/ext/json/tests/bug41034.phpt
+++ php-src/ext/json/tests/bug41034.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/reflection php_reflection.c /ext/reflection/tests bug41061.phpt
johannesThu Apr 12 18:39:46 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/reflection/tests bug41061.phpt
Modified files:
/php-srcNEWS
/php-src/ext/reflection php_reflection.c
Log:
- Fix bug #41061 ("visibility error" in ReflectionFunction::export())
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.639&r2=1.2027.2.547.2.640&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.639 php-src/NEWS:1.2027.2.547.2.640
--- php-src/NEWS:1.2027.2.547.2.639 Thu Apr 12 15:28:57 2007
+++ php-src/NEWSThu Apr 12 18:39:45 2007
@@ -2,6 +2,8 @@
|||
?? Apr 2007, PHP 5.2.2RC2
- Fixed bug #41063 (chdir doesn't like root paths). (Dmitry)
+- Fixed bug #41061 ("visibility error" in ReflectionFunction::export()).
+ (Johannes)
- Fixed bug #40861 (strtotime() doesn't handle double negative relative time
units correctly). (Derick)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.36&r2=1.164.2.33.2.37&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.36
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.37
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.36 Sat Mar 17
23:00:49 2007
+++ php-src/ext/reflection/php_reflection.c Thu Apr 12 18:39:46 2007
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.36 2007/03/17 23:00:49 tony2001 Exp $
*/
+/* $Id: php_reflection.c,v 1.164.2.33.2.37 2007/04/12 18:39:46 johannes Exp $
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -747,23 +747,27 @@
string_printf(str, "static ");
}
- /* These are mutually exclusive */
- switch (fptr->common.fn_flags & ZEND_ACC_PPP_MASK) {
- case ZEND_ACC_PUBLIC:
- string_printf(str, "public ");
- break;
- case ZEND_ACC_PRIVATE:
- string_printf(str, "private ");
- break;
- case ZEND_ACC_PROTECTED:
- string_printf(str, "protected ");
- break;
- default:
- string_printf(str, " ");
- break;
+ if (fptr->common.scope) {
+ /* These are mutually exclusive */
+ switch (fptr->common.fn_flags & ZEND_ACC_PPP_MASK) {
+ case ZEND_ACC_PUBLIC:
+ string_printf(str, "public ");
+ break;
+ case ZEND_ACC_PRIVATE:
+ string_printf(str, "private ");
+ break;
+ case ZEND_ACC_PROTECTED:
+ string_printf(str, "protected ");
+ break;
+ default:
+ string_printf(str, " ");
+ break;
+ }
+ string_printf(str, "method ");
+ } else {
+ string_printf(str, "function ");
}
- string_printf(str, fptr->common.scope ? "method " : "function ");
if (fptr->op_array.return_reference) {
string_printf(str, "&");
}
@@ -4889,7 +4893,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.36 2007/03/17 23:00:49 tony2001 Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.37 2007/04/12 18:39:46 johannes Exp $");
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug41061.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/bug41061.phpt
+++ php-src/ext/reflection/tests/bug41061.phpt
--TEST--
Reflection Bug #41061 ("visibility error" in ReflectionFunction::export())
--SKIPIF--
--FILE--
===DONE===
--EXPECTF--
Function [ function foo ] {
@@ %sbug41061.php 3 - 4
}
Method [ private method foo ] {
@@ %sbug41061.php 7 - 8
}
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection/tests bug41061.phpt
johannesThu Apr 12 18:31:57 2007 UTC
Added files:
/php-src/ext/reflection/tests bug41061.phpt
Log:
- Add test
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug41061.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/bug41061.phpt
+++ php-src/ext/reflection/tests/bug41061.phpt
--TEST--
Reflection Bug #41061 ("visibility error" in ReflectionFunction::export())
--SKIPIF--
--FILE--
===DONE===
--EXPECTF--
Function [ function foo ] {
@@ %sbug41061.php 3 - 4
}
Method [ private method foo ] {
@@ %sbug41061.php 7 - 8
}
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Thu Apr 12 18:00:09 2007 UTC Modified files: /CVSROOTavail Log: - Welcome GSoC people. http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1263&r2=1.1264&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1263 CVSROOT/avail:1.1264 --- CVSROOT/avail:1.1263Fri Apr 6 22:22:36 2007 +++ CVSROOT/avail Thu Apr 12 18:00:09 2007 @@ -32,7 +32,7 @@ # The Livedocs developers -avail|iliaa,goba,wez,derick,sfox,alan_k,jacques,edink|livedocs +avail|iliaa,goba,wez,derick,sfox,alan_k,jacques,edink,bjori,philip,mike|livedocs # People who work on the Engine avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,sniper,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori|Zend,ZendEngine2,TSRM -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
tony2001Thu Apr 12 13:17:15 2007 UTC
Modified files:
/php-srcrun-tests.php
Log:
bail out if unicode.semantics is On (stream_select() is unable to cast
Unicode streams to FDs)
check stream_select() return value correctly and avoid endless loop
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.316&r2=1.317&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.316 php-src/run-tests.php:1.317
--- php-src/run-tests.php:1.316 Tue Mar 27 20:27:39 2007
+++ php-src/run-tests.php Thu Apr 12 13:17:14 2007
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.316 2007/03/27 20:27:39 helly Exp $ */
+/* $Id: run-tests.php,v 1.317 2007/04/12 13:17:14 tony2001 Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -82,6 +82,10 @@
error_reporting(E_ALL);
ini_set('magic_quotes_runtime',0); // this would break tests by modifying
EXPECT sections
+if (ini_get("unicode.semantics")) {
+ error("It is currently not possible to use run-tests.php with
unicode.semantics=On. Please turn it Off and re-run the tests.");
+}
+
$environment = isset($_ENV) ? $_ENV : array();
// Don't ever guess at the PHP executable location.
@@ -401,7 +405,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.316 $'."\n";
+ echo '$Revision: 1.317 $'."\n";
exit(1);
default:
echo "Illegal switch specified!\n";
@@ -869,7 +873,9 @@
$e = null;
$n = @stream_select($r, $w, $e, $leak_check ? 300 : 60);
- if ($n === 0) {
+ if ($n === false) {
+ break;
+ } else if ($n === 0) {
/* timed out */
$data .= "\n ** ERROR: process timed out **\n";
proc_terminate($proc);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard streamsfuncs.c
tony2001Thu Apr 12 13:15:18 2007 UTC
Modified files:
/php-src/ext/standard streamsfuncs.c
Log:
return success only if succeeded casting at least one stream to fd
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.102&r2=1.103&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.102
php-src/ext/standard/streamsfuncs.c:1.103
--- php-src/ext/standard/streamsfuncs.c:1.102 Mon Apr 9 15:39:16 2007
+++ php-src/ext/standard/streamsfuncs.c Thu Apr 12 13:15:17 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.102 2007/04/09 15:39:16 dmitry Exp $ */
+/* $Id: streamsfuncs.c,v 1.103 2007/04/12 13:15:17 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -620,6 +620,7 @@
zval **elem;
php_stream *stream;
php_socket_t this_fd;
+ int cnt = 0;
if (Z_TYPE_P(stream_array) != IS_ARRAY) {
return 0;
@@ -644,9 +645,10 @@
if (this_fd > *max_fd) {
*max_fd = this_fd;
}
+ cnt++;
}
}
- return 1;
+ return cnt ? 1 : 0;
}
static int stream_array_from_fd_set(zval *stream_array, fd_set *fds TSRMLS_DC)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection/tests 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 021.phpt 022.phpt 023.phpt 024.phpt 025.phpt bu
tony2001Thu Apr 12 12:43:54 2007 UTC Added files: /php-src/ext/reflection/tests 025.phpt Modified files: /php-src/ext/reflection/tests 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 021.phpt 022.phpt 023.phpt 024.phpt bug37816.phpt bug38217.phpt bug38653.phpt bug38942.phpt bug39001.phpt bug39067.phpt bug39884.phpt bug40431.phpt Log: add new test and SKIPIF sections http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/009.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/reflection/tests/009.phpt diff -u php-src/ext/reflection/tests/009.phpt:1.2 php-src/ext/reflection/tests/009.phpt:1.3 --- php-src/ext/reflection/tests/009.phpt:1.2 Tue Oct 17 11:11:45 2006 +++ php-src/ext/reflection/tests/009.phpt Thu Apr 12 12:43:54 2007 @@ -1,5 +1,7 @@ --TEST-- ReflectionMethod::__construct() tests +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/010.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/reflection/tests/010.phpt diff -u php-src/ext/reflection/tests/010.phpt:1.1 php-src/ext/reflection/tests/010.phpt:1.2 --- php-src/ext/reflection/tests/010.phpt:1.1 Tue Oct 17 11:11:45 2006 +++ php-src/ext/reflection/tests/010.phpt Thu Apr 12 12:43:54 2007 @@ -1,5 +1,7 @@ --TEST-- ReflectionMethod::__toString() tests (overriden method) +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/011.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/reflection/tests/011.phpt diff -u php-src/ext/reflection/tests/011.phpt:1.1 php-src/ext/reflection/tests/011.phpt:1.2 --- php-src/ext/reflection/tests/011.phpt:1.1 Tue Oct 17 11:11:45 2006 +++ php-src/ext/reflection/tests/011.phpt Thu Apr 12 12:43:54 2007 @@ -1,5 +1,7 @@ --TEST-- ReflectionExtension::getClasses() +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/012.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/reflection/tests/012.phpt diff -u php-src/ext/reflection/tests/012.phpt:1.1 php-src/ext/reflection/tests/012.phpt:1.2 --- php-src/ext/reflection/tests/012.phpt:1.1 Tue Oct 17 11:11:45 2006 +++ php-src/ext/reflection/tests/012.phpt Thu Apr 12 12:43:54 2007 @@ -1,5 +1,7 @@ --TEST-- ReflectionClass::getDefaultProperties() +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/013.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/reflection/tests/013.phpt diff -u php-src/ext/reflection/tests/013.phpt:1.1 php-src/ext/reflection/tests/013.phpt:1.2 --- php-src/ext/reflection/tests/013.phpt:1.1 Tue Oct 17 11:11:45 2006 +++ php-src/ext/reflection/tests/013.phpt Thu Apr 12 12:43:54 2007 @@ -1,5 +1,7 @@ --TEST-- ReflectionExtension::getFunctions() +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/014.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/reflection/tests/014.phpt diff -u php-src/ext/reflection/tests/014.phpt:1.1 php-src/ext/reflection/tests/014.phpt:1.2 --- php-src/ext/reflection/tests/014.phpt:1.1 Tue Oct 17 11:11:45 2006 +++ php-src/ext/reflection/tests/014.phpt Thu Apr 12 12:43:54 2007 @@ -1,5 +1,7 @@ --TEST-- ReflectionExtension::getConstants() +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/015.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/reflection/tests/015.phpt diff -u php-src/ext/reflection/tests/015.phpt:1.1 php-src/ext/reflection/tests/015.phpt:1.2 --- php-src/ext/reflection/tests/015.phpt:1.1 Tue Oct 17 11:11:45 2006 +++ php-src/ext/reflection/tests/015.phpt Thu Apr 12 12:43:54 2007 @@ -1,5 +1,7 @@ --TEST-- ReflectionExtension::getINIEntries() +--SKIPIF-- + --INI-- user_agent=php --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/016.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/reflection/tests/016.phpt diff -u php-src/ext/reflection/tests/016.phpt:1.1 php-src/ext/reflection/tests/016.phpt:1.2 --- php-src/ext/reflection/tests/016.phpt:1.1 Tue Oct 17 11:11:45 2006 +++ php-src/ext/reflection/tests/016.phpt Thu Apr 12 12:43:54 2007 @@ -2,6 +2,7 @@ ReflectionExtension::getDependencies() --SKIPIF-- http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/017.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/reflection/tests/017.phpt diff -u php-src/ext/reflection/tests/017.phpt:1.1 php-src/ext/reflection/tests/017.phpt:1.2 --- php-src/ext/reflection/tests/017.phpt:1.1 Tue Oct 17 11:11:45 2006 +++ php-src/ext/reflection/tests/017.phpt Thu Apr 12 12:43:54 2007 @@ -1,5 +1,7 @@ --TEST-- ReflectionClass::_
[PHP-CVS] Re: cvs: php-src / php.ini-dist php.ini-recommended
On 04/12/2007 04:44 PM, Lorenzo Alberton wrote: you probably swapped the descriptions. Yeah, thanks for the heads up. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
tony2001Thu Apr 12 12:31:39 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: MFH http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.16&r2=1.231.2.10.2.17&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.16 php-src/php.ini-dist:1.231.2.10.2.17 --- php-src/php.ini-dist:1.231.2.10.2.16Thu Apr 12 10:25:15 2007 +++ php-src/php.ini-distThu Apr 12 12:31:39 2007 @@ -661,13 +661,13 @@ [Pcre] ;PCRE library backtracking limit. -;pcre.recursion_limit=10 +;pcre.backtrack_limit=10 ;PCRE library recursion limit. ;Please note that if you set this value to a high number you may consume all ;the available process stack and eventually crash PHP (due to reaching the ;stack size limit imposed by the Operating System). -;pcre.backtrack_limit=10 +;pcre.recursion_limit=10 [Syslog] ; Whether or not to define the various syslog variables (e.g. $LOG_PID, http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.16&r2=1.179.2.11.2.17&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.16 php-src/php.ini-recommended:1.179.2.11.2.17 --- php-src/php.ini-recommended:1.179.2.11.2.16 Thu Apr 12 10:25:15 2007 +++ php-src/php.ini-recommended Thu Apr 12 12:31:39 2007 @@ -706,13 +706,13 @@ [Pcre] ;PCRE library backtracking limit. -;pcre.recursion_limit=10 +;pcre.backtrack_limit=10 ;PCRE library recursion limit. ;Please note that if you set this value to a high number you may consume all ;the available process stack and eventually crash PHP (due to reaching the ;stack size limit imposed by the Operating System). -;pcre.backtrack_limit=10 +;pcre.recursion_limit=10 [Syslog] ; Whether or not to define the various syslog variables (e.g. $LOG_PID, -- 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
tony2001Thu Apr 12 12:31:02 2007 UTC Modified files: /php-srcphp.ini-dist php.ini-recommended Log: swap the options http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.261&r2=1.262&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.261 php-src/php.ini-dist:1.262 --- php-src/php.ini-dist:1.261 Thu Apr 12 10:24:56 2007 +++ php-src/php.ini-distThu Apr 12 12:31:02 2007 @@ -587,13 +587,13 @@ [Pcre] ;PCRE library backtracking limit. -;pcre.recursion_limit=10 +;pcre.backtrack_limit=10 ;PCRE library recursion limit. ;Please note that if you set this value to a high number you may consume all ;the available process stack and eventually crash PHP (due to reaching the ;stack size limit imposed by the Operating System). -;pcre.backtrack_limit=10 +;pcre.recursion_limit=10 [Syslog] ; Whether or not to define the various syslog variables (e.g. $LOG_PID, http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.210&r2=1.211&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.210 php-src/php.ini-recommended:1.211 --- php-src/php.ini-recommended:1.210 Thu Apr 12 10:24:57 2007 +++ php-src/php.ini-recommended Thu Apr 12 12:31:02 2007 @@ -618,13 +618,13 @@ [Pcre] ;PCRE library backtracking limit. -;pcre.recursion_limit=10 +;pcre.backtrack_limit=10 ;PCRE library recursion limit. ;Please note that if you set this value to a high number you may consume all ;the available process stack and eventually crash PHP (due to reaching the ;stack size limit imposed by the Operating System). -;pcre.backtrack_limit=10 +;pcre.recursion_limit=10 [Syslog] ; Whether or not to define the various syslog variables (e.g. $LOG_PID, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/reflection/tests 008.phpt 009.phpt bug37816.phpt bug38217.phpt bug38653.phpt bug38942.phpt bug39001.phpt bug39067.phpt bug39884.phpt bug40431.phpt
tony2001Thu Apr 12 12:29:48 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/reflection/tests 008.phpt 009.phpt bug37816.phpt bug38217.phpt bug38653.phpt bug38942.phpt bug39001.phpt bug39067.phpt bug39884.phpt bug40431.phpt Log: add missing SKIPIF sections http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/008.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u Index: php-src/ext/reflection/tests/008.phpt diff -u php-src/ext/reflection/tests/008.phpt:1.2.2.2 php-src/ext/reflection/tests/008.phpt:1.2.2.3 --- php-src/ext/reflection/tests/008.phpt:1.2.2.2 Wed Oct 11 15:52:56 2006 +++ php-src/ext/reflection/tests/008.phpt Thu Apr 12 12:29:47 2007 @@ -1,5 +1,7 @@ --TEST-- ReflectionMethod::__construct() tests +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/009.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u Index: php-src/ext/reflection/tests/009.phpt diff -u php-src/ext/reflection/tests/009.phpt:1.2.2.2 php-src/ext/reflection/tests/009.phpt:1.2.2.3 --- php-src/ext/reflection/tests/009.phpt:1.2.2.2 Thu Apr 12 12:23:30 2007 +++ php-src/ext/reflection/tests/009.phpt Thu Apr 12 12:29:47 2007 @@ -1,5 +1,7 @@ --TEST-- ReflectionFunction basic tests +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug37816.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/reflection/tests/bug37816.phpt diff -u php-src/ext/reflection/tests/bug37816.phpt:1.1.2.2 php-src/ext/reflection/tests/bug37816.phpt:1.1.2.3 --- php-src/ext/reflection/tests/bug37816.phpt:1.1.2.2 Mon Jul 10 00:18:53 2006 +++ php-src/ext/reflection/tests/bug37816.phpt Thu Apr 12 12:29:47 2007 @@ -1,5 +1,7 @@ --TEST-- Bug #37816 (ReflectionProperty does not throw exception when accessing protected attribute) +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug38217.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/reflection/tests/bug38217.phpt diff -u php-src/ext/reflection/tests/bug38217.phpt:1.1.2.1 php-src/ext/reflection/tests/bug38217.phpt:1.1.2.2 --- php-src/ext/reflection/tests/bug38217.phpt:1.1.2.1 Wed Jul 26 08:03:48 2006 +++ php-src/ext/reflection/tests/bug38217.phpt Thu Apr 12 12:29:47 2007 @@ -1,5 +1,7 @@ --TEST-- -#38217 (ReflectionClass::newInstanceArgs() tries to allocate too much memory) +Bug #38217 (ReflectionClass::newInstanceArgs() tries to allocate too much memory) +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug38653.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/reflection/tests/bug38653.phpt diff -u php-src/ext/reflection/tests/bug38653.phpt:1.1.2.2 php-src/ext/reflection/tests/bug38653.phpt:1.1.2.3 --- php-src/ext/reflection/tests/bug38653.phpt:1.1.2.2 Wed Aug 30 10:42:49 2006 +++ php-src/ext/reflection/tests/bug38653.phpt Thu Apr 12 12:29:47 2007 @@ -1,5 +1,7 @@ --TEST-- Bug #38653 (memory leak in ReflectionClass::getConstant()) +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug38942.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/reflection/tests/bug38942.phpt diff -u php-src/ext/reflection/tests/bug38942.phpt:1.1.2.2 php-src/ext/reflection/tests/bug38942.phpt:1.1.2.3 --- php-src/ext/reflection/tests/bug38942.phpt:1.1.2.2 Mon Oct 2 08:36:35 2006 +++ php-src/ext/reflection/tests/bug38942.phpt Thu Apr 12 12:29:47 2007 @@ -1,5 +1,7 @@ --TEST-- Bug #38942 (Double old-style-ctor inheritance) +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug39001.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/reflection/tests/bug39001.phpt diff -u php-src/ext/reflection/tests/bug39001.phpt:1.1.2.2 php-src/ext/reflection/tests/bug39001.phpt:1.1.2.3 --- php-src/ext/reflection/tests/bug39001.phpt:1.1.2.2 Mon Oct 2 12:16:35 2006 +++ php-src/ext/reflection/tests/bug39001.phpt Thu Apr 12 12:29:47 2007 @@ -1,5 +1,7 @@ --TEST-- Bug #39001 (ReflectionProperty returns incorrect declaring class for protected properties) +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug39067.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/reflection/tests/bug39067.phpt diff -u php-src/ext/reflection/tests/bug39067.phpt:1.1.2.3 php-src/ext/reflection/tests/bug39067.phpt:1.1.2.4 --- php-src/ext/reflection/tests/bug39067.phpt:1.1.2.3 Fri Oct 6 18:03:19 2006 +++ php-src/ext/reflection/tests/bug39067.phpt Thu Apr 12 12:29:48 2007 @@ -1,5 +1,7 @@ --TEST-- Bug #39067 (getDeclaringClass() and private properties) +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug39884.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/reflection/tests/bug39884.phpt diff -u php-s
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/reflection/tests 009.phpt
tony2001Thu Apr 12 12:23:30 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/reflection/tests 009.phpt
Log:
add new test
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/009.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/009.phpt
+++ php-src/ext/reflection/tests/009.phpt
--TEST--
ReflectionMethod::__construct() tests
--FILE--
getMessage());
}
}
$a = array("", 1, "");
$b = array("", "", 1);
foreach ($a as $key=>$val) {
try {
new ReflectionMethod($val, $b[$key]);
} catch (Exception $e) {
var_dump($e->getMessage());
}
}
echo "Done\n";
?>
--EXPECTF--
string(20) "Invalid method name "
string(21) "Invalid method name 1"
string(21) "Class does not exist"
string(22) "Class a does not exist"
string(21) "Class does not exist"
string(22) "Class a does not exist"
string(21) "Class does not exist"
string(66) "The parameter class is expected to be either a string or an object"
string(21) "Class does not exist"
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php-src / php.ini-dist php.ini-recommended
Hi Tony, tony2001Thu Apr 12 10:24:58 2007 UTC Modified files: /php-src php.ini-dist php.ini-recommended Log: add short descriptions for PCRE ini options http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.260&r2=1.261&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.260 php-src/php.ini-dist:1.261 --- php-src/php.ini-dist:1.260 Thu Dec 21 13:06:03 2006 +++ php-src/php.ini-distThu Apr 12 10:24:56 2007 @@ -586,7 +586,13 @@ ;xmlrpc_errors = 0 [Pcre] +;PCRE library backtracking limit. ;pcre.recursion_limit=10 + +;PCRE library recursion limit. +;Please note that if you set this value to a high number you may consume all +;the available process stack and eventually crash PHP (due to reaching the +;stack size limit imposed by the Operating System). ;pcre.backtrack_limit=10 you probably swapped the descriptions. HTH Best regards, -- Lorenzo Alberton http://pear.php.net/user/quipo ___ Quipo Free Internet - 2 email, 150 Mb di spazio web e molto di più. ADSL, Hardware & Software Online Store -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
tony2001Thu Apr 12 10:25:15 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: MFH http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.15&r2=1.231.2.10.2.16&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.15 php-src/php.ini-dist:1.231.2.10.2.16 --- php-src/php.ini-dist:1.231.2.10.2.15Thu Dec 21 13:05:27 2006 +++ php-src/php.ini-distThu Apr 12 10:25:15 2007 @@ -660,7 +660,13 @@ ;xmlrpc_errors = 0 [Pcre] +;PCRE library backtracking limit. ;pcre.recursion_limit=10 + +;PCRE library recursion limit. +;Please note that if you set this value to a high number you may consume all +;the available process stack and eventually crash PHP (due to reaching the +;stack size limit imposed by the Operating System). ;pcre.backtrack_limit=10 [Syslog] http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.15&r2=1.179.2.11.2.16&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.15 php-src/php.ini-recommended:1.179.2.11.2.16 --- php-src/php.ini-recommended:1.179.2.11.2.15 Thu Dec 21 13:05:27 2006 +++ php-src/php.ini-recommended Thu Apr 12 10:25:15 2007 @@ -705,7 +705,13 @@ ;xmlrpc_errors = 0 [Pcre] +;PCRE library backtracking limit. ;pcre.recursion_limit=10 + +;PCRE library recursion limit. +;Please note that if you set this value to a high number you may consume all +;the available process stack and eventually crash PHP (due to reaching the +;stack size limit imposed by the Operating System). ;pcre.backtrack_limit=10 [Syslog] -- 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
tony2001Thu Apr 12 10:24:58 2007 UTC Modified files: /php-srcphp.ini-dist php.ini-recommended Log: add short descriptions for PCRE ini options http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.260&r2=1.261&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.260 php-src/php.ini-dist:1.261 --- php-src/php.ini-dist:1.260 Thu Dec 21 13:06:03 2006 +++ php-src/php.ini-distThu Apr 12 10:24:56 2007 @@ -586,7 +586,13 @@ ;xmlrpc_errors = 0 [Pcre] +;PCRE library backtracking limit. ;pcre.recursion_limit=10 + +;PCRE library recursion limit. +;Please note that if you set this value to a high number you may consume all +;the available process stack and eventually crash PHP (due to reaching the +;stack size limit imposed by the Operating System). ;pcre.backtrack_limit=10 [Syslog] http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.209&r2=1.210&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.209 php-src/php.ini-recommended:1.210 --- php-src/php.ini-recommended:1.209 Thu Dec 21 13:06:03 2006 +++ php-src/php.ini-recommended Thu Apr 12 10:24:57 2007 @@ -617,7 +617,13 @@ ;xmlrpc_errors = 0 [Pcre] +;PCRE library backtracking limit. ;pcre.recursion_limit=10 + +;PCRE library recursion limit. +;Please note that if you set this value to a high number you may consume all +;the available process stack and eventually crash PHP (due to reaching the +;stack size limit imposed by the Operating System). ;pcre.backtrack_limit=10 [Syslog] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
