Re: [PHP-CVS] cvs: php-src /ext/oci8 oci8.c
On Sat, 20 Nov 2004 23:07:49 -0800 Andi Gutmans <[EMAIL PROTECTED]> wrote: > Weird. Did you look via web interface or CVS? > When check with cvs update -A and cvs update -r PHP_5_0 I do get the > result as seen by the CVS commit message (HEAD is changed, PHP_5_0 > isn't). Any chance you are doing something wrong? :) # cvs -d :pserver:[EMAIL PROTECTED]:/repository co -r HEAD php-src/ext/oci8/oci8.c U php-src/ext/oci8/oci8.c # cat php-src/ext/oci8/oci8.c | grep pcleanup static int _sessions_pcleanup(zend_llist *session_list) static int _session_pcleanup(oci_session *session) static int _server_pcleanup(oci_server *server) zend_ts_hash_init(persistent_servers, 13, NULL, (dtor_func_t) _server_pcleanup, 1); zend_ts_hash_init(persistent_sessions, 13, NULL, (dtor_func_t) _sessions_pcleanup, 1); zend_llist_init(&tmp, sizeof(oci_session), (llist_dtor_func_t) _session_pcleanup, 1); and in the same time: # cvs -d :pserver:[EMAIL PROTECTED]:/repository co -r PHP_5_0 php-src/ext/oci8/oci8.c U php-src/ext/oci8/oci8.c # cat php-src/ext/oci8/oci8.c | grep pcleanup static int _sessions_pcleanup(zend_llist *session_list TSRMLS_DC) static int _session_pcleanup(oci_session *session TSRMLS_DC) static int _server_pcleanup(oci_server *server TSRMLS_DC) :/ -- Wbr, Antony Dovgal aka tony2001 [EMAIL PROTECTED] || [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/oci8 oci8.c
Weird. Did you look via web interface or CVS? When check with cvs update -A and cvs update -r PHP_5_0 I do get the result as seen by the CVS commit message (HEAD is changed, PHP_5_0 isn't). Any chance you are doing something wrong? :) Andi At 09:59 AM 11/21/2004 +0300, Antony Dovgal wrote: On Sat, 20 Nov 2004 22:18:51 -0800 Andi Gutmans <[EMAIL PROTECTED]> wrote: > Hmm my log message didn't come through. The callback prototypes don't > take TSRMLS_CC Thanks, Andi, it was quite clear from the diff =) Btw, something very strange is happening: you committed it to HEAD, but it seems, that the patch appeared in 5_0 instead. I've checked and rechecked it a couple of times and still can't believe my eyes. Furthermore, I've checked out a clean HEAD from the CVS and your patch is not there. CVS is b0rked ? -- Wbr, Antony Dovgal aka tony2001 [EMAIL PROTECTED] || [EMAIL PROTECTED] -- 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
Re: [PHP-CVS] cvs: php-src /ext/oci8 oci8.c
On Sat, 20 Nov 2004 22:18:51 -0800 Andi Gutmans <[EMAIL PROTECTED]> wrote: > Hmm my log message didn't come through. The callback prototypes don't > take TSRMLS_CC Thanks, Andi, it was quite clear from the diff =) Btw, something very strange is happening: you committed it to HEAD, but it seems, that the patch appeared in 5_0 instead. I've checked and rechecked it a couple of times and still can't believe my eyes. Furthermore, I've checked out a clean HEAD from the CVS and your patch is not there. CVS is b0rked ? -- Wbr, Antony Dovgal aka tony2001 [EMAIL PROTECTED] || [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/oci8 oci8.c
Hmm my log message didn't come through. The callback prototypes don't take TSRMLS_CC At 06:17 AM 11/21/2004 +, Andi Gutmans wrote: andiSun Nov 21 01:17:35 2004 EDT Modified files: /php-src/ext/oci8 oci8.c Log: http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.263&r2=1.264&ty=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.263 php-src/ext/oci8/oci8.c:1.264 --- php-src/ext/oci8/oci8.c:1.263 Sat Oct 23 05:32:44 2004 +++ php-src/ext/oci8/oci8.c Sun Nov 21 01:17:32 2004 @@ -22,7 +22,7 @@ +--+ */ -/* $Id: oci8.c,v 1.263 2004/10/23 09:32:44 tony2001 Exp $ */ +/* $Id: oci8.c,v 1.264 2004/11/21 06:17:32 andi Exp $ */ /* TODO list: * @@ -576,21 +576,21 @@ ); } -static int _sessions_pcleanup(zend_llist *session_list TSRMLS_DC) +static int _sessions_pcleanup(zend_llist *session_list) { zend_llist_destroy(session_list); return 1; } -static int _session_pcleanup(oci_session *session TSRMLS_DC) +static int _session_pcleanup(oci_session *session) { _oci_close_session(session); return 1; } -static int _server_pcleanup(oci_server *server TSRMLS_DC) +static int _server_pcleanup(oci_server *server) { _oci_close_server(server); @@ -786,7 +786,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.263 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.264 $"); sprintf(buf, "%ld", num_persistent); php_info_print_table_row(2, "Active Persistent Links", buf); -- 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 /ext/oci8 oci8.c
andiSun Nov 21 01:17:35 2004 EDT Modified files: /php-src/ext/oci8 oci8.c Log: http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.263&r2=1.264&ty=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.263 php-src/ext/oci8/oci8.c:1.264 --- php-src/ext/oci8/oci8.c:1.263 Sat Oct 23 05:32:44 2004 +++ php-src/ext/oci8/oci8.c Sun Nov 21 01:17:32 2004 @@ -22,7 +22,7 @@ +--+ */ -/* $Id: oci8.c,v 1.263 2004/10/23 09:32:44 tony2001 Exp $ */ +/* $Id: oci8.c,v 1.264 2004/11/21 06:17:32 andi Exp $ */ /* TODO list: * @@ -576,21 +576,21 @@ ); } -static int _sessions_pcleanup(zend_llist *session_list TSRMLS_DC) +static int _sessions_pcleanup(zend_llist *session_list) { zend_llist_destroy(session_list); return 1; } -static int _session_pcleanup(oci_session *session TSRMLS_DC) +static int _session_pcleanup(oci_session *session) { _oci_close_session(session); return 1; } -static int _server_pcleanup(oci_server *server TSRMLS_DC) +static int _server_pcleanup(oci_server *server) { _oci_close_server(server); @@ -786,7 +786,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.263 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.264 $"); sprintf(buf, "%ld", num_persistent); php_info_print_table_row(2, "Active Persistent Links", buf); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /main rfc1867.c
sesser Sat Nov 20 15:16:44 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/main rfc1867.c Log: MFH http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.122.2.27&r2=1.122.2.28&ty=u Index: php-src/main/rfc1867.c diff -u php-src/main/rfc1867.c:1.122.2.27 php-src/main/rfc1867.c:1.122.2.28 --- php-src/main/rfc1867.c:1.122.2.27 Wed Nov 10 19:40:18 2004 +++ php-src/main/rfc1867.c Sat Nov 20 15:16:44 2004 @@ -16,7 +16,7 @@ | Jani Taskinen <[EMAIL PROTECTED]> | +--+ */ -/* $Id: rfc1867.c,v 1.122.2.27 2004/11/11 00:40:18 iliaa Exp $ */ +/* $Id: rfc1867.c,v 1.122.2.28 2004/11/20 20:16:44 sesser Exp $ */ /* * This product includes software developed by the Apache Group @@ -1081,6 +1081,14 @@ s = tmp; } #endif + if (PG(magic_quotes_gpc)) { + s = s ? s : filename; + tmp = strrchr(s, '\''); + s = tmp > s ? tmp : s; + tmp = strrchr(s, '"'); + s = tmp > s ? tmp : s; + } + if (s && s > filename) { safe_php_register_variable(lbuf, s+1, NULL, 0 TSRMLS_CC); } else { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /main rfc1867.c
sesser Sat Nov 20 15:16:28 2004 EDT Modified files: (Branch: PHP_5_0) /php-src/main rfc1867.c Log: MFH http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.159.2.5&r2=1.159.2.6&ty=u Index: php-src/main/rfc1867.c diff -u php-src/main/rfc1867.c:1.159.2.5 php-src/main/rfc1867.c:1.159.2.6 --- php-src/main/rfc1867.c:1.159.2.5Wed Nov 10 19:38:44 2004 +++ php-src/main/rfc1867.c Sat Nov 20 15:16:27 2004 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: rfc1867.c,v 1.159.2.5 2004/11/11 00:38:44 iliaa Exp $ */ +/* $Id: rfc1867.c,v 1.159.2.6 2004/11/20 20:16:27 sesser Exp $ */ /* * This product includes software developed by the Apache Group @@ -1095,6 +1095,13 @@ } #endif if (!is_anonymous) { + if (PG(magic_quotes_gpc)) { + s = s ? s : filename; + tmp = strrchr(s, '\''); + s = tmp > s ? tmp : s; + tmp = strrchr(s, '"'); + s = tmp > s ? tmp : s; + } if (s && s > filename) { safe_php_register_variable(lbuf, s+1, NULL, 0 TSRMLS_CC); } else { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main rfc1867.c
sesser Sat Nov 20 13:49:37 2004 EDT Modified files: /php-src/main rfc1867.c Log: Fixed: strip quotes from filename http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.164&r2=1.165&ty=u Index: php-src/main/rfc1867.c diff -u php-src/main/rfc1867.c:1.164 php-src/main/rfc1867.c:1.165 --- php-src/main/rfc1867.c:1.164Wed Nov 10 19:38:04 2004 +++ php-src/main/rfc1867.c Sat Nov 20 13:49:36 2004 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: rfc1867.c,v 1.164 2004/11/11 00:38:04 iliaa Exp $ */ +/* $Id: rfc1867.c,v 1.165 2004/11/20 18:49:36 sesser Exp $ */ /* * This product includes software developed by the Apache Group @@ -1094,7 +1094,15 @@ s = tmp; } #endif + if (!is_anonymous) { + if (PG(magic_quotes_gpc)) { + s = s ? s : filename; + tmp = strrchr(s, '\''); + s = tmp > s ? tmp : s; + tmp = strrchr(s, '"'); + s = tmp > s ? tmp : s; + } if (s && s > filename) { safe_php_register_variable(lbuf, s+1, NULL, 0 TSRMLS_CC); } else { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
pajoye Sat Nov 20 08:40:31 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: - Entry for #30229 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.756&r2=1.1247.2.757&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.756 php-src/NEWS:1.1247.2.757 --- php-src/NEWS:1.1247.2.756 Fri Nov 19 12:03:52 2004 +++ php-src/NEWSSat Nov 20 08:40:30 2004 @@ -29,6 +29,8 @@ - Fixed bug #30281 (Prevent non-wbmp images from being detected as such). (Ilia) - Fixed bug #30276 (Possible crash in ctype_digit on large numbers). (Ilia) +- Fixed bug #30229 (imagerectangle and imagefilledrectangle do work well + with alpha channel, corners are drawn twice) (Pierre) - Fixed bug #30224 (Sybase date strings are sometimes not null terminated). (Ilia) - Fixed bug #30133 (get_current_user() crashes on Windows). (Edin) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/gd/libgd gd.c
pajoye Sat Nov 20 08:34:53 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/gd/libgd gd.c Log: - Fix #30229, imagerectangle draw the corners twice, making it useless with alpha channel. Fix it to work well with thick>1 as well, both filled and wired rectangle http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd.c?r1=1.24.2.34&r2=1.24.2.35&ty=u Index: php-src/ext/gd/libgd/gd.c diff -u php-src/ext/gd/libgd/gd.c:1.24.2.34 php-src/ext/gd/libgd/gd.c:1.24.2.35 --- php-src/ext/gd/libgd/gd.c:1.24.2.34 Wed Nov 17 12:13:42 2004 +++ php-src/ext/gd/libgd/gd.c Sat Nov 20 08:34:52 2004 @@ -2029,24 +2029,72 @@ { int x1h = x1, x1v = x1, y1h = y1, y1v = y1, x2h = x2, x2v = x2, y2h = y2, y2v = y2; int thick = im->thick; + int half1 = 1; + int t; + if (y2 < y1) { + t=y1; + y1 = y2; + y2 = t; + + t = x1; + x1 = x2; + x2 = t; + } + + x1h = x1; x1v = x1; y1h = y1; y1v = y1; x2h = x2; x2v = x2; y2h = y2; y2v = y2; if (thick > 1) { - int half = thick / 2; - int half1 = thick - half; + int cx, cy, x1ul, y1ul, x2lr, y2lr; + int half = thick >> 1; + half1 = thick - half; + x1ul = x1 - half; + y1ul = y1 - half; + + x2lr = x2 + half; + y2lr = y2 + half; - if (y1 < y2) { - y1v = y1h - half; - y2v = y2h + half1 - 1; - } else { - y1v = y1h + half1 - 1; - y2v = y2h - half; + cy = y1ul + thick; + while (cy-- > y1ul) { + cx = x1ul - 1; + while (cx++ < x2lr) { + gdImageSetPixel(im, cx, cy, color); + } } + + cy = y2lr - thick; + while (cy++ < y2lr) { + cx = x1ul - 1; + while (cx++ < x2lr) { + gdImageSetPixel(im, cx, cy, color); + } + } + + cy = y1ul + thick - 1; + while (cy++ < y2lr -thick) { + cx = x1ul - 1; + while (cx++ < x1ul + thick) { + gdImageSetPixel(im, cx, cy, color); + } + } + + cy = y1ul + thick - 1; + while (cy++ < y2lr -thick) { + cx = x2lr - thick - 1; + while (cx++ < x2lr) { + gdImageSetPixel(im, cx, cy, color); + } + } + + return; + } else { + y1v = y1h + 1; + y2v = y2h - 1; + gdImageLine(im, x1h, y1h, x2h, y1h, color); + gdImageLine(im, x1h, y2h, x2h, y2h, color); + gdImageLine(im, x1v, y1v, x1v, y2v, color); + gdImageLine(im, x2v, y1v, x2v, y2v, color); } - gdImageLine(im, x1h, y1h, x2h, y1h, color); - gdImageLine(im, x1h, y2h, x2h, y2h, color); - gdImageLine(im, x1v, y1v, x1v, y2v, color); - gdImageLine(im, x2v, y1v, x2v, y2v, color); } void gdImageFilledRectangle (gdImagePtr im, int x1, int y1, int x2, int y2, int color) @@ -2069,6 +2117,16 @@ if (y1 > gdImageSY(im)) { y1 = gdImageSY(im); } + if (y2 < y1) { + int t; + t=y1; + y1 = y2; + y2 = t; + + t = x1; + x1 = x2; + x2 = t; + } for (y = y1; (y <= y2); y++) { for (x = x1; (x <= x2); x++) { -- 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 gdft.c
pajoye Sat Nov 20 08:09:46 2004 EDT Modified files: /php-src/ext/gd/libgd gdft.c Log: - Attempt to fix #28598, bug introduced in GD (around php 4.3.4) The way they fix MS Symbol are wrong, multiple faces support hould added later, safer. Please test it with your weird fonts, if it works, MFH will be done. http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gdft.c?r1=1.35&r2=1.36&ty=u Index: php-src/ext/gd/libgd/gdft.c diff -u php-src/ext/gd/libgd/gdft.c:1.35 php-src/ext/gd/libgd/gdft.c:1.36 --- php-src/ext/gd/libgd/gdft.c:1.35Wed Jun 9 10:50:05 2004 +++ php-src/ext/gd/libgd/gdft.c Sat Nov 20 08:09:45 2004 @@ -915,10 +915,12 @@ /* EAM DEBUG */ #if (defined(FREETYPE_MAJOR) && ((FREETYPE_MAJOR == 2 && ((FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 3) || FREETYPE_MINOR > 1) || FREETYPE_MAJOR > 2))) - if (font->face->charmap->encoding == FT_ENCODING_MS_SYMBOL) { + if (font->face->charmap->encoding == FT_ENCODING_MS_SYMBOL && strcmp(font->face->family_name, "Symbol") == 0) { /* I do not know the significance of the constant 0xf000. * It was determined by inspection of the character codes * stored in Microsoft font symbol. +* Added by Pierre ([EMAIL PROTECTED]): +* Convert to the Symbol glyph range only for a Symbol family member */ len = gdTcl_UtfToUniChar (next, &ch); ch |= 0xf000; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/com_dotnet com_handlers.c
rrichards Sat Nov 20 06:41:24 2004 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/com_dotnet com_handlers.c Log: MFH: fix crash when calling com methods - due to change in Zend http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_handlers.c?r1=1.22.2.1&r2=1.22.2.2&ty=u Index: php-src/ext/com_dotnet/com_handlers.c diff -u php-src/ext/com_dotnet/com_handlers.c:1.22.2.1 php-src/ext/com_dotnet/com_handlers.c:1.22.2.2 --- php-src/ext/com_dotnet/com_handlers.c:1.22.2.1 Wed Jul 28 19:48:26 2004 +++ php-src/ext/com_dotnet/com_handlers.c Sat Nov 20 06:41:24 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: com_handlers.c,v 1.22.2.1 2004/07/28 23:48:26 wez Exp $ */ +/* $Id: com_handlers.c,v 1.22.2.2 2004/11/20 11:41:24 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -293,12 +293,13 @@ INTERNAL_FUNCTION_PARAM_PASSTHRU); } -static union _zend_function *com_method_get(zval *object, char *name, int len TSRMLS_DC) +static union _zend_function *com_method_get(zval **object_ptr, char *name, int len TSRMLS_DC) { zend_internal_function f, *fptr = NULL; php_com_dotnet_object *obj; union _zend_function *func; DISPID dummy; + zval *object = *object_ptr; obj = CDNO_FETCH(object); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/com_dotnet com_handlers.c
rrichards Sat Nov 20 06:40:49 2004 EDT Modified files: /php-src/ext/com_dotnet com_handlers.c Log: fix crash when calling com methods - due to change in Zend http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_handlers.c?r1=1.26&r2=1.27&ty=u Index: php-src/ext/com_dotnet/com_handlers.c diff -u php-src/ext/com_dotnet/com_handlers.c:1.26 php-src/ext/com_dotnet/com_handlers.c:1.27 --- php-src/ext/com_dotnet/com_handlers.c:1.26 Thu Jul 29 10:06:24 2004 +++ php-src/ext/com_dotnet/com_handlers.c Sat Nov 20 06:40:49 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: com_handlers.c,v 1.26 2004/07/29 14:06:24 wez Exp $ */ +/* $Id: com_handlers.c,v 1.27 2004/11/20 11:40:49 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -293,12 +293,13 @@ INTERNAL_FUNCTION_PARAM_PASSTHRU); } -static union _zend_function *com_method_get(zval *object, char *name, int len TSRMLS_DC) +static union _zend_function *com_method_get(zval **object_ptr, char *name, int len TSRMLS_DC) { zend_internal_function f, *fptr = NULL; php_com_dotnet_object *obj; union _zend_function *func; DISPID dummy; + zval *object = *object_ptr; obj = CDNO_FETCH(object); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php