Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:32002 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 73669 invoked by uid 1010); 31 Aug 2007 15:21:02 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 73653 invoked from network); 31 Aug 2007 15:21:02 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 31 Aug 2007 15:21:02 -0000 Authentication-Results: pb1.pair.com smtp.mail=buildsmart@daleenterprise.com; spf=permerror; sender-id=unknown Authentication-Results: pb1.pair.com header.from=buildsmart@daleenterprise.com; sender-id=unknown Received-SPF: error (pb1.pair.com: domain daleenterprise.com from 67.78.11.229 cause and error) X-PHP-List-Original-Sender: buildsmart@daleenterprise.com X-Host-Fingerprint: 67.78.11.229 daleenterprise.com Received: from [67.78.11.229] ([67.78.11.229:60330] helo=daleenterprise.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id F0/58-22642-DD138D64 for ; Fri, 31 Aug 2007 11:21:02 -0400 Received: from localhost (localhost [127.0.0.1]) by daleenterprise.com (Postfix) with ESMTP id A3195227210; Fri, 31 Aug 2007 11:20:58 -0400 (EDT) Received: from daleenterprise.com ([127.0.0.1]) by localhost (daleenterprise.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 02390-14; Fri, 31 Aug 2007 11:20:54 -0400 (EDT) Received: from [10.1.100.11] (relay.mustangrestomods.com [67.78.11.226]) by daleenterprise.com (Postfix) with ESMTP id 5633A227206; Fri, 31 Aug 2007 11:20:44 -0400 (EDT) In-Reply-To: <1188572278.3347.4.camel@localhost.localdomain> References: <1188572278.3347.4.camel@localhost.localdomain> Mime-Version: 1.0 (Apple Message framework v752.2) Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-ID: <8CDA5C90-19DC-4F29-B514-121287A109BB@daleenterprise.com> Cc: jani.taskinen@iki.fi Content-Transfer-Encoding: 7bit Date: Fri, 31 Aug 2007 11:20:43 -0400 To: PHP Developers Mailing List X-Pgp-Agent: GPGMail 1.1.2 (Tiger) X-Mailer: Apple Mail (2.752.2) MTA-Interface: amavisd-new-2.3.3 (2005-08-22) + Maia Mailguard 1.1.0 at daleenterprise.com X-Spam-Scanned: using SpamAssassin 3.1.7 (2006-10-05) at daleenterprise.com X-Virus-Scanned: using ClamAV 0.88.6 (2006-11-05) at daleenterprise.com Subject: Re: [PHP-DEV] pop3 patch From: buildsmart@daleenterprise.com (BuildSmart) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Funny but I was told to just publish my patches here and the appropriate person would pick up the info however, anything not directly included with the php distro will be submitted to the pecl list. On Aug 31, 2007, at 10:57:58, Jani Taskinen wrote: > This is not the list your looking for..try the pecl list instead: > http://pecl.php.net/support.php#lists > > --Jani > > On Fri, 2007-08-31 at 10:26 -0400, BuildSmart wrote: >> -----BEGIN PGP SIGNED MESSAGE----- >> Hash: SHA1 >> >> A quick fix to get pop3 working in PHP6, there might be a better way >> but this solution seemed to work with the least amount of changes, >> tested in 4.3.10, 4.4.0, 5.1.6, 5.2.3 and 6.0.0-dev all of which >> worked. >> >> link: >> http://daleenterprise.com/pop3.diff >> >> diff file: >> diff -Naur ext/pop3.orig/pop3.c ext/pop3/pop3.c >> - --- ext/pop3.orig/pop3.c 2006-10-11 20:23:48.000000000 -0400 >> +++ ext/pop3/pop3.c 2007-08-31 10:21:21.000000000 -0400 >> @@ -1,8 +1,8 @@ >> /* >> >> +-------------------------------------------------------------------- >> --+ >> - - | PHP Version >> 4 | >> + | PHP Version 4, 5, >> 6 | >> >> +-------------------------------------------------------------------- >> --+ >> - - | Copyright (c) 1997-2004 The PHP >> Group | >> + | Copyright (c) 1997-2007 The PHP >> Group | >> >> +-------------------------------------------------------------------- >> --+ >> | This source file is subject to version 3 of the PHP >> license, | >> | that is bundled with this package in the file LICENSE, and >> is | >> @@ -14,9 +14,10 @@ >> >> +-------------------------------------------------------------------- >> --+ >> | Authors: Marco Tabini >> | >> | Ilia Alshanetsky >> | >> + | Dale Walsh >> | >> >> +-------------------------------------------------------------------- >> --+ >> - - $Id: pop3.c,v 1.21 2006/10/12 00:23:48 iliaa Exp $ >> + $Id: pop3.c,v 1.22 2007/08/31 09:23:48 iliaa Exp $ >> */ >> #ifdef HAVE_CONFIG_H >> @@ -42,7 +43,7 @@ >> /* {{{ Internal macros */ >> - -#define POP3_VERSION "1.0.2" >> +#define POP3_VERSION "1.0.3" >> #define POP3_RESOURCE_NAME "POP3 Library Session" >> #define POP3_FETCH_SESSION(session, session_container) \ >> @@ -100,7 +101,11 @@ >> char buffer[2048]; >> size_t fetch_len; >> +#if PHP_MAJOR_VERSION > 4 >> + if (!php_stream_get_line(stream, ZSTR(buffer), sizeof(buffer) - 1, >> &fetch_len)) { >> +#else >> if (!php_stream_get_line(stream, buffer, sizeof(buffer) - 1, >> &fetch_len)) { >> +#endif >> php_error_docref(NULL TSRMLS_CC, E_ERROR, "I/O Error when receiving >> data from the server"); >> } >> @@ -583,7 +588,11 @@ >> do { >> zval *row; >> +#if PHP_MAJOR_VERSION > 4 >> + if (!php_stream_gets(stream, ZSTR(pop3_return_val), sizeof >> (pop3_return_val) - 1)) { >> +#else >> if (!php_stream_gets(stream, pop3_return_val, sizeof >> (pop3_return_val) - 1)) { >> +#endif >> php_error_docref(NULL TSRMLS_CC, E_WARNING, "POP3: Unable to >> retrieve message list"); >> zval_dtor(return_value); >> RETURN_FALSE; >> @@ -643,7 +652,11 @@ >> do { >> +#if PHP_MAJOR_VERSION > 4 >> + if (!php_stream_gets(stream, ZSTR(pop3_return_val), sizeof >> (pop3_return_val) - 1)) { >> +#else >> if (!php_stream_gets(stream, pop3_return_val, sizeof >> (pop3_return_val) - 1)) { >> +#endif >> php_error_docref(NULL TSRMLS_CC, E_WARNING, "POP3: Unable to >> retrieve message list"); >> zval_dtor(return_value); >> RETURN_FALSE; >> @@ -758,7 +771,11 @@ >> length = 0; >> do { >> +#if PHP_MAJOR_VERSION > 4 >> + if (!php_stream_get_line(stream, ZSTR(pop3_return_val), sizeof >> (pop3_return_val) - 1, &fetch_len)) { >> +#else >> if (!php_stream_get_line(stream, pop3_return_val, sizeof >> (pop3_return_val) - 1, &fetch_len)) { >> +#endif >> efree(result); >> php_error_docref(NULL TSRMLS_CC, E_WARNING, "POP3: I/O failure >> reading from server"); >> RETURN_FALSE; >> >> -----BEGIN PGP SIGNATURE----- >> Version: GnuPG v1.4.2.2 (Darwin) >> >> iD8DBQFG2CUZ0hzWbkf0eKgRAljEAKCWQLRmOxgDjx7RvxUiQQlMypHxQwCeMpuy >> UVPNfP/veKki0uZKlVodriQ= >> =c0Vr >> -----END PGP SIGNATURE----- >> > -- > Make me happy: http://pecl.php.net/wishlist.php/jani - -- BuildSmart -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (Darwin) iD8DBQFG2DHL0hzWbkf0eKgRAu0uAKDUCTnRdj8AAYhCbie7lokYfPk6HQCg3LC4 tasr3uWrqVYsCurpJcTGbqs= =/4Ed -----END PGP SIGNATURE-----