In-Reply-To: <[EMAIL PROTECTED]>
Message-ID: <[EMAIL PROTECTED]>
References: <[EMAIL PROTECTED]>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Can I now say "I told you so." ? :)
--Jani
On Wed, 7 Dec 2005, Ilia Alshanetsky wrote:
>
> iliaa Wed Dec 7 12:36:21 2005 EDT
>
> Modified files: (Branch: PHP_5_1)
> /php-src/ext/standard basic_functions.c
> Log:
> Undo accidental revert of patch for bug #34729
>
>
> http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.725.2.11&r2=1.725.2.12&ty=u
> Index: php-src/ext/standard/basic_functions.c
> diff -u php-src/ext/standard/basic_functions.c:1.725.2.11
> php-src/ext/standard/basic_functions.c:1.725.2.12
> --- php-src/ext/standard/basic_functions.c:1.725.2.11 Mon Dec 5 17:53:56 2005
> +++ php-src/ext/standard/basic_functions.c Wed Dec 7 12:36:17 2005
> @@ -17,7 +17,7 @@
> +----------------------------------------------------------------------+
> */
>
> -/* $Id: basic_functions.c,v 1.725.2.11 2005/12/05 22:53:56 sniper Exp $ */
> +/* $Id: basic_functions.c,v 1.725.2.12 2005/12/07 17:36:17 iliaa Exp $ */
>
> #include "php.h"
> #include "php_streams.h"
> @@ -107,6 +107,8 @@
> #include "php_fopen_wrappers.h"
> #include "streamsfuncs.h"
>
> +static zend_class_entry *incomplete_class_entry = NULL;
> +
> static
> ZEND_BEGIN_ARG_INFO(first_and_second__args_force_ref, 0)
> ZEND_ARG_PASS_INFO(1)
> @@ -955,8 +957,7 @@
> #if defined(_REENTRANT) && defined(HAVE_MBRLEN) && defined(HAVE_MBSTATE_T)
> memset(&BG(mblen_state), 0, sizeof(BG(mblen_state)));
> #endif
> -
> - BG(incomplete_class) = php_create_incomplete_class(TSRMLS_C);
> + BG(incomplete_class) = incomplete_class_entry;
> }
>
>
> @@ -1022,6 +1023,8 @@
> #endif
> #endif
>
> + BG(incomplete_class) = incomplete_class_entry =
> php_create_incomplete_class(TSRMLS_C);
> +
> REGISTER_LONG_CONSTANT("CONNECTION_ABORTED", PHP_CONNECTION_ABORTED,
> CONST_CS | CONST_PERSISTENT);
> REGISTER_LONG_CONSTANT("CONNECTION_NORMAL", PHP_CONNECTION_NORMAL,
> CONST_CS | CONST_PERSISTENT);
> REGISTER_LONG_CONSTANT("CONNECTION_TIMEOUT", PHP_CONNECTION_TIMEOUT,
> CONST_CS | CONST_PERSISTENT);
>
>
--
Give me your money at @ <http://pecl.php.net/wishlist.php/sniper>
Donating money may make me happier and friendlier for a limited period!
Death to all 4 letter abbreviations starting with P!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
