Fixed module numbering

dstogov · dstogov · commit e182aeec107a · 2012-03-05T12:47:25.000Z
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -33,7 +33,6 @@
 #endif
 
 /* these variables are true statics/globals, and have to be mutex'ed on every access */
-static int module_count=0;
 ZEND_API HashTable module_registry;
 
 /* this function doesn't check for too many parameters */
@@ -2184,7 +2183,7 @@ int module_registry_unload_temp(const zend_module_entry *module TSRMLS_DC) /* {{
 /* return the next free module number */
 int zend_next_free_module(void) /* {{{ */
 {
-	return ++module_count;
+	return zend_hash_num_elements(&module_registry) + 1;
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@`
`33`	`33`	`#endif`
`34`	`34`
`35`	`35`	`/* these variables are true statics/globals, and have to be mutex'ed on every access */`
`36`		`-static int module_count=0;`
`37`	`36`	`ZEND_API HashTable module_registry;`
`38`	`37`
`39`	`38`	`/* this function doesn't check for too many parameters */`
`@@ -2184,7 +2183,7 @@ int module_registry_unload_temp(const zend_module_entry module TSRMLS_DC) / {{`
`2184`	`2183`	`/* return the next free module number */`
`2185`	`2184`	`int zend_next_free_module(void) /* {{{ */`
`2186`	`2185`	`{`
`2187`		`- return ++module_count;`
	`2186`	`+ return zend_hash_num_elements(&module_registry) + 1;`
`2188`	`2187`	`}`
`2189`	`2188`	`/* }}} */`
`2190`	`2189`