date:20110623

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS TSRM/TSRM.c TSRM/TSRM.h TSRM/tsrm.m4 Zend/Makefile.am Zend/Zend.m4 Zend/zend.c Zend/zend.h Zend/zend_alloc.c Zend/zend_execute_API.c Zend/zend_ha

2011-06-23 Thread Jérôme Loyet

Le 23 juin 2011 02:41, Felipe Pena felipe...@gmail.com a écrit :
 Try again, please. :)


yeah it works ! thanks you very much for your time

++ jerome

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

[PHP-CVS] svn: /SVNROOT/ global_avail

2011-06-23 Thread Hannes Magnusson

bjoriThu, 23 Jun 2011 08:05:44 +

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

Log:
Give Knut tests karma

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2011-06-23 08:03:52 UTC (rev 312399)
+++ SVNROOT/global_avail2011-06-23 08:05:44 UTC (rev 312400)
@@ -341,6 +341,7 @@
 avail|michelec|pecl/rsync,phpdoc
 avail|dsr|pecl/sam,phpdoc
 avail|jtansavatdi|pecl/amqp,phpdoc
+avail|knut|php/php-src/*/tests

 # Objective-C bridge
 avail|wez,jan|php/php-objc

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/sapi/apache2handler/sapi_apache2.c trunk/sapi/apache2handler/sapi_apache2.c

2011-06-23 Thread Ilia Alshanetsky

iliaaThu, 23 Jun 2011 14:12:50 +

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

Log:
Fixed a bug with calculation of REQUEST_TIME in apache2

Changed paths:
U   php/php-src/branches/PHP_5_4/sapi/apache2handler/sapi_apache2.c
U   php/php-src/trunk/sapi/apache2handler/sapi_apache2.c

Modified: php/php-src/branches/PHP_5_4/sapi/apache2handler/sapi_apache2.c
===
--- php/php-src/branches/PHP_5_4/sapi/apache2handler/sapi_apache2.c 
2011-06-23 11:36:40 UTC (rev 312401)
+++ php/php-src/branches/PHP_5_4/sapi/apache2handler/sapi_apache2.c 
2011-06-23 14:12:50 UTC (rev 312402)
@@ -338,7 +338,7 @@
 static double php_apache_sapi_get_request_time(TSRMLS_D)
 {
php_struct *ctx = SG(server_context);
-   return apr_time_as_msec(ctx-r-request_time);
+   return ((double) apr_time_as_msec(ctx-r-request_time)) / 1000.0;
 }

 extern zend_module_entry php_apache_module;

Modified: php/php-src/trunk/sapi/apache2handler/sapi_apache2.c
===
--- php/php-src/trunk/sapi/apache2handler/sapi_apache2.c2011-06-23 
11:36:40 UTC (rev 312401)
+++ php/php-src/trunk/sapi/apache2handler/sapi_apache2.c2011-06-23 
14:12:50 UTC (rev 312402)
@@ -338,7 +338,7 @@
 static double php_apache_sapi_get_request_time(TSRMLS_D)
 {
php_struct *ctx = SG(server_context);
-   return apr_time_as_msec(ctx-r-request_time);
+   return ((double) apr_time_as_msec(ctx-r-request_time)) / 1000.0;
 }

 extern zend_module_entry php_apache_module;

-- 
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_4/ext/date/lib/ parse_date.c

2011-06-23 Thread Nuno Lopes

nlopess  Thu, 23 Jun 2011 14:58:02 +

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

Log:
properly regen file to fix coverage data

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/date/lib/parse_date.c

diffs exceeded maximum size
-- 
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/date/lib/ parse_date.c

2011-06-23 Thread Nuno Lopes

nlopess  Thu, 23 Jun 2011 15:00:00 +

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

Log:
MFB: properly regen file to fix coverage data

Changed paths:
U   php/php-src/trunk/ext/date/lib/parse_date.c

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

[PHP-CVS] svn: /SVNROOT/ commit-email.php

2011-06-23 Thread Philip Olson

philip   Thu, 23 Jun 2011 15:02:41 +

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

Log:
removed jani from default php-bugs commits

Changed paths:
U   SVNROOT/commit-email.php

Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2011-06-23 15:00:00 UTC (rev 312406)
+++ SVNROOT/commit-email.php2011-06-23 15:02:41 UTC (rev 312407)
@@ -25,7 +25,7 @@
 '|^web/bugtracker|' = array('php-webmas...@lists.php.net'),
 '|^web/presentations|' = array('p...@lists.php.net'),
 '|^web/pres2|' = array('p...@lists.php.net'),
-'|^web/php-bugs|' = array('php-webmas...@lists.php.net', 'j...@php.net'),
+'|^web/php-bugs|' = array('php-webmas...@lists.php.net'),
 '|^web/php|' = array('php-webmas...@lists.php.net'),
 '|^web/pecl|' = array('pecl-...@lists.php.net'),


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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/date/tests/date_diff.phpt branches/PHP_5_3/ext/standard/tests/file/001.phpt branches/PHP_5_3/ext/standard/tests/file/005_variation.phpt branches/PHP_5

2011-06-23 Thread Hannes Magnusson

bjoriThu, 23 Jun 2011 21:27:42 +

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

Log:
These are annoyingly slow

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/date/tests/date_diff.phpt
U   php/php-src/branches/PHP_5_3/ext/standard/tests/file/001.phpt
U   php/php-src/branches/PHP_5_3/ext/standard/tests/file/005_variation.phpt
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fread_socket_variation1.phpt
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open02.phpt
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/misc/time_nanosleep_basic.phpt
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities_html4.phpt
U   php/php-src/branches/PHP_5_3/tests/func/005a.phpt
U   php/php-src/branches/PHP_5_3/tests/func/010.phpt
U   php/php-src/branches/PHP_5_4/ext/date/tests/date_diff.phpt
U   php/php-src/branches/PHP_5_4/ext/standard/tests/file/001.phpt
U   php/php-src/branches/PHP_5_4/ext/standard/tests/file/005_variation.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/fread_socket_variation1.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/proc_open02.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/misc/time_nanosleep_basic.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities_html4.phpt
U   php/php-src/branches/PHP_5_4/tests/func/005a.phpt
U   php/php-src/branches/PHP_5_4/tests/func/010.phpt
U   php/php-src/trunk/ext/date/tests/date_diff.phpt
U   php/php-src/trunk/ext/standard/tests/file/001.phpt
U   php/php-src/trunk/ext/standard/tests/file/005_variation.phpt
U   php/php-src/trunk/ext/standard/tests/file/fread_socket_variation1.phpt
U   php/php-src/trunk/ext/standard/tests/general_functions/proc_open02.phpt
U   php/php-src/trunk/ext/standard/tests/misc/time_nanosleep_basic.phpt
U   php/php-src/trunk/ext/standard/tests/strings/htmlentities_html4.phpt
U   php/php-src/trunk/tests/func/005a.phpt
U   php/php-src/trunk/tests/func/010.phpt

Modified: php/php-src/branches/PHP_5_3/ext/date/tests/date_diff.phpt
===
--- php/php-src/branches/PHP_5_3/ext/date/tests/date_diff.phpt	2011-06-23 20:43:19 UTC (rev 312414)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/date_diff.phpt	2011-06-23 21:27:42 UTC (rev 312415)
@@ -1,5 +1,9 @@
 --TEST--
 Extensive test for date_diff().
+--SKIPIF--
+?php
+if (getenv(SKIP_SLOW_TESTS)) die(skip slow test);
+?
 --INI--
 date.timezone=UTC
 --FILE--

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/001.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/001.phpt	2011-06-23 20:43:19 UTC (rev 312414)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/001.phpt	2011-06-23 21:27:42 UTC (rev 312415)
@@ -5,6 +5,7 @@
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 die('skip no symlinks on Windows');
 }
+if (getenv(SKIP_SLOW_TESTS)) die(skip slow test);
 ?
 --FILE--
 ?php

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/005_variation.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/005_variation.phpt	2011-06-23 20:43:19 UTC (rev 312414)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/005_variation.phpt	2011-06-23 21:27:42 UTC (rev 312415)
@@ -5,6 +5,9 @@
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 die('skip Do not run on Windows');
 }
+if (getenv(SKIP_SLOW_TESTS)) {
+die(skip slow test);
+}
 ?
 --FILE--
 ?php

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/fread_socket_variation1.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/fread_socket_variation1.phpt	2011-06-23 20:43:19 UTC (rev 312414)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/fread_socket_variation1.phpt	2011-06-23 21:27:42 UTC (rev 312415)
@@ -1,5 +1,9 @@
 --TEST--
 Testing fread() on a TCP server socket
+--SKIPIF--
+?php
+if (getenv(SKIP_SLOW_TESTS)) die(skip slow test);
+?
 --FILE--
 ?php


Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open02.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open02.phpt	2011-06-23 20:43:19 UTC (rev 312414)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open02.phpt	2011-06-23 21:27:42 UTC (rev 312415)
@@ -4,6 +4,7 @@
 ?php
 if (!is_executable('/bin/sleep')) echo 'skip no sleep';
 if (!is_executable('/usr/bin/nohup')) echo 'skip no nohup';
+if (getenv('SKIP_SLOW_TESTS')) echo 'skip slow test';
 ?
 --FILE--
 ?php

Modified:

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/basic_functions.c trunk/ext/standard/basic_functions.c

2011-06-23 Thread Felipe Pena

felipe   Thu, 23 Jun 2011 21:53:25 +

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

Log:
- Missing valid path check

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
U   php/php-src/trunk/ext/standard/basic_functions.c

Modified: php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-06-23 
21:49:43 UTC (rev 312418)
+++ php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-06-23 
21:53:25 UTC (rev 312419)
@@ -4610,7 +4610,7 @@
int opt_err = 0, argc = ZEND_NUM_ARGS();
long erropt = 0;

-   if (zend_parse_parameters(argc TSRMLS_CC, s|lss, message, 
message_len, erropt, opt, opt_len, headers, headers_len) == FAILURE) {
+   if (zend_parse_parameters(argc TSRMLS_CC, s|lps, message, 
message_len, erropt, opt, opt_len, headers, headers_len) == FAILURE) {
return;
}


Modified: php/php-src/trunk/ext/standard/basic_functions.c
===
--- php/php-src/trunk/ext/standard/basic_functions.c2011-06-23 21:49:43 UTC 
(rev 312418)
+++ php/php-src/trunk/ext/standard/basic_functions.c2011-06-23 21:53:25 UTC 
(rev 312419)
@@ -4640,7 +4640,7 @@
int opt_err = 0, argc = ZEND_NUM_ARGS();
long erropt = 0;

-   if (zend_parse_parameters(argc TSRMLS_CC, s|lss, message, 
message_len, erropt, opt, opt_len, headers, headers_len) == FAILURE) {
+   if (zend_parse_parameters(argc TSRMLS_CC, s|lps, message, 
message_len, erropt, opt, opt_len, headers, headers_len) == FAILURE) {
return;
}


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

2011-06-23 Thread Felipe Pena

felipe   Thu, 23 Jun 2011 21:48:15 +

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

Log:
- Fixed crash in error_log() (strlen(NULL)) reported by: shm, Maksymilian 
Arciemowicz

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c

Modified: php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2011-06-23 
21:45:31 UTC (rev 312416)
+++ php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2011-06-23 
21:48:15 UTC (rev 312417)
@@ -4678,7 +4678,7 @@
opt_err = erropt;
}

-   if (opt_err == 3) {
+   if (opt_err == 3  opt) {
if (strlen(opt) != opt_len) {
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_4/Zend/zend_language_parser.y trunk/Zend/zend_language_parser.y

2011-06-23 Thread Felipe Pena

felipe   Fri, 24 Jun 2011 00:38:53 +

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

Log:
- Fixed build on Windows

Changed paths:
U   php/php-src/branches/PHP_5_4/Zend/zend_language_parser.y
U   php/php-src/trunk/Zend/zend_language_parser.y

Modified: php/php-src/branches/PHP_5_4/Zend/zend_language_parser.y
===
--- php/php-src/branches/PHP_5_4/Zend/zend_language_parser.y2011-06-23 
23:00:53 UTC (rev 312424)
+++ php/php-src/branches/PHP_5_4/Zend/zend_language_parser.y2011-06-24 
00:38:53 UTC (rev 312425)
@@ -1150,7 +1150,8 @@
{
TSRMLS_FETCH();
if (CG(parse_error) == 0) {
-   char buffer[120], *end, *str, *tok1 = NULL, *tok2 = 
NULL;
+   char buffer[120];
+   const unsigned char *end, *str, *tok1 = NULL, *tok2 = 
NULL;
unsigned int len = 0, toklen = 0, yystr_len;

CG(parse_error) = 1;
@@ -1158,7 +1159,8 @@
if (LANG_SCNG(yy_text)[0] == 0 
LANG_SCNG(yy_leng) == 1 
memcmp(yystr, ZEND_STRL(\end of file\)) == 
0) {
-   return yystpcpy(yyres, end of file) - yyres;
+   yystpcpy(yyres, end of file);
+   return sizeof(end of file)-1;
}

str = LANG_SCNG(yy_text);
@@ -1183,7 +1185,8 @@
} else {
snprintf(buffer, sizeof(buffer), '%.*s', len, 
str);
}
-   return yystpcpy(yyres, buffer) - yyres;
+   yystpcpy(yyres, buffer);
+   return len + (toklen ? toklen + 1 : 0) + 2;
}
}
if (*yystr == '') {
@@ -1196,7 +1199,8 @@
yyres[yyn] = '\0';
return yyn;
}
-   return yystpcpy(yyres, yystr) - yyres;
+   yystpcpy(yyres, yystr);
+   return strlen(yystr);
 }

 /*

Modified: php/php-src/trunk/Zend/zend_language_parser.y
===
--- php/php-src/trunk/Zend/zend_language_parser.y   2011-06-23 23:00:53 UTC 
(rev 312424)
+++ php/php-src/trunk/Zend/zend_language_parser.y   2011-06-24 00:38:53 UTC 
(rev 312425)
@@ -1150,7 +1150,8 @@
{
TSRMLS_FETCH();
if (CG(parse_error) == 0) {
-   char buffer[120], *end, *str, *tok1 = NULL, *tok2 = 
NULL;
+   char buffer[120];
+   const unsigned char *end, *str, *tok1 = NULL, *tok2 = 
NULL;
unsigned int len = 0, toklen = 0, yystr_len;

CG(parse_error) = 1;
@@ -1158,7 +1159,8 @@
if (LANG_SCNG(yy_text)[0] == 0 
LANG_SCNG(yy_leng) == 1 
memcmp(yystr, ZEND_STRL(\end of file\)) == 
0) {
-   return yystpcpy(yyres, end of file) - yyres;
+   yystpcpy(yyres, end of file);
+   return sizeof(end of file)-1;
}

str = LANG_SCNG(yy_text);
@@ -1183,7 +1185,8 @@
} else {
snprintf(buffer, sizeof(buffer), '%.*s', len, 
str);
}
-   return yystpcpy(yyres, buffer) - yyres;
+   yystpcpy(yyres, buffer);
+   return len + (toklen ? toklen + 1 : 0) + 2;
}
}
if (*yystr == '') {
@@ -1196,7 +1199,8 @@
yyres[yyn] = '\0';
return yyn;
}
-   return yystpcpy(yyres, yystr) - yyres;
+   yystpcpy(yyres, yystr);
+   return strlen(yystr);
 }

 /*

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

2011-06-23 Thread Felipe Pena

felipe   Fri, 24 Jun 2011 00:53:52 +

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

Log:
- BFN

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   2011-06-24 00:38:53 UTC (rev 312425)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-06-24 00:53:52 UTC (rev 312426)
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? ??? 2011, PHP 5.3.7
+- Core:
+  . Fixed crash in error_log(). (Felipe) Reported by Mateusz Kocielski.

 - DateTime extension:
   . Fixed bug where the DateTime object got changed while using date_diff().

-- 
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_4/ NEWS TSRM/TSRM.c TSRM/TSRM.h TSRM/tsrm.m4 Zend/Makefile.am Zend/Zend.m4 Zend/zend.c Zend/zend.h Zend/zend_alloc.c Zend/zend_execute_API.c Zend/zend_ha

[PHP-CVS] svn: /SVNROOT/ global_avail

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/sapi/apache2handler/sapi_apache2.c trunk/sapi/apache2handler/sapi_apache2.c

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/date/lib/ parse_date.c

[PHP-CVS] svn: /php/php-src/trunk/ext/date/lib/ parse_date.c

[PHP-CVS] svn: /SVNROOT/ commit-email.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/date/tests/date_diff.phpt branches/PHP_5_3/ext/standard/tests/file/001.phpt branches/PHP_5_3/ext/standard/tests/file/005_variation.phpt branches/PHP_5

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/basic_functions.c trunk/ext/standard/basic_functions.c

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_language_parser.y trunk/Zend/zend_language_parser.y

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

11 matches

Site Navigation

Mail list logo

Footer information