cvs: php-src /ext/com_dotnet com_extension.c
| From: | Ilia Alshanetsky | Date: | Wed, 18 Oct 2006 23:47:46 +0000 |
| Subject: | cvs: php-src /ext/com_dotnet com_extension.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-41158@lists.php.net to get a copy of this message | ||
iliaa Wed Oct 18 23:47:46 2006 UTC
Modified files:
/php-src/ext/com_dotnet com_extension.c
Log:
MFB: Fixed bug #38400 (Use of com.typelib_file may cause a crash).
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_extension.c?r1=1.22&r2=1.23&diff_format=u
Index: php-src/ext/com_dotnet/com_extension.c
diff -u php-src/ext/com_dotnet/com_extension.c:1.22 php-src/ext/com_dotnet/com_extension.c:1.23
--- php-src/ext/com_dotnet/com_extension.c:1.22 Fri Sep 8 05:52:15 2006
+++ php-src/ext/com_dotnet/com_extension.c Wed Oct 18 23:47:46 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_extension.c,v 1.22 2006/09/08 05:52:15 dmitry Exp $ */
+/* $Id: com_extension.c,v 1.23 2006/10/18 23:47:46 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -191,8 +191,6 @@
{
zend_class_entry ce, *tmp;
- REGISTER_INI_ENTRIES();
-
php_com_wrapper_minit(INIT_FUNC_ARGS_PASSTHRU);
php_com_persist_minit(INIT_FUNC_ARGS_PASSTHRU);
@@ -226,6 +224,8 @@
tmp->get_iterator = php_com_iter_get;
#endif
+ REGISTER_INI_ENTRIES();
+
#define COM_CONST(x) REGISTER_LONG_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT)
COM_CONST(CLSCTX_INPROC_SERVER);