[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Nov 5 01:31:38 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2858r2=1.2859diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2858 php-src/ChangeLog:1.2859 --- php-src/ChangeLog:1.2858Sat Nov 3 01:33:14 2007 +++ php-src/ChangeLog Mon Nov 5 01:31:37 2007 @@ -1,3 +1,29 @@ +2007-11-04 Mattias Bengtsson [EMAIL PROTECTED] + +* ext/gd/libgd/gd.c + ext/gd/libgd/gd.c + ext/gd/tests/bug43121.gif + ext/gd/tests/bug43121.gif + ext/gd/tests/bug43121.phpt + ext/gd/tests/bug43121.phpt: + -MFB, Fixed Bug #43121 (gdImageFill with IMG_COLOR_TILED crashes httpd) + +* (PHP_5_2) + ext/gd/libgd/gd.c + ext/gd/tests/bug43121.gif + ext/gd/tests/bug43121.gif + ext/gd/tests/bug43121.gif + ext/gd/tests/bug43121.phpt + ext/gd/tests/bug43121.phpt + ext/gd/tests/bug43121.phpt: + - Fixed Bug #43121 (gdImageFill with IMG_COLOR_TILED crashes httpd) + +2007-11-04 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_3) + ext/pdo/tests/pdo_005.phpt: + Fixed test + 2007-11-02 Jani Taskinen [EMAIL PROTECTED] * (PHP_5_3)
[PHP-CVS] cvs: CVSROOT / loginfo
wez Sun Nov 4 16:28:10 2007 UTC Modified files: /CVSROOTloginfo Log: objective-c commits to the objc list http://cvs.php.net/viewvc.cgi/CVSROOT/loginfo?r1=1.125r2=1.126diff_format=u Index: CVSROOT/loginfo diff -u CVSROOT/loginfo:1.125 CVSROOT/loginfo:1.126 --- CVSROOT/loginfo:1.125 Mon Sep 10 19:13:03 2007 +++ CVSROOT/loginfo Sun Nov 4 16:28:09 2007 @@ -1,5 +1,5 @@ # -#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.125 2007/09/10 19:13:03 philip Exp $ +#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.126 2007/11/04 16:28:09 wez Exp $ # # The loginfo file is used to control where cvs commit log information # is sent. The first entry on a line is a regular expression which is tested @@ -132,6 +132,7 @@ ^embed-web $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv} ^embed $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv} ^adt $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv} +^php-objc $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv} # Smarty stuff ^smarty-web$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv} -- 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/pdo/tests pdo_005.phpt
iliaa Sun Nov 4 16:12:13 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pdo/tests pdo_005.phpt Log: Fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/tests/pdo_005.phpt?r1=1.4.2.3r2=1.4.2.3.4.1diff_format=u Index: php-src/ext/pdo/tests/pdo_005.phpt diff -u php-src/ext/pdo/tests/pdo_005.phpt:1.4.2.3 php-src/ext/pdo/tests/pdo_005.phpt:1.4.2.3.4.1 --- php-src/ext/pdo/tests/pdo_005.phpt:1.4.2.3 Mon Oct 3 15:06:27 2005 +++ php-src/ext/pdo/tests/pdo_005.phpt Sun Nov 4 16:12:13 2007 @@ -84,27 +84,27 @@ object(TestBase)#%d (3) { [id]= string(1) 1 -[val:protected]= +[val:protected]= string(1) A -[val2:private]= +[val2:TestBase:private]= string(2) AA } [1]= object(TestBase)#%d (3) { [id]= string(1) 2 -[val:protected]= +[val:protected]= string(1) B -[val2:private]= +[val2:TestBase:private]= string(2) BB } [2]= object(TestBase)#%d (3) { [id]= string(1) 3 -[val:protected]= +[val:protected]= string(1) C -[val2:private]= +[val2:TestBase:private]= string(2) CC } } @@ -114,41 +114,41 @@ array(3) { [0]= object(TestDerived)#%d (5) { -[row:protected]= +[row:protected]= int(0) [id]= string(1) 1 -[val:protected]= +[val:protected]= string(1) A -[val2:private]= +[val2:TestBase:private]= NULL [val2]= string(2) AA } [1]= object(TestDerived)#%d (5) { -[row:protected]= +[row:protected]= int(1) [id]= string(1) 2 -[val:protected]= +[val:protected]= string(1) B -[val2:private]= +[val2:TestBase:private]= NULL [val2]= string(2) BB } [2]= object(TestDerived)#%d (5) { -[row:protected]= +[row:protected]= int(2) [id]= string(1) 3 -[val:protected]= +[val:protected]= string(1) C -[val2:private]= +[val2:TestBase:private]= NULL [val2]= string(2) CC } -} +} \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
wez Sun Nov 4 17:01:57 2007 UTC Modified files: /CVSROOTavail Log: objc karma for myself and Jan http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1319r2=1.1320diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1319 CVSROOT/avail:1.1320 --- CVSROOT/avail:1.1319Wed Oct 31 01:50:44 2007 +++ CVSROOT/avail Sun Nov 4 17:01:57 2007 @@ -288,6 +288,9 @@ avail|lwe|pecl/pdo_firebird,php-src/ext/pdo_firebird avail|mkoppanen|pecl/ssh2 +# Objective-C bridge +avail|wez,jan|php-objc + # php windows installer avail|jmertic|php-src/win32/installer -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/gd/libgd gd.c /ext/gd/tests bug43121.gif bug43121.phpt
mattias Sun Nov 4 23:56:00 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/gd/tests bug43121.gif bug43121.phpt Modified files: /php-src/ext/gd/libgd gd.c Log: - Fixed Bug #43121 (gdImageFill with IMG_COLOR_TILED crashes httpd) http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.90.2.1.2.21r2=1.90.2.1.2.22diff_format=u Index: php-src/ext/gd/libgd/gd.c diff -u php-src/ext/gd/libgd/gd.c:1.90.2.1.2.21 php-src/ext/gd/libgd/gd.c:1.90.2.1.2.22 --- php-src/ext/gd/libgd/gd.c:1.90.2.1.2.21 Tue Sep 11 21:03:48 2007 +++ php-src/ext/gd/libgd/gd.c Sun Nov 4 23:56:00 2007 @@ -2050,14 +2050,14 @@ static void _gdImageFillTiled(gdImagePtr im, int x, int y, int nc) { - int l, x1, x2, dy; + int i, l, x1, x2, dy; int oc; /* old pixel value */ int tiled; int wx2,wy2; /* stack of filled segments */ struct seg *stack; struct seg *sp; - char *pts; + char **pts; if (!im-tile) { return; @@ -2067,7 +2067,11 @@ tiled = nc==gdTiled; nc = gdImageTileGet(im,x,y); - pts = (char *) ecalloc(im-sy * im-sx, sizeof(char)); + + pts = (char **) ecalloc(im-sy + 1, sizeof(char *)); + for (i = 0; i im-sy + 1; i++) { + pts[i] = (char *) ecalloc(im-sx + 1, sizeof(char)); + } stack = (struct seg *)safe_emalloc(sizeof(struct seg), ((int)(im-sy*im-sx)/4), 1); sp = stack; @@ -2080,9 +2084,9 @@ FILL_PUSH(y+1, x, x, -1); while (spstack) { FILL_POP(y, x1, x2, dy); - for (x=x1; x=0 (!pts[y + x*wx2] gdImageGetPixel(im,x,y)==oc); x--) { + for (x=x1; x=0 (!pts[y][x] gdImageGetPixel(im,x,y)==oc); x--) { nc = gdImageTileGet(im,x,y); - pts[y + x*wx2]=1; + pts[y][x] = 1; gdImageSetPixel(im,x, y, nc); } if (x=x1) { @@ -2096,9 +2100,9 @@ } x = x1+1; do { - for (; xwx2 (!pts[y + x*wx2] gdImageGetPixel(im,x, y)==oc) ; x++) { + for(; xwx2 (!pts[y][x] gdImageGetPixel(im,x, y)==oc); x++) { nc = gdImageTileGet(im,x,y); - pts[y + x*wx2]=1; + pts[y][x] = 1; gdImageSetPixel(im, x, y, nc); } FILL_PUSH(y, l, x-1, dy); @@ -2106,11 +2110,15 @@ if (xx2+1) { FILL_PUSH(y, x2+1, x-1, -dy); } -skip: for (x++; x=x2 (pts[y + x*wx2] || gdImageGetPixel(im,x, y)!=oc); x++); +skip: for(x++; x=x2 (pts[y][x] || gdImageGetPixel(im,x, y)!=oc); x++); l = x; } while (x=x2); } + for(i = 0; i im-sy + 1; i++) { + efree(pts[i]); + } + efree(pts); efree(stack); } http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/bug43121.phpt?view=markuprev=1.1 Index: php-src/ext/gd/tests/bug43121.phpt +++ php-src/ext/gd/tests/bug43121.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_3) /ext/gd/libgd gd.c /ext/gd/tests bug43121.gif bug43121.phpt
mattias Sun Nov 4 23:56:41 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/gd/tests bug43121.gif bug43121.phpt Modified files: /php-src/ext/gd/libgd gd.c Log: -MFB, Fixed Bug #43121 (gdImageFill with IMG_COLOR_TILED crashes httpd) http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.90.2.1.2.21r2=1.90.2.1.2.21.2.1diff_format=u Index: php-src/ext/gd/libgd/gd.c diff -u php-src/ext/gd/libgd/gd.c:1.90.2.1.2.21 php-src/ext/gd/libgd/gd.c:1.90.2.1.2.21.2.1 --- php-src/ext/gd/libgd/gd.c:1.90.2.1.2.21 Tue Sep 11 21:03:48 2007 +++ php-src/ext/gd/libgd/gd.c Sun Nov 4 23:56:41 2007 @@ -2050,14 +2050,14 @@ static void _gdImageFillTiled(gdImagePtr im, int x, int y, int nc) { - int l, x1, x2, dy; + int i, l, x1, x2, dy; int oc; /* old pixel value */ int tiled; int wx2,wy2; /* stack of filled segments */ struct seg *stack; struct seg *sp; - char *pts; + char **pts; if (!im-tile) { return; @@ -2067,7 +2067,11 @@ tiled = nc==gdTiled; nc = gdImageTileGet(im,x,y); - pts = (char *) ecalloc(im-sy * im-sx, sizeof(char)); + + pts = (char **) ecalloc(im-sy + 1, sizeof(char *)); + for (i = 0; i im-sy + 1; i++) { + pts[i] = (char *) ecalloc(im-sx + 1, sizeof(char)); + } stack = (struct seg *)safe_emalloc(sizeof(struct seg), ((int)(im-sy*im-sx)/4), 1); sp = stack; @@ -2080,9 +2084,9 @@ FILL_PUSH(y+1, x, x, -1); while (spstack) { FILL_POP(y, x1, x2, dy); - for (x=x1; x=0 (!pts[y + x*wx2] gdImageGetPixel(im,x,y)==oc); x--) { + for (x=x1; x=0 (!pts[y][x] gdImageGetPixel(im,x,y)==oc); x--) { nc = gdImageTileGet(im,x,y); - pts[y + x*wx2]=1; + pts[y][x] = 1; gdImageSetPixel(im,x, y, nc); } if (x=x1) { @@ -2096,9 +2100,9 @@ } x = x1+1; do { - for (; xwx2 (!pts[y + x*wx2] gdImageGetPixel(im,x, y)==oc) ; x++) { + for(; xwx2 (!pts[y][x] gdImageGetPixel(im,x, y)==oc); x++) { nc = gdImageTileGet(im,x,y); - pts[y + x*wx2]=1; + pts[y][x] = 1; gdImageSetPixel(im, x, y, nc); } FILL_PUSH(y, l, x-1, dy); @@ -2106,11 +2110,15 @@ if (xx2+1) { FILL_PUSH(y, x2+1, x-1, -dy); } -skip: for (x++; x=x2 (pts[y + x*wx2] || gdImageGetPixel(im,x, y)!=oc); x++); +skip: for(x++; x=x2 (pts[y][x] || gdImageGetPixel(im,x, y)!=oc); x++); l = x; } while (x=x2); } + for(i = 0; i im-sy + 1; i++) { + efree(pts[i]); + } + efree(pts); efree(stack); } http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/bug43121.phpt?view=markuprev=1.1 Index: php-src/ext/gd/tests/bug43121.phpt +++ php-src/ext/gd/tests/bug43121.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gd.c /ext/gd/tests bug43121.gif bug43121.phpt
mattias Sun Nov 4 23:57:07 2007 UTC Modified files: /php-src/ext/gd/libgd gd.c /php-src/ext/gd/tests bug43121.gif bug43121.phpt Log: -MFB, Fixed Bug #43121 (gdImageFill with IMG_COLOR_TILED crashes httpd) http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.113r2=1.114diff_format=u Index: php-src/ext/gd/libgd/gd.c diff -u php-src/ext/gd/libgd/gd.c:1.113 php-src/ext/gd/libgd/gd.c:1.114 --- php-src/ext/gd/libgd/gd.c:1.113 Tue Sep 11 21:07:04 2007 +++ php-src/ext/gd/libgd/gd.c Sun Nov 4 23:57:07 2007 @@ -2047,14 +2047,14 @@ static void _gdImageFillTiled(gdImagePtr im, int x, int y, int nc) { - int l, x1, x2, dy; + int i, l, x1, x2, dy; int oc; /* old pixel value */ int tiled; int wx2,wy2; /* stack of filled segments */ struct seg *stack; struct seg *sp; - char *pts; + char **pts; if (!im-tile) { return; @@ -2064,7 +2064,11 @@ tiled = nc==gdTiled; nc = gdImageTileGet(im,x,y); - pts = (char *) ecalloc(im-sy * im-sx, sizeof(char)); + + pts = (char **) ecalloc(im-sy + 1, sizeof(char *)); + for (i = 0; i im-sy + 1; i++) { + pts[i] = (char *) ecalloc(im-sx + 1, sizeof(char)); + } stack = (struct seg *)safe_emalloc(sizeof(struct seg), ((int)(im-sy*im-sx)/4), 1); sp = stack; @@ -2077,9 +2081,9 @@ FILL_PUSH(y+1, x, x, -1); while (spstack) { FILL_POP(y, x1, x2, dy); - for (x=x1; x=0 (!pts[y + x*wx2] gdImageGetPixel(im,x,y)==oc); x--) { + for (x=x1; x=0 (!pts[y][x] gdImageGetPixel(im,x,y)==oc); x--) { nc = gdImageTileGet(im,x,y); - pts[y + x*wx2]=1; + pts[y][x] = 1; gdImageSetPixel(im,x, y, nc); } if (x=x1) { @@ -2093,9 +2097,9 @@ } x = x1+1; do { - for (; xwx2 (!pts[y + x*wx2] gdImageGetPixel(im,x, y)==oc) ; x++) { + for(; xwx2 (!pts[y][x] gdImageGetPixel(im,x, y)==oc); x++) { nc = gdImageTileGet(im,x,y); - pts[y + x*wx2]=1; + pts[y][x] = 1; gdImageSetPixel(im, x, y, nc); } FILL_PUSH(y, l, x-1, dy); @@ -2103,11 +2107,15 @@ if (xx2+1) { FILL_PUSH(y, x2+1, x-1, -dy); } -skip: for (x++; x=x2 (pts[y + x*wx2] || gdImageGetPixel(im,x, y)!=oc); x++); +skip: for(x++; x=x2 (pts[y][x] || gdImageGetPixel(im,x, y)!=oc); x++); l = x; } while (x=x2); } + for(i = 0; i im-sy + 1; i++) { + efree(pts[i]); + } + efree(pts); efree(stack); } http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/bug43121.gif?r1=1.1r2=1.2diff_format=u Index: php-src/ext/gd/tests/bug43121.gif http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/bug43121.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/gd/tests/bug43121.phpt diff -u /dev/null php-src/ext/gd/tests/bug43121.phpt:1.2 --- /dev/null Sun Nov 4 23:57:07 2007 +++ php-src/ext/gd/tests/bug43121.phpt Sun Nov 4 23:57:07 2007 @@ -0,0 +1,21 @@ +--TEST-- +Bug #43121 (gdImageFill with IMG_COLOR_TILED crashes httpd) +--SKIPIF-- +?php + if (!extension_loaded('gd')) die(skip gd extension not available\n); +? +--FILE-- +?php +$im = ImageCreate( 200, 100 ); +$black = ImageColorAllocate( $im, 0, 0, 0 ); + +$im_tile = ImageCreateFromGif( transback.gif ); +ImageSetTile( $im, $im_tile ); +ImageFill( $im, 0, 0, IMG_COLOR_TILED ); + +ImageDestroy( $im ); + +print OK; +? +--EXPECTF-- +OK -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard http_fopen_wrapper.c
pollita Mon Nov 5 00:47:21 2007 UTC Modified files: /php-src/ext/standard http_fopen_wrapper.c Log: Allow http fopen wrapper to fetch content on 'error' condition (David Zulke) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.128r2=1.129diff_format=u Index: php-src/ext/standard/http_fopen_wrapper.c diff -u php-src/ext/standard/http_fopen_wrapper.c:1.128 php-src/ext/standard/http_fopen_wrapper.c:1.129 --- php-src/ext/standard/http_fopen_wrapper.c:1.128 Sun Sep 30 05:43:28 2007 +++ php-src/ext/standard/http_fopen_wrapper.c Mon Nov 5 00:47:21 2007 @@ -19,7 +19,7 @@ | Sara Golemon [EMAIL PROTECTED] | +--+ */ -/* $Id: http_fopen_wrapper.c,v 1.128 2007/09/30 05:43:28 jani Exp $ */ +/* $Id: http_fopen_wrapper.c,v 1.129 2007/11/05 00:47:21 pollita Exp $ */ #include php.h #include php_globals.h @@ -544,7 +544,8 @@ response_code = 0; } /* when we request only the header, don't fail even on error codes */ - if (options STREAM_ONLY_GET_HEADERS) { + if ((options STREAM_ONLY_GET_HEADERS) || + (php_stream_context_get_option(context, http, ignore_errors, tmpzval) == SUCCESS zend_is_true(*tmpzval)) ) { reqok = 1; } switch(response_code) { -- 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 /ext/standard http_fopen_wrapper.c
pollita Mon Nov 5 01:00:44 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard http_fopen_wrapper.c /php-srcNEWS Log: MFH: http/ignore_errors context option http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.9.2.1r2=1.99.2.12.2.9.2.2diff_format=u Index: php-src/ext/standard/http_fopen_wrapper.c diff -u php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9.2.1 php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9.2.2 --- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9.2.1 Sun Sep 30 05:49:45 2007 +++ php-src/ext/standard/http_fopen_wrapper.c Mon Nov 5 01:00:43 2007 @@ -19,7 +19,7 @@ | Sara Golemon [EMAIL PROTECTED] | +--+ */ -/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.9.2.1 2007/09/30 05:49:45 jani Exp $ */ +/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.9.2.2 2007/11/05 01:00:43 pollita Exp $ */ #include php.h #include php_globals.h @@ -501,7 +501,8 @@ response_code = 0; } /* when we request only the header, don't fail even on error codes */ - if (options STREAM_ONLY_GET_HEADERS) { + if ((options STREAM_ONLY_GET_HEADERS) || + (php_stream_context_get_option(context, http, ignore_errors, tmpzval) == SUCCESS zend_is_true(*tmpzval)) ) { reqok = 1; } switch(response_code) { http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.40r2=1.2027.2.547.2.965.2.41diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.40 php-src/NEWS:1.2027.2.547.2.965.2.41 --- php-src/NEWS:1.2027.2.547.2.965.2.40Sat Nov 3 20:56:58 2007 +++ php-src/NEWSMon Nov 5 01:00:43 2007 @@ -22,6 +22,7 @@ (Etienne Kneuss) - Added compact handler for Zend MM storage. (Dmitry) - Added '+' and '*' specifiers to zend_parse_parameters(). (Andrei) +- Added 'ignore_errors' option to http fopen wrapper. (David Zulke, Sara) - Upgraded PCRE to version 7.4 (Nuno) -- 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/gd/tests bug43121.phpt
mattias Mon Nov 5 01:14:19 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/gd/tests bug43121.phpt Log: - Right filename http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/bug43121.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/gd/tests/bug43121.phpt diff -u php-src/ext/gd/tests/bug43121.phpt:1.1.2.1 php-src/ext/gd/tests/bug43121.phpt:1.1.2.2 --- php-src/ext/gd/tests/bug43121.phpt:1.1.2.1 Sun Nov 4 23:56:00 2007 +++ php-src/ext/gd/tests/bug43121.phpt Mon Nov 5 01:14:18 2007 @@ -9,7 +9,7 @@ $im = ImageCreate( 200, 100 ); $black = ImageColorAllocate( $im, 0, 0, 0 ); -$im_tile = ImageCreateFromGif( transback.gif ); +$im_tile = ImageCreateFromGif(dirname(__FILE__) . /bug43121.gif ); ImageSetTile( $im, $im_tile ); ImageFill( $im, 0, 0, IMG_COLOR_TILED ); -- 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/gd/tests bug43121.phpt
mattias Mon Nov 5 01:14:31 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd/tests bug43121.phpt Log: -MFB, Right filename http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/bug43121.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/gd/tests/bug43121.phpt diff -u php-src/ext/gd/tests/bug43121.phpt:1.1.4.2 php-src/ext/gd/tests/bug43121.phpt:1.1.4.3 --- php-src/ext/gd/tests/bug43121.phpt:1.1.4.2 Sun Nov 4 23:56:41 2007 +++ php-src/ext/gd/tests/bug43121.phpt Mon Nov 5 01:14:31 2007 @@ -9,7 +9,7 @@ $im = ImageCreate( 200, 100 ); $black = ImageColorAllocate( $im, 0, 0, 0 ); -$im_tile = ImageCreateFromGif( transback.gif ); +$im_tile = ImageCreateFromGif(dirname(__FILE__) . /bug43121.gif ); ImageSetTile( $im, $im_tile ); ImageFill( $im, 0, 0, IMG_COLOR_TILED ); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/tests bug43121.phpt
mattias Mon Nov 5 01:14:44 2007 UTC Modified files: /php-src/ext/gd/tests bug43121.phpt Log: -MFB, Right filename http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/bug43121.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/gd/tests/bug43121.phpt diff -u php-src/ext/gd/tests/bug43121.phpt:1.2 php-src/ext/gd/tests/bug43121.phpt:1.3 --- php-src/ext/gd/tests/bug43121.phpt:1.2 Sun Nov 4 23:57:07 2007 +++ php-src/ext/gd/tests/bug43121.phpt Mon Nov 5 01:14:44 2007 @@ -9,7 +9,7 @@ $im = ImageCreate( 200, 100 ); $black = ImageColorAllocate( $im, 0, 0, 0 ); -$im_tile = ImageCreateFromGif( transback.gif ); +$im_tile = ImageCreateFromGif(dirname(__FILE__) . /bug43121.gif ); ImageSetTile( $im, $im_tile ); ImageFill( $im, 0, 0, IMG_COLOR_TILED ); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Mon Nov 5 03:44:47 2007 UTC Modified files: /CVSROOTavail Log: pecl/usblib karma for bdeshong http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1320r2=1.1321diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1320 CVSROOT/avail:1.1321 --- CVSROOT/avail:1.1320Sun Nov 4 17:01:57 2007 +++ CVSROOT/avail Mon Nov 5 03:44:47 2007 @@ -287,6 +287,7 @@ avail|rotsenmarcello|pecl/puno avail|lwe|pecl/pdo_firebird,php-src/ext/pdo_firebird avail|mkoppanen|pecl/ssh2 +avail|bdeshong|pecl/usblib # Objective-C bridge avail|wez,jan|php-objc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php