[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Jun 22 01:33:40 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3441r2=1.3442diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3441 php-src/ChangeLog:1.3442 --- php-src/ChangeLog:1.3441Sun Jun 21 01:33:40 2009 +++ php-src/ChangeLog Mon Jun 22 01:33:38 2009 @@ -1,3 +1,130 @@ +2009-06-21 Scott MacVicar sc...@macvicar.net + +* (PHP_5_3) + NEWS: + BFN - Partially fixed in RC4, fixed properly in the next release. + +* (PHP_5_2) + NEWS: + BFN + +* ext/date/tests/bug48276.phpt + ext/date/tests/bug48276.phpt + ext/date/tests/bug48276.phpt: +1.1.4; + Specific test for bug #48276 + +* (PHP_5_2) + ext/date/php_date.c + ext/date/php_date.c: + MFH Fix bug #48276 - year is a long long so we need %lld so big endian + systems print the correct value. + +* ext/date/php_date.c: + Fix bug #48276 - year is a long long so we need %lld so big endian systems + print the correct value. + +2009-06-21 Hannes Magnusson hannes.magnus...@gmail.com + +* ext/date/php_date.c: + MFB: Fix proto and arginfo + +* (PHP_5_3) + ext/date/php_date.c: + Fix proto and arginfo + +* (PHP_5_3) + UPGRADING: + Fixed bug#48485 (Error in documentation and upgrade guide) + +2009-06-21 andy wharmby whar...@uk.ibm.com + +* (PHP_5_2) + tests/lang/passByReference_012.phpt + tests/lang/passByReference_012.phpt + tests/lang/string_decimals_001.phpt + tests/lang/string_decimals_001.phpt + tests/lang/this_assignment.phpt + tests/lang/this_assignment.phpt: + New lang tests. + +* tests/lang/passByReference_012.phpt + tests/lang/passByReference_012.phpt + tests/lang/passByReference_012.phpt + tests/lang/string_decimals_001.phpt + tests/lang/string_decimals_001.phpt + tests/lang/string_decimals_001.phpt + tests/lang/this_assignment.phpt + tests/lang/this_assignment.phpt + tests/lang/this_assignment.phpt: +1.1.4; + New lang tests. + +2009-06-21 Johannes Schlüter johan...@schlueters.de + +* sapi/cli/php.1.in: + It's 2009 + +2009-06-21 Ilia Alshanetsky i...@prohost.org + +* (PHP_5_3) + NEWS: + + BFN + +* ext/standard/mail.c: + + MFB: Fixed bug #48620 (X-PHP-Originating-Script assumes no trailing CRLF + in + existing headers) + +* (PHP_5_3) + ext/standard/mail.c: + + Fixed bug #48620 (X-PHP-Originating-Script assumes no trailing CRLF in + existing headers) + +2009-06-21 Johannes Schlüter johan...@schlueters.de + +* (PHP_5_3) + NEWS: + Merge in NEWS from 5.2 + +2009-06-21 Takeshi Abe t...@fixedpoint.jp + +* (PHP_5_3) + NEWS: + entry for bug #48555 + +* (PHP_5_3) + ext/gd/libgd/gdft.c + ext/gd/tests/Tuffy.ttf + ext/gd/tests/bug48555.phpt: + MFH: fixed bug #48555 (ImageFTBBox() differs from previous versions for + texts with new lines) + +* ext/gd/libgd/gdft.c + ext/gd/tests/Tuffy.ttf + ext/gd/tests/Tuffy.ttf + ext/gd/tests/bug48555.phpt + ext/gd/tests/bug48555.phpt: + fixed bug #48555 (ImageFTBBox() differs from previous versions for texts + with new lines) + +2009-06-21 Kalle Sommer Nielsen kalle@gmail.com + +* (PHP_5_3) + UPGRADING: + Fixed typo, its fdf, not fPdf + +* (PHP_5_3) + UPGRADING: + Missing Windows constants + +* (PHP_5_3) + UPGRADING: + get_extension_funcs have been in PHP since php4 + 2009-06-20 Kalle Sommer Nielsen kalle@gmail.com * (PHP_5_2) @@ -47405,7 +47532,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3441 2009/06/21 01:33:40 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3442 2009/06/22 01:33:38 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd/libgd gdft.c /ext/gd/tests Tuffy.ttf bug48555.phpt
tabeSun Jun 21 06:09:46 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/gd/tests Tuffy.ttf bug48555.phpt
Modified files:
/php-src/ext/gd/libgd gdft.c
Log:
MFH: fixed bug #48555 (ImageFTBBox() differs from previous versions for texts
with new lines)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.36.4.9.2.2r2=1.36.4.9.2.3diff_format=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.36.4.9.2.2
php-src/ext/gd/libgd/gdft.c:1.36.4.9.2.3
--- php-src/ext/gd/libgd/gdft.c:1.36.4.9.2.2Wed Mar 18 00:29:42 2009
+++ php-src/ext/gd/libgd/gdft.c Sun Jun 21 06:09:46 2009
@@ -784,6 +784,7 @@
double cos_a = cos (angle);
int len, i = 0, ch;
int x1 = 0, y1 = 0;
+ int xb = x, yb = y;
font_t *font;
fontkey_t fontkey;
char *next;
@@ -924,8 +925,8 @@
/* carriage returns */
if (ch == '\r') {
penf.x = 0;
- x1 = (int)(penf.x * cos_a - penf.y * sin_a + 32) / 64;
- y1 = (int)(penf.x * sin_a + penf.y * cos_a + 32) / 64;
+ x1 = (int)(- penf.y * sin_a + 32) / 64;
+ y1 = (int)(- penf.y * cos_a + 32) / 64;
pen.x = pen.y = 0;
previous = 0; /* clear kerning flag */
next++;
@@ -937,8 +938,10 @@
penf.x = 0;
penf.y -= (long)(face-size-metrics.height *
linespace);
penf.y = (penf.y - 32) -64; /* round to
next pixel row */
- x1 = (int)(penf.x * cos_a - penf.y * sin_a + 32) / 64;
- y1 = (int)(penf.x * sin_a + penf.y * cos_a + 32) / 64;
+ x1 = (int)(- penf.y * sin_a + 32) / 64;
+ y1 = (int)(- penf.y * cos_a + 32) / 64;
+ xb = x + x1;
+ yb = y + y1;
pen.x = pen.y = 0;
previous = 0; /* clear kerning flag */
next++;
@@ -1088,7 +1091,7 @@
/* now, draw to our target surface */
bm = (FT_BitmapGlyph) image;
- gdft_draw_bitmap(tc_cache, im, fg, bm-bitmap, x + x1 +
((pen.x + 31) 6) + bm-left, y - y1 + ((pen.y + 31) 6) - bm-top);
+ gdft_draw_bitmap(tc_cache, im, fg, bm-bitmap, x + x1 +
((pen.x + 31) 6) + bm-left, y + y1 + ((pen.y + 31) 6) - bm-top);
}
/* record current glyph index for kerning */
@@ -1127,14 +1130,14 @@
brect[7] = (int) (normbox.xMin * sin_a + normbox.yMax * cos_a);
/* scale, round and offset brect */
- brect[0] = x + gdroundupdown(brect[0], d2 0);
- brect[1] = y - gdroundupdown(brect[1], d1 0);
- brect[2] = x + gdroundupdown(brect[2], d1 0);
- brect[3] = y - gdroundupdown(brect[3], d2 0);
- brect[4] = x + gdroundupdown(brect[4], d2 0);
- brect[5] = y - gdroundupdown(brect[5], d1 0);
- brect[6] = x + gdroundupdown(brect[6], d1 0);
- brect[7] = y - gdroundupdown(brect[7], d2 0);
+ brect[0] = xb + gdroundupdown(brect[0], d2 0);
+ brect[1] = yb - gdroundupdown(brect[1], d1 0);
+ brect[2] = xb + gdroundupdown(brect[2], d1 0);
+ brect[3] = yb - gdroundupdown(brect[3], d2 0);
+ brect[4] = xb + gdroundupdown(brect[4], d2 0);
+ brect[5] = yb - gdroundupdown(brect[5], d1 0);
+ brect[6] = xb + gdroundupdown(brect[6], d1 0);
+ brect[7] = yb - gdroundupdown(brect[7], d2 0);
}
if (tmpstr) {
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/Tuffy.ttf?view=markuprev=1.1
Index: php-src/ext/gd/tests/Tuffy.ttf
+++ php-src/ext/gd/tests/Tuffy.ttf
!#$%'()*+,-./0123456789:;=?...@abcdefghijklmnopqrstuvwxyz[\]^_`a
0
@
R
d
p
Ö ...@ v ® Ø $ L n ¤ À
Ø:p¦àþJf¤ÂÞ*æVÜp¤ú(2 ®àî...@´ÒÜèô
þ$;IyO¤â*P\GP*.D$ +6WV ý°Å uZ9Q4 ÈþjT
°t°jyT»©Çнª¦þJÛÒþ]
-?1$
Bs¯e¦ë /;N%g´u! f~¯ É+3N~NÍ*-:snDd H
3SQ) êq» n¥ oó Vbq Qa¥ -Ïn'l((ÕwÍ 4,NY9V'0Ö
)PmQ¦ì 1 Aþ¼¨ # f³v f°ýì É2-~pW3Î,+:rrmý²
Ù
Ù
|RHô©V~KJI21±@,':?,':õ-P6=9
$}Z|9¤ß2`aa?7'4Gþ9-?1$,?0%
×
13HNf8·TÄ
z...@um;Óu(PmTr«6)2cï¶Âí#60M)HAV£j=za
pLwuLH
3ÑvÁabÀac4\Ñlà` kM7cvþú[ºe I
{ª1ûÏ?g?+
,9F' +Z . Y, 'F:,
(Ùf}w P-M³¼§+ '...@w¾
,:F' ,Y .? Z+ 'F9,
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
tabeSun Jun 21 06:29:41 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: entry for bug #48555 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.636r2=1.2027.2.547.2.965.2.637diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.636 php-src/NEWS:1.2027.2.547.2.965.2.637 --- php-src/NEWS:1.2027.2.547.2.965.2.636 Thu Jun 18 21:07:08 2009 +++ php-src/NEWSSun Jun 21 06:29:41 2009 @@ -1,6 +1,8 @@ PHPNEWS ||| ?? ??? 2009, PHP 5.3.0 RC 5 +- Fixed bug #48555 (ImageFTBBox() differs from previous versions for texts + with new lines) (Takeshi Abe) 18 Jun 2009, PHP 5.3.0 RC 4 - Upgraded bundled sqlite to version 3.6.15. (Scott) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
johannesSun Jun 21 11:50:38 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: Merge in NEWS from 5.2 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.637r2=1.2027.2.547.2.965.2.638diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.637 php-src/NEWS:1.2027.2.547.2.965.2.638 --- php-src/NEWS:1.2027.2.547.2.965.2.637 Sun Jun 21 06:29:41 2009 +++ php-src/NEWSSun Jun 21 11:50:37 2009 @@ -869,6 +869,853 @@ - Fixed bug #27372 (parse error loading browscap.ini at apache startup). (Jani) +17 Jun 2009, PHP 5.2.10 +- Updated timezone database to version 2009.9 (2009i) (Derick) + +- Added ignore_errors option to http fopen wrapper. (David Zulke, Sara) +- Added new CURL options CURLOPT_REDIR_PROTOCOLS, CURLOPT_PROTOCOLS, + and CURLPROTO_* for redirect fixes in CURL 7.19.4. (Yoram Bar Haim, Stas) +- Added support for Sun CC (FR #46595 and FR #46513). (David Soria Parra) + +- Changed default value of array_unique()'s optional sorting type parameter + back to SORT_STRING to fix backwards compatibility breakage introduced in + PHP 5.2.9. (Moriyoshi) + +- Fixed memory corruptions while reading properties of zip files. (Ilia) +- Fixed memory leak in ob_get_clean/ob_get_flush. (Christian) +- Fixed segfault on invalid session.save_path. (Hannes) +- Fixed leaks in imap when a mail_criteria is used. (Pierre) +- Fixed missing erealloc() in fix for Bug #40091 in spl_autoload_register. (Greg) + +- Fixed bug #48562 (Reference recursion causes segfault when used in + wddx_serialize_vars()). (Felipe) +- Fixed bug #48557 (Numeric string keys in Apache Hashmaps are not cast to + integers). (David Zuelke) +- Fixed bug #48518 (curl crashes when writing into invalid file handle). (Tony) +- Fixed bug #48514 (cURL extension uses same resource name for simple and + multi APIs). (Felipe) +- Fixed bug #48469 (ldap_get_entries() leaks memory on empty search + results). (Patrick) +- Fixed bug #48456 (CPPFLAGS not restored properly in phpize.m4). (Jani, + spisek at kerio dot com) +- Fixed bug #48448 (Compile failure under IRIX 6.5.30 building cast.c). + (Kalle) +- Fixed bug #48441 (ldap_search() sizelimit, timelimit and deref options + persist). (Patrick) +- Fixed bug #48434 (Improve memory_get_usage() accuracy). (Arnaud) +- Fixed bug #48416 (Force a cache limit in ereg() to stop excessive memory + usage). (Scott) +- Fixed bug #48409 (Crash when exception is thrown while passing function + arguments). (Arnaud) +- Fixed bug #48378 (exif_read_data() segfaults on certain corrupted .jpeg + files). (Pierre) +- Fixed bug #48359 (Script hangs on snmprealwalk if OID is not increasing). + (Ilia, simonov at gmail dot com) +- Fixed bug #48336 (ReflectionProperty::getDeclaringClass() does not work + with redeclared property). + (patch by Markus dot Lidel at shadowconnect dot com) +- Fixed bug #48326 (constant MSG_DONTWAIT not defined). (Arnaud) +- Fixed bug #48313 (fgetcsv() does not return null for empty rows). (Ilia) +- Fixed bug #48309 (stream_copy_to_stream() and fpasstru() do not update + stream position of plain files). (Arnaud) +- Fixed bug #48307 (stream_copy_to_stream() copies 0 bytes when $source is a + socket). (Arnaud) +- Fixed bug #48273 (snmp*_real_walk() returns SNMP errors as values). + (Ilia, lytboris at gmail dot com) +- Fixed bug #48256 (Crash due to double-linking of history.o). + (tstarling at wikimedia dot org) +- Fixed bug #48248 (SIGSEGV when access to private property via __get). + (Felipe) +- Fixed bug #48247 (Crash on errors during startup). (Stas) +- Fixed bug #48240 (DBA Segmentation fault dba_nextkey). (Felipe) +- Fixed bug #48224 (Incorrect shuffle in array_rand). (Etienne) +- Fixed bug #48221 (memory leak when passing invalid xslt parameter). + (Felipe) +- Fixed bug #48207 (CURLOPT_(FILE|WRITEHEADER options do not error out when + working with a non-writable stream). (Ilia) +- Fixed bug #48206 (Iterating over an invalid data structure with + RecursiveIteratorIterator leads to a segfault). (Scott) +- Fixed bug #48204 (xmlwriter_open_uri() does not emit warnings on invalid + paths). (Ilia) +- Fixed bug #48203 (Crash when CURLOPT_STDERR is set to regular file). (Jani) +- Fixed bug #48202 (Out of Memory error message when passing invalid file + path) (Pierre) +- Fixed bug #48156 (Added support for lcov v1.7). (Ilia) +- Fixed bug #48132 (configure check for curl ssl support fails with + --disable-rpath). (Jani) +- Fixed bug #48131 (Don't try to bind ipv4 addresses to ipv6 ips via bindto). + (Ilia) +- Fixed bug #48070 (PDO_OCI: Segfault when using persistent connection). + (Pierre, Matteo, jarismar dot php at gmail dot com) +- Fixed bug #48058 (Year formatter goes wrong with out-of-int range). (Derick) +- Fixed bug #48038 (odbc_execute changes variables used to form params array). + (Felipe) +- Fixed bug #47997 (stream_copy_to_stream returns 1 on empty streams). (Arnaud) +- Fixed
Re: [PHP-CVS] cvs: php-src /ext/gd/libgd gdft.c /ext/gd/tests Tuffy.ttf bug48555.phpt
Does this need to go into 5.2? Ilia Alshanetsky On 21-Jun-09, at 1:59 AM, Takeshi Abe wrote: tabeSun Jun 21 05:59:26 2009 UTC Added files: /php-src/ext/gd/testsbug48555.phpt Tuffy.ttf Modified files: /php-src/ext/gd/libgdgdft.c Log: fixed bug #48555 (ImageFTBBox() differs from previous versions for texts with new lines) tabe-20090621055926.txt-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard mail.c
iliaa Sun Jun 21 15:29:16 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard mail.c
Log:
Fixed bug #48620 (X-PHP-Originating-Script assumes no trailing CRLF in
existing headers)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/mail.c?r1=1.87.2.1.2.7.2.10r2=1.87.2.1.2.7.2.11diff_format=u
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.87.2.1.2.7.2.10
php-src/ext/standard/mail.c:1.87.2.1.2.7.2.11
--- php-src/ext/standard/mail.c:1.87.2.1.2.7.2.10 Wed Apr 15 14:24:38 2009
+++ php-src/ext/standard/mail.c Sun Jun 21 15:29:16 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mail.c,v 1.87.2.1.2.7.2.10 2009/04/15 14:24:38 iliaa Exp $ */
+/* $Id: mail.c,v 1.87.2.1.2.7.2.11 2009/06/21 15:29:16 iliaa Exp $ */
#include stdlib.h
#include ctype.h
@@ -241,7 +241,7 @@
php_basename(tmp, strlen(tmp), NULL, 0,f, f_len TSRMLS_CC);
if (headers != NULL) {
- spprintf(hdr, 0, %s\r\nX-PHP-Originating-Script:
%ld:%s\n, headers, php_getuid(), f);
+ spprintf(hdr, 0, X-PHP-Originating-Script:
%ld:%s\r\n%s, php_getuid(), f, headers);
} else {
spprintf(hdr, 0, X-PHP-Originating-Script: %ld:%s\n,
php_getuid(), f);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard mail.c
iliaa Sun Jun 21 15:30:23 2009 UTC
Modified files:
/php-src/ext/standard mail.c
Log:
MFB: Fixed bug #48620 (X-PHP-Originating-Script assumes no trailing CRLF in
existing headers)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/mail.c?r1=1.106r2=1.107diff_format=u
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.106 php-src/ext/standard/mail.c:1.107
--- php-src/ext/standard/mail.c:1.106 Wed Apr 15 14:25:20 2009
+++ php-src/ext/standard/mail.c Sun Jun 21 15:30:23 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mail.c,v 1.106 2009/04/15 14:25:20 iliaa Exp $ */
+/* $Id: mail.c,v 1.107 2009/06/21 15:30:23 iliaa Exp $ */
#include stdlib.h
#include ctype.h
@@ -235,7 +235,7 @@
php_basename(tmp, strlen(tmp), NULL, 0, f, f_len TSRMLS_CC);
if (headers != NULL) {
- spprintf(hdr, 0, %s\r\nX-PHP-Originating-Script:
%ld:%s\n, headers, php_getuid(), f);
+ spprintf(hdr, 0, X-PHP-Originating-Script:
%ld:%s\r\n%s, php_getuid(), f, headers);
} else {
spprintf(hdr, 0, X-PHP-Originating-Script: %ld:%s\n,
php_getuid(), f);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
iliaa Sun Jun 21 15:30:58 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.638r2=1.2027.2.547.2.965.2.639diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.638 php-src/NEWS:1.2027.2.547.2.965.2.639 --- php-src/NEWS:1.2027.2.547.2.965.2.638 Sun Jun 21 11:50:37 2009 +++ php-src/NEWSSun Jun 21 15:30:57 2009 @@ -1,6 +1,8 @@ PHPNEWS ||| ?? ??? 2009, PHP 5.3.0 RC 5 +- Fixed bug #48620 (X-PHP-Originating-Script assumes no trailing CRLF in + existing headers). (Ilia) - Fixed bug #48555 (ImageFTBBox() differs from previous versions for texts with new lines) (Takeshi Abe) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/gd/libgd gdft.c /ext/gd/tests Tuffy.ttf bug48555.phpt
yes, I already asked Tabe to MFH :) Cheers, On Sun, Jun 21, 2009 at 5:26 PM, Ilia Alshanetskyi...@prohost.org wrote: Does this need to go into 5.2? Ilia Alshanetsky On 21-Jun-09, at 1:59 AM, Takeshi Abe wrote: tabe Sun Jun 21 05:59:26 2009 UTC Added files: /php-src/ext/gd/tests bug48555.phpt Tuffy.ttf Modified files: /php-src/ext/gd/libgd gdft.c Log: fixed bug #48555 (ImageFTBBox() differs from previous versions for texts with new lines) tabe-20090621055926.txt-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/cli php.1.in
johannesSun Jun 21 16:44:50 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/sapi/cli php.1.in Log: MFH: It's 2009 http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.12.2.3.2.3.2.5r2=1.12.2.3.2.3.2.6diff_format=u Index: php-src/sapi/cli/php.1.in diff -u php-src/sapi/cli/php.1.in:1.12.2.3.2.3.2.5 php-src/sapi/cli/php.1.in:1.12.2.3.2.3.2.6 --- php-src/sapi/cli/php.1.in:1.12.2.3.2.3.2.5 Thu Apr 9 10:20:02 2009 +++ php-src/sapi/cli/php.1.in Sun Jun 21 16:44:50 2009 @@ -1,4 +1,4 @@ -.TH PHP 1 2008 The PHP Group Scripting Language +.TH PHP 1 2009 The PHP Group Scripting Language .SH NAME .TP 15 php \- PHP Command Line Interface 'CLI' -- 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) /sapi/cli php.1.in
johannesSun Jun 21 16:45:24 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/sapi/cli php.1.in Log: MFH: It's 2009 http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.12.2.3.2.8r2=1.12.2.3.2.9diff_format=u Index: php-src/sapi/cli/php.1.in diff -u php-src/sapi/cli/php.1.in:1.12.2.3.2.8 php-src/sapi/cli/php.1.in:1.12.2.3.2.9 --- php-src/sapi/cli/php.1.in:1.12.2.3.2.8 Thu Apr 9 10:20:39 2009 +++ php-src/sapi/cli/php.1.in Sun Jun 21 16:45:24 2009 @@ -1,4 +1,4 @@ -.TH PHP 1 2008 The PHP Group Scripting Language +.TH PHP 1 2009 The PHP Group Scripting Language .SH NAME .TP 15 php \- PHP Command Line Interface 'CLI' -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /code-samples arrayTest.php
g2 Sun Jun 21 17:30:46 2009 UTC
Added files:
/phpruntests/code-samples arrayTest.php
Log:
phpruntests - add arrayTest (spl-performace-test)
http://cvs.php.net/viewvc.cgi/phpruntests/code-samples/arrayTest.php?view=markuprev=1.1
Index: phpruntests/code-samples/arrayTest.php
+++ phpruntests/code-samples/arrayTest.php
?php
$size = isset($argv[1]) ? $argv[1] : 9;
// create array
$testArray = array();
for ($i=0; $i$size; $i++) {
$testArray[$i] = rand(0,9);
}
print size:\t$size\n;
flush();
// loop
$s = microtime(true);
for ($i=0; $i$size; $i++) {
if (isset($testArray[$i])) {
if ($i%2 == 0) {
$testArray[$i] = 'G';
}
}
}
$e = microtime(true);
$tl = round($e-$s, 5);
print loop:\t$tl sec (100%)\n;
flush();
// iterator
$s = microtime(true);
$testObject = new ArrayObject($testArray);
$iterator = $testObject-getIterator();
while ($iterator-valid()) {
if ($iterator-key()%2 == 0) {
$testObject[$iterator-current()] = 'G';
}
$iterator-next();
}
$e = microtime(true);
$ti = round($e-$s, 5);
$diff = round($ti/$tl*100, 0);
print spl:\t$ti sec ($diff%)\n;
print DIFF:\t.($ti-$tl). sec\n;
flush();
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang passByReference_012.phpt string_decimals_001.phpt this_assignment.phpt
wharmby Sun Jun 21 17:42:13 2009 UTC
Added files:
/php-src/tests/lang passByReference_012.phpt this_assignment.phpt
string_decimals_001.phpt
Log:
New lang tests.
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_012.phpt?view=markuprev=1.1
Index: php-src/tests/lang/passByReference_012.phpt
+++ php-src/tests/lang/passByReference_012.phpt
--TEST--
Test pass by reference semantics
--FILE--
?php
error_reporting(E_ALL | E_STRICT | E_NOTICE);
// Simplified array_shift_variation5.phpt
// Showing warning:
// Only variables should be passed by reference in %s on line %d
$stack = array ( array ( 'two' ));
var_dump(array_shift(array_shift($stack)));
// This should show the identical warning
$original = array ( array ( 'one' ));
$stack = $original;
var_dump(array_shift(array_shift($stack)));
?
===DONE===
--EXPECTF--
Strict Standards: Only variables should be passed by reference in %s on line %d
unicode(3) two
Strict Standards: Only variables should be passed by reference in %s on line %d
unicode(3) one
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/this_assignment.phpt?view=markuprev=1.1
Index: php-src/tests/lang/this_assignment.phpt
+++ php-src/tests/lang/this_assignment.phpt
--TEST--
Test to catch early assignment of $this
--FILE--
?php
class first {
function me() { echo first; }
function who() {
global $a,$b;
$this-me();
$a-me();
$b-me();
$b = new second();
$this-me();
$a-me();
$b-me();
}
}
class second {
function who() {
global $a,$b;
$this-me();
$a-me();
$b-me();
}
function me() { echo second; }
}
$a = new first();
$b = $a;
$a-who();
$b-who();
echo \n;
?
===DONE===
--EXPECT--
firstfirstfirstfirstsecondsecondsecondsecondsecond
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/string_decimals_001.phpt?view=markuprev=1.1
Index: php-src/tests/lang/string_decimals_001.phpt
+++ php-src/tests/lang/string_decimals_001.phpt
--TEST--
String conversion with multiple decimal points
--FILE--
?php
function test($str) {
echo \n-- Testing $str:\n;
var_dump((int)$str);
var_dump((float)$str);
var_dump($str 0);
}
test(..9);
test(.9.);
test(9..);
test(9.9.);
test(9.9.9);
?
===DONE===
--EXPECTF--
-- Testing ..9:
int(0)
float(0)
bool(false)
-- Testing .9.:
int(0)
float(0.9)
bool(true)
-- Testing 9..:
int(9)
float(9)
bool(true)
-- Testing 9.9.:
int(9)
float(9.9)
bool(true)
-- Testing 9.9.9:
int(9)
float(9.9)
bool(true)
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /tests/lang passByReference_012.phpt string_decimals_001.phpt this_assignment.phpt
wharmby Sun Jun 21 17:42:15 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/tests/lang string_decimals_001.phpt this_assignment.phpt
passByReference_012.phpt
Log:
New lang tests.
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/string_decimals_001.phpt?view=markuprev=1.1
Index: php-src/tests/lang/string_decimals_001.phpt
+++ php-src/tests/lang/string_decimals_001.phpt
--TEST--
String conversion with multiple decimal points
--FILE--
?php
function test($str) {
echo \n-- Testing $str:\n;
var_dump((int)$str);
var_dump((float)$str);
var_dump($str 0);
}
test(..9);
test(.9.);
test(9..);
test(9.9.);
test(9.9.9);
?
===DONE===
--EXPECTF--
-- Testing ..9:
int(0)
float(0)
bool(false)
-- Testing .9.:
int(0)
float(0.9)
bool(true)
-- Testing 9..:
int(9)
float(9)
bool(true)
-- Testing 9.9.:
int(9)
float(9.9)
bool(true)
-- Testing 9.9.9:
int(9)
float(9.9)
bool(true)
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/this_assignment.phpt?view=markuprev=1.1
Index: php-src/tests/lang/this_assignment.phpt
+++ php-src/tests/lang/this_assignment.phpt
--TEST--
Test to catch early assignment of $this
--FILE--
?php
class first {
function me() { echo first; }
function who() {
global $a,$b;
$this-me();
$a-me();
$b-me();
$b = new second();
$this-me();
$a-me();
$b-me();
}
}
class second {
function who() {
global $a,$b;
$this-me();
$a-me();
$b-me();
}
function me() { echo second; }
}
$a = new first();
$b = $a;
$a-who();
$b-who();
echo \n;
?
===DONE===
--EXPECT--
firstfirstfirstfirstsecondsecondsecondsecondsecond
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_012.phpt?view=markuprev=1.1
Index: php-src/tests/lang/passByReference_012.phpt
+++ php-src/tests/lang/passByReference_012.phpt
--TEST--
Test pass by reference semantics
--FILE--
?php
error_reporting(E_ALL | E_STRICT | E_NOTICE);
// Simplified array_shift_variation5.phpt
// Showing warning:
// Only variables should be passed by reference in %s on line %d
$stack = array ( array ( 'two' ));
var_dump(array_shift(array_shift($stack)));
// This should show the identical warning
$original = array ( array ( 'one' ));
$stack = $original;
var_dump(array_shift(array_shift($stack)));
?
===DONE===
--EXPECTF--
Strict Standards: Only variables should be passed by reference in %s on line %d
unicode(3) two
Strict Standards: Only variables should be passed by reference in %s on line %d
unicode(3) one
===DONE===
--
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) /tests/lang passByReference_012.phpt string_decimals_001.phpt this_assignment.phpt
wharmby Sun Jun 21 17:42:16 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/tests/lang this_assignment.phpt passByReference_012.phpt
string_decimals_001.phpt
Log:
New lang tests.
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/this_assignment.phpt?view=markuprev=1.1
Index: php-src/tests/lang/this_assignment.phpt
+++ php-src/tests/lang/this_assignment.phpt
--TEST--
Test to catch early assignment of $this
--FILE--
?php
class first {
function me() { echo first; }
function who() {
global $a,$b;
$this-me();
$a-me();
$b-me();
$b = new second();
$this-me();
$a-me();
$b-me();
}
}
class second {
function who() {
global $a,$b;
$this-me();
$a-me();
$b-me();
}
function me() { echo second; }
}
$a = new first();
$b = $a;
$a-who();
$b-who();
echo \n;
?
===DONE===
--EXPECT--
firstfirstfirstfirstsecondsecondsecondsecondsecond
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_012.phpt?view=markuprev=1.1
Index: php-src/tests/lang/passByReference_012.phpt
+++ php-src/tests/lang/passByReference_012.phpt
--TEST--
Test pass by reference semantics
--FILE--
?php
error_reporting(E_ALL | E_STRICT | E_NOTICE);
// Simplified array_shift_variation5.phpt
// Showing warning:
// Only variables should be passed by reference in %s on line %d
$stack = array ( array ( 'two' ));
var_dump(array_shift(array_shift($stack)));
// This should show the identical warning
$original = array ( array ( 'one' ));
$stack = $original;
var_dump(array_shift(array_shift($stack)));
?
===DONE===
--EXPECTF--
Strict Standards: Only variables should be passed by reference in %s on line %d
unicode(3) two
Strict Standards: Only variables should be passed by reference in %s on line %d
unicode(3) one
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/string_decimals_001.phpt?view=markuprev=1.1
Index: php-src/tests/lang/string_decimals_001.phpt
+++ php-src/tests/lang/string_decimals_001.phpt
--TEST--
String conversion with multiple decimal points
--FILE--
?php
function test($str) {
echo \n-- Testing $str:\n;
var_dump((int)$str);
var_dump((float)$str);
var_dump($str 0);
}
test(..9);
test(.9.);
test(9..);
test(9.9.);
test(9.9.9);
?
===DONE===
--EXPECTF--
-- Testing ..9:
int(0)
float(0)
bool(false)
-- Testing .9.:
int(0)
float(0.9)
bool(true)
-- Testing 9..:
int(9)
float(9)
bool(true)
-- Testing 9.9.:
int(9)
float(9.9)
bool(true)
-- Testing 9.9.9:
int(9)
float(9.9)
bool(true)
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / UPGRADING
bjori Sun Jun 21 18:34:50 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcUPGRADING Log: Fixed bug#48485 (Error in documentation and upgrade guide) http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.13r2=1.1.2.3.2.1.2.14diff_format=u Index: php-src/UPGRADING diff -u php-src/UPGRADING:1.1.2.3.2.1.2.13 php-src/UPGRADING:1.1.2.3.2.1.2.14 --- php-src/UPGRADING:1.1.2.3.2.1.2.13 Sun Jun 21 05:41:08 2009 +++ php-src/UPGRADING Sun Jun 21 18:34:50 2009 @@ -1,4 +1,4 @@ -$Id: UPGRADING,v 1.1.2.3.2.1.2.13 2009/06/21 05:41:08 kalle Exp $ +$Id: UPGRADING,v 1.1.2.3.2.1.2.14 2009/06/21 18:34:50 bjori Exp $ UPGRADE NOTES - PHP 5.3 @@ -229,6 +229,8 @@ - Runtime tightening of open_basedir restrictions is now possible. +- The default value of session.use_only_cookies has changed to 1 + 10. Syntax additions -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src rtUtil.php
zoe Sun Jun 21 20:29:12 2009 UTC
Modified files:
/phpruntests/srcrtUtil.php
Log:
fixing Olivier's out of memory problem
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtUtil.php?r1=1.3r2=1.4diff_format=u
Index: phpruntests/src/rtUtil.php
diff -u phpruntests/src/rtUtil.php:1.3 phpruntests/src/rtUtil.php:1.4
--- phpruntests/src/rtUtil.php:1.3 Mon May 25 12:39:46 2009
+++ phpruntests/src/rtUtil.php Sun Jun 21 20:29:12 2009
@@ -3,7 +3,7 @@
* rtUtil
*
* Static utility methods
- *
+ *
* @category Testing
* @package RUNTESTS
* @authorZoe Slattery z...@php.net
@@ -17,11 +17,7 @@
public static function getTestList($aDirectory)
{
$result = array();
-
-foreach (new rtPhptFilterIterator(new RecursiveIteratorIterator(new
RecursiveDirectoryIterator($aDirectory))) as $item) {
-$result[] = $item-getPathname();
-}
-
+$result = glob($aDirectory. /*.phpt);
return $result;
}
@@ -35,13 +31,22 @@
*/
public static function getDirectoryList($aDirectory)
{
-$result = array();
-
-foreach (new rtPhptFilterIterator(new RecursiveIteratorIterator(new
RecursiveDirectoryIterator($aDirectory))) as $directory) {
-$result[] = $directory-getPath() . /;
+$subDirectories = array();
+foreach (new RecursiveIteratorIterator(new
RecursiveDirectoryIterator($aDirectory)) as $directory) {
+$subDirectories[] = $directory-getPath() . /;
}
-
-return array_unique($result);
+
+$subDirectoriesUnique = array_unique($subDirectories);
+
+$phptDirectories = array();
+
+foreach ($subDirectoriesUnique as $subDir) {
+if(count(self::getTestList($subDir)) 0) {
+$phptDirectories[] = $subDir;
+}
+}
+
+return $phptDirectories;
}
}
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date php_date.c
bjori Sun Jun 21 20:40:54 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/date php_date.c
Log:
Fix proto and arginfo
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.79r2=1.43.2.45.2.51.2.80diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.79
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.80
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.79 Wed Jun 17 17:56:17 2009
+++ php-src/ext/date/php_date.c Sun Jun 21 20:40:53 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.79 2009/06/17 17:56:17 bjori Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.80 2009/06/21 20:40:53 bjori Exp $ */
#include php.h
#include php_streams.h
@@ -331,6 +331,7 @@
ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_identifiers_list, 0, 0, 0)
ZEND_ARG_INFO(0, what)
+ ZEND_ARG_INFO(0, country)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_timezone_abbreviations_list, 0)
@@ -3737,7 +3738,7 @@
return 0;
}
-/* {{{ proto array timezone_identifiers_list([long what])
+/* {{{ proto array timezone_identifiers_list([long what[, string country]])
Returns numerically index array with all timezone identifiers.
*/
PHP_FUNCTION(timezone_identifiers_list)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
bjori Sun Jun 21 20:41:51 2009 UTC
Modified files:
/php-src/ext/date php_date.c
Log:
MFB: Fix proto and arginfo
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.236r2=1.237diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.236 php-src/ext/date/php_date.c:1.237
--- php-src/ext/date/php_date.c:1.236 Sun May 31 21:29:54 2009
+++ php-src/ext/date/php_date.c Sun Jun 21 20:41:51 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.236 2009/05/31 21:29:54 stas Exp $ */
+/* $Id: php_date.c,v 1.237 2009/06/21 20:41:51 bjori Exp $ */
#include php.h
#include php_streams.h
@@ -328,6 +328,7 @@
ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_identifiers_list, 0, 0, 0)
ZEND_ARG_INFO(0, what)
+ ZEND_ARG_INFO(0, country)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_timezone_abbreviations_list, 0)
@@ -3859,7 +3860,7 @@
return 0;
}
-/* {{{ proto array timezone_identifiers_list([long what]) U
+/* {{{ proto array timezone_identifiers_list([long what[, string country]]) U
Returns numerically index array with all timezone identifiers.
*/
PHP_FUNCTION(timezone_identifiers_list)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
scottmacSun Jun 21 22:18:53 2009 UTC Modified files: /php-src/ext/date php_date.c Log: Fix bug #48276 - year is a long long so we need %lld so big endian systems print the correct value. http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.237r2=1.238diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.237 php-src/ext/date/php_date.c:1.238 --- php-src/ext/date/php_date.c:1.237 Sun Jun 21 20:41:51 2009 +++ php-src/ext/date/php_date.c Sun Jun 21 22:18:53 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.237 2009/06/21 20:41:51 bjori Exp $ */ +/* $Id: php_date.c,v 1.238 2009/06/21 22:18:53 scottmac Exp $ */ #include php.h #include php_streams.h @@ -1143,7 +1143,7 @@ /* year */ case 'L': length = date_spprintf(buffer, 32 TSRMLS_CC, %d, timelib_is_leap((int) t-y)); break; case 'y': length = date_spprintf(buffer, 32 TSRMLS_CC, %02d, (int) t-y % 100); break; - case 'Y': length = date_spprintf(buffer, 32 TSRMLS_CC, %s%04ld, t-y 0 ? - : , llabs(t-y)); break; + case 'Y': length = date_spprintf(buffer, 32 TSRMLS_CC, %s%04lld, t-y 0 ? - : , llabs(t-y)); break; /* time */ case 'a': length = date_spprintf(buffer, 32 TSRMLS_CC, %R, localized ? IS_UNICODE : IS_STRING, am_pm_lower_full(t-h = 12 ? 1 : 0, localized)); break; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date php_date.c
scottmacSun Jun 21 22:19:12 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/date php_date.c Log: MFH Fix bug #48276 - year is a long long so we need %lld so big endian systems print the correct value. http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.80r2=1.43.2.45.2.51.2.81diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.80 php-src/ext/date/php_date.c:1.43.2.45.2.51.2.81 --- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.80 Sun Jun 21 20:40:53 2009 +++ php-src/ext/date/php_date.c Sun Jun 21 22:19:11 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.43.2.45.2.51.2.80 2009/06/21 20:40:53 bjori Exp $ */ +/* $Id: php_date.c,v 1.43.2.45.2.51.2.81 2009/06/21 22:19:11 scottmac Exp $ */ #include php.h #include php_streams.h @@ -1051,7 +1051,7 @@ /* year */ case 'L': length = slprintf(buffer, 32, %d, timelib_is_leap((int) t-y)); break; case 'y': length = slprintf(buffer, 32, %02d, (int) t-y % 100); break; - case 'Y': length = slprintf(buffer, 32, %s%04ld, t-y 0 ? - : , llabs((timelib_sll) t-y)); break; + case 'Y': length = slprintf(buffer, 32, %s%04lld, t-y 0 ? - : , llabs((timelib_sll) t-y)); break; /* time */ case 'a': length = slprintf(buffer, 32, %s, t-h = 12 ? pm : am); break; -- 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/date php_date.c
scottmacSun Jun 21 22:19:19 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/date php_date.c Log: MFH Fix bug #48276 - year is a long long so we need %lld so big endian systems print the correct value. http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.71r2=1.43.2.45.2.72diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.45.2.71 php-src/ext/date/php_date.c:1.43.2.45.2.72 --- php-src/ext/date/php_date.c:1.43.2.45.2.71 Fri Jun 5 22:34:30 2009 +++ php-src/ext/date/php_date.c Sun Jun 21 22:19:19 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.43.2.45.2.71 2009/06/05 22:34:30 rasmus Exp $ */ +/* $Id: php_date.c,v 1.43.2.45.2.72 2009/06/21 22:19:19 scottmac Exp $ */ #include php.h #include php_streams.h @@ -798,7 +798,7 @@ /* year */ case 'L': length = slprintf(buffer, 32, %d, timelib_is_leap((int) t-y)); break; case 'y': length = slprintf(buffer, 32, %02d, (int) t-y % 100); break; - case 'Y': length = slprintf(buffer, 32, %s%04ld, t-y 0 ? - : , llabs(t-y)); break; + case 'Y': length = slprintf(buffer, 32, %s%04lld, t-y 0 ? - : , llabs(t-y)); break; /* time */ case 'a': length = slprintf(buffer, 32, %s, t-h = 12 ? pm : am); break; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/tests bug48276.phpt
scottmacSun Jun 21 22:30:37 2009 UTC Added files: /php-src/ext/date/tests bug48276.phpt Log: Specific test for bug #48276 http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug48276.phpt?view=markuprev=1.1 Index: php-src/ext/date/tests/bug48276.phpt +++ php-src/ext/date/tests/bug48276.phpt --TEST-- Bug #48276 (date(Y) prints wrong year on Big Endian machines) --INI-- date.timezone=UTC --FILE-- ?php var_dump(date(Y, 1245623227)); --EXPECT-- unicode(4) 2009 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/tests bug48276.phpt
scottmacSun Jun 21 22:31:41 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/date/tests bug48276.phpt Log: MFH Specific test for bug #48276 http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug48276.phpt?view=markuprev=1.1 Index: php-src/ext/date/tests/bug48276.phpt +++ php-src/ext/date/tests/bug48276.phpt --TEST-- Bug #48276 (date(Y) prints wrong year on Big Endian machines) --INI-- date.timezone=UTC --FILE-- ?php var_dump(date(Y, 1245623227)); --EXPECT-- unicode(4) 2009 -- 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/date/tests bug48276.phpt
scottmacSun Jun 21 22:32:19 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/date/tests bug48276.phpt Log: MFH Specific test for bug #48276 http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug48276.phpt?view=markuprev=1.1 Index: php-src/ext/date/tests/bug48276.phpt +++ php-src/ext/date/tests/bug48276.phpt --TEST-- Bug #48276 (date(Y) prints wrong year on Big Endian machines) --INI-- date.timezone=UTC --FILE-- ?php var_dump(date(Y, 1245623227)); --EXPECT-- unicode(4) 2009 -- 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
scottmacSun Jun 21 22:33:49 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1561r2=1.2027.2.547.2.1562diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1561 php-src/NEWS:1.2027.2.547.2.1562 --- php-src/NEWS:1.2027.2.547.2.1561Wed Jun 17 12:31:58 2009 +++ php-src/NEWSSun Jun 21 22:33:48 2009 @@ -1,6 +1,8 @@ PHPNEWS ||| ?? ??? 2009, PHP 5.2.11 +- Fixed bug #48276 (date(Y) on big endian machines produces the + wrong result). (Scott) 17 Jun 2009, PHP 5.2.10 - Updated timezone database to version 2009.9 (2009i) (Derick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
scottmacSun Jun 21 22:38:49 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN - Partially fixed in RC4, fixed properly in the next release. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.639r2=1.2027.2.547.2.965.2.640diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.639 php-src/NEWS:1.2027.2.547.2.965.2.640 --- php-src/NEWS:1.2027.2.547.2.965.2.639 Sun Jun 21 15:30:57 2009 +++ php-src/NEWSSun Jun 21 22:38:49 2009 @@ -5,6 +5,8 @@ existing headers). (Ilia) - Fixed bug #48555 (ImageFTBBox() differs from previous versions for texts with new lines) (Takeshi Abe) +- Fixed bug #48215 (Calling a method with the same name as the parent class + calls the constructor). (Scott) 18 Jun 2009, PHP 5.3.0 RC 4 - Upgraded bundled sqlite to version 3.6.15. (Scott) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /code-samples/taskScheduler results.xls run.php /code-samples/taskScheduler/classes taskScheduler.php taskSchedulerFile.php taskSchedulerMsgQ.php
g2 Mon Jun 22 00:19:12 2009 UTC
Added files:
/phpruntests/code-samples/taskScheduler/classes
taskSchedulerFile.php
taskSchedulerMsgQ.php
/phpruntests/code-samples/taskScheduler results.xls
Modified files:
/phpruntests/code-samples/taskScheduler/classes taskScheduler.php
/phpruntests/code-samples/taskScheduler run.php
Log:
phpruntests - update taskScheduler (prototype) - added file-driven ipc
http://cvs.php.net/viewvc.cgi/phpruntests/code-samples/taskScheduler/classes/taskScheduler.php?r1=1.2r2=1.3diff_format=u
Index: phpruntests/code-samples/taskScheduler/classes/taskScheduler.php
diff -u phpruntests/code-samples/taskScheduler/classes/taskScheduler.php:1.2
phpruntests/code-samples/taskScheduler/classes/taskScheduler.php:1.3
--- phpruntests/code-samples/taskScheduler/classes/taskScheduler.php:1.2
Tue Jun 16 22:43:30 2009
+++ phpruntests/code-samples/taskScheduler/classes/taskScheduler.phpMon Jun
22 00:19:12 2009
@@ -1,24 +1,17 @@
?php
-declare(ticks=true);
-
-
class taskScheduler
{
- const MSG_QUEUE_KEY = 1234; // id of the message-queue
- const MSG_QUEUE_SIZE = 1024;// max-size of a single message
- const KILL_CHILD = 'killBill'; // kill-signal to terminate a child
-
- private $taskList = array();// the list of the tasks to be executed
- private $processCount = NULL; // the number of processes
- private $inputQueue = NULL; // the input-queue (only used
by the sender)
- private $pidStore = array();// stores the pids of all
child-processes
- private $time = 0; // the needed time
- private $countPass = 0; // counts the passed tasks
- private $countFail = 0; // counts the failed tasks
- private $groupTasks = false;// are the tasks stored in groups?
- private $memStore = array();// stores the mem-usage after an
incomming task
+ protected $taskList = array(); // the list of the tasks to be executed
+ protected $processCount = 0;// the number of processes
+
+ protected $time = 0;// the needed time
+ protected $countPass = 0; // counts the passed tasks
+ protected $countFail = 0; // counts the failed tasks
+ protected $memStore = array(); // stores the mem-usage after an
incomming task
+
+
/**
* the constructor
@@ -34,24 +27,31 @@
$this-setProcessCount($processCount);
}
+
+
+public static function getInstance(array $taskList=NULL,
$processCount=NUL, $useMsgQ=false)
+{
+ if (extension_loaded('pcntl')) {
+
+ if ($useMsgQ === true) {
+
+ return new taskSchedulerMsgQ($taskList, $processCount);
+ }
+
+ return new taskSchedulerFile($taskList, $processCount);
+ }
+
+ return new taskScheduler($taskList, $processCount);
+}
/**
* sets the task-list which has to be an array of task-objects.
- * it's also possible to use a multidimensional array. in this case the
- * tasks are distributed to the child-processes exactly in the way as they
- * are grouped in the list. the first-level index strictly has to be
- * numeric and continuous starting with zero.
- *
+*
* @param array $taskList
*/
public function setTaskList(array $taskList)
{
- if (is_array($taskList[0])) {
- $this-groupTasks = true;
- $this-processCount = sizeof($taskList);
- }
-
$this-taskList = $taskList;
}
@@ -74,64 +74,18 @@
*/
public function setProcessCount($processCount)
{
- if ($this-groupTasks !== true is_numeric($processCount)
$processCount = 0) {
+ if (is_numeric($processCount) $processCount = 0) {
$this-processCount = $processCount;
}
}
/**
-* removes the used message-queues.
-*/
-private static function cleanUp()
-{
- @msg_remove_queue(msg_get_queue(self::MSG_QUEUE_KEY));
- @msg_remove_queue(msg_get_queue(self::MSG_QUEUE_KEY+1));
- logg(CLEAN UP);
-}
-
-
- /**
-* the signal-handler is called by the interrupt- or quit-signal and
calls
-* the cleanUp-method.
-*
-* @param int $signal
-*/
- public static function signalHandler($signal)
- {
- logg(SIGNAL: $signal);
-
- switch($signal) {
[PHP-CVS] cvs: phpruntests /code-samples dirList.php /src rtUtil.php
g2 Mon Jun 22 02:17:17 2009 UTC
Added files:
/phpruntests/code-samples dirList.php
Modified files:
/phpruntests/srcrtUtil.php
Log:
phpruntests - added a alternative parse-method in rtUtil
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtUtil.php?r1=1.4r2=1.5diff_format=u
Index: phpruntests/src/rtUtil.php
diff -u phpruntests/src/rtUtil.php:1.4 phpruntests/src/rtUtil.php:1.5
--- phpruntests/src/rtUtil.php:1.4 Sun Jun 21 20:29:12 2009
+++ phpruntests/src/rtUtil.php Mon Jun 22 02:17:17 2009
@@ -48,5 +48,35 @@
return $phptDirectories;
}
+
+
+ /**
+* just a test
+*
+ * @param $path
+ * @return array
+*/
+ public static function parseDir($path) {
+
+ $list = array();
+
+ if (sizeof(glob($path./*.phpt)) 0) {
+
+ $list[] = $path.'/';
+ }
+
+ foreach (scandir($path) as $file) {
+
+ if (substr($file, 0, 1) != '.' $file != 'CVS') {
+
+ if (is_dir($path.'/'.$file)) {
+
+ $list = array_merge($list,
rtUtil::parseDir($path.'/'.$file));
+ }
+ }
+ }
+
+ return $list;
+ }
}
?
http://cvs.php.net/viewvc.cgi/phpruntests/code-samples/dirList.php?view=markuprev=1.1
Index: phpruntests/code-samples/dirList.php
+++ phpruntests/code-samples/dirList.php
?php
include '../src/rtUtil.php';
// arguments
$argc = sizeof($argv);
if ($argc == 2 || $argc == 3) {
$dir = $argv[1];
$simple = isset($argv[2]) ? true : false;
} else {
die(USAGE\n);
}
// execute
if ($simple) {
print rtUtil::parseDir\n;
$s = microtime(true);
$list = rtUtil::parseDir($dir);
$e = microtime(true);
} else {
print rtUtil::getDirectoryList\n;
$s = microtime(true);
$list = rtUtil::getDirectoryList($dir);
$e = microtime(true);
}
print list:\t.sizeof($list).\n;
print time:\t.round($e-$s, 5).\n;
print mem:\t.memory_get_usage().\n;
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
