MFH Move mhash extension registration code into the hash module startup. This allows extension_loaded('mhash'); to work.

6 files changed, 23 insertions, 129 deletions

diff --git a/ext/hash/hash.c b/ext/hash/hash.c
index 4035cc999d..70e1915f6a 100644
--- a/ext/hash/hash.c
+++ b/ext/hash/hash.c
@@ -607,6 +607,27 @@ static void php_hash_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
 
 #ifdef PHP_MHASH_BC
 
+PHP_MINFO_FUNCTION(mhash)
+{
+	php_info_print_table_start();
+	php_info_print_table_row(2, "MHASH support", "Enabled");
+	php_info_print_table_row(2, "MHASH API Version", "Emulated Support");
+	php_info_print_table_end();
+}
+
+zend_module_entry mhash_module_entry = {
+	STANDARD_MODULE_HEADER,
+	"mhash",
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	PHP_MINFO(mhash),
+	NO_VERSION_YET,
+	STANDARD_MODULE_PROPERTIES,
+};
+
 static void mhash_init(INIT_FUNC_ARGS)
 {
 	char buf[128];
@@ -622,6 +643,8 @@ static void mhash_init(INIT_FUNC_ARGS)
 		len = slprintf(buf, 127, "MHASH_%s", algorithm.mhash_name, strlen(algorithm.mhash_name));
 		zend_register_long_constant(buf, len + 1, algorithm.value, CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC);
 	}
+	
+	zend_register_module_ex(&mhash_module_entry TSRMLS_CC);
 }
 
 PHP_FUNCTION(mhash)
diff --git a/ext/mhash/CREDITS b/ext/mhash/CREDITS
deleted file mode 100644
index 54851e1ac7..0000000000
--- a/ext/mhash/CREDITS
+++ /dev/null
@@ -1,2 +0,0 @@
-mhash
-Sascha Schumann
diff --git a/ext/mhash/config.m4 b/ext/mhash/config.m4
deleted file mode 100644
index 167184291e..0000000000
--- a/ext/mhash/config.m4
+++ /dev/null
@@ -1,9 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-if test "$PHP_MHASH" != "no"; then
-  PHP_NEW_EXTENSION(mhash, mhash.c, $ext_shared)
-  PHP_SUBST(MHASH_SHARED_LIBADD)
-  PHP_ADD_EXTENSION_DEP(mhash, hash, true)
-fi
diff --git a/ext/mhash/config.w32 b/ext/mhash/config.w32
deleted file mode 100644
index ef4f9682e1..0000000000
--- a/ext/mhash/config.w32
+++ /dev/null
@@ -1,10 +0,0 @@
-// $Id$
-// vim:ft=javascript
-
-ARG_WITH("mhash", "mhash support", "no");
-
-if (PHP_MHASH != "no") {
-	EXTENSION('mhash', 'mhash.c');
-	ADD_EXTENSION_DEP('mhash', 'hash', true);
-}
-
diff --git a/ext/mhash/mhash.c b/ext/mhash/mhash.c
deleted file mode 100644
index 95ab89de82..0000000000
--- a/ext/mhash/mhash.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2008 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Authors: Sascha Schumann <sascha@schumann.cx>                        |
-   |          Nikos Mavroyanopoulos <nmav@hellug.gr> (HMAC, KEYGEN)       |
-   +----------------------------------------------------------------------+
- */
-/* $Id$ */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-#include "php_mhash.h"
-#include "php_ini.h"
-#include "php_globals.h"
-#include "ext/standard/info.h"
-
-const zend_function_entry mhash_functions[] = {
-	{NULL, NULL, NULL}
-};
-
-zend_module_entry mhash_module_entry = {
-	STANDARD_MODULE_HEADER,
-	"mhash",
-	mhash_functions,
-	PHP_MINIT(mhash), NULL,
-	NULL, NULL,
-	PHP_MINFO(mhash),
-	NO_VERSION_YET,
-	STANDARD_MODULE_PROPERTIES,
-};
-
-#ifdef COMPILE_DL_MHASH
-ZEND_GET_MODULE(mhash)
-#endif
-
-PHP_MINIT_FUNCTION(mhash)
-{
-	return SUCCESS;
-}
-
-PHP_MINFO_FUNCTION(mhash)
-{
-	php_info_print_table_start();
-	php_info_print_table_row(2, "MHASH support", "Enabled");
-	php_info_print_table_row(2, "MHASH API Version", "Emulated Support");
-	php_info_print_table_end();
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/ext/mhash/php_mhash.h b/ext/mhash/php_mhash.h
deleted file mode 100644
index 1d0e720a86..0000000000
--- a/ext/mhash/php_mhash.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2008 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Authors: Sascha Schumann <sascha@schumann.cx>                        |
-   |          Nikos Mavroyanopoulos <nmav@hellug.gr> (HMAC, KEYGEN)       |
-   +----------------------------------------------------------------------+
- */
-/* $Id$ */
-
-#ifndef PHP_MHASH_H
-#define PHP_MHASH_H
-
-#if PHP_API_VERSION < 19990421
-#define  zend_module_entry zend_module_entry
-#include "zend_modules.h"
-#include "internal_functions.h"
-#endif
-
-extern zend_module_entry mhash_module_entry;
-#define mhash_module_ptr &mhash_module_entry
-
-PHP_MINIT_FUNCTION(mhash);
-PHP_MINFO_FUNCTION(mhash);
-
-#define phpext_mhash_ptr mhash_module_ptr
-
-#endif