* Include all of the standard modules in internal_functions.c.in. Stig - is that

  the way you intended it to be?  How does the basic_functions module get in there?
* Fix to get MySQL objects working, even though I'll probably make a dedicated
  MySQL object in the future.

13 files changed, 29 insertions, 1 deletions

diff --git a/ext/mysql/mysql.c b/ext/mysql/mysql.c
index afe05d3b7e..06b1306793 100644
--- a/ext/mysql/mysql.c
+++ b/ext/mysql/mysql.c
@@ -1481,6 +1481,8 @@ void php3_mysql_fetch_object(INTERNAL_FUNCTION_PARAMETERS)
 	php3_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 	if (return_value->type==IS_ARRAY) {
 		return_value->type=IS_OBJECT;
+		return_value->value.obj.properties = return_value->value.ht;
+		return_value->value.obj.ce = &standard_class;
 	}
 }
 /* }}} */
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index b908e96a41..ed3ac07041 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -122,7 +122,6 @@ function_entry basic_functions[] = {
 	{"rtrim",		php3_chop,					NULL},
 	{"pos",			array_current,				first_arg_force_ref},
 
-	{"fsockopen",			php3_fsockopen,		third_and_fourth_args_force_ref},
 	{"getimagesize",		php3_getimagesize,	NULL},
 	{"htmlspecialchars",	php3_htmlspecialchars,	NULL},
 	{"htmlentities",		php3_htmlentities,	NULL},
diff --git a/ext/standard/dl.h b/ext/standard/dl.h
index 87a684e583..a6e134e691 100644
--- a/ext/standard/dl.h
+++ b/ext/standard/dl.h
@@ -56,5 +56,6 @@ extern void php3_info_dl(ZEND_MODULE_INFO_FUNC_ARGS);
 
 #endif
 
+#define phpext_dl_ptr dl_module_ptr
 
 #endif /* _DL_H */
diff --git a/ext/standard/file.h b/ext/standard/file.h
index 1274d4dcd7..fd4b634622 100644
--- a/ext/standard/file.h
+++ b/ext/standard/file.h
@@ -64,4 +64,5 @@ extern void php3_set_socket_timeout(INTERNAL_FUNCTION_PARAMETERS);
 extern void php3_get_meta_tags(INTERNAL_FUNCTION_PARAMETERS);
 extern PHP_FUNCTION(flock);
 
+#define phpext_file_ptr php3_file_module_ptr
 #endif /* _FILE_H */
diff --git a/ext/standard/fsock.h b/ext/standard/fsock.h
index f58da7fdeb..2d723daae1 100644
--- a/ext/standard/fsock.h
+++ b/ext/standard/fsock.h
@@ -54,4 +54,6 @@ extern int _php3_sock_fgets(char *buf, int maxlen, int socket);
 extern int _php3_sock_fread(char *buf, int maxlen, int socket);
 extern int _php3_is_persistent_sock(int);
 
+#define phpext_fsock_ptr fsock_module_ptr
+
 #endif /* _FSOCK_H */
diff --git a/ext/standard/head.h b/ext/standard/head.h
index 37db395e2c..b054b135b8 100644
--- a/ext/standard/head.h
+++ b/ext/standard/head.h
@@ -61,4 +61,6 @@ void php4i_add_header_information(char *header_information, uint header_length);
 PHPAPI int php3_header(void);
 int php3_headers_unsent(void);
 
+#define phpext_head_ptr php3_header_module_ptr
+
 #endif
diff --git a/ext/standard/pack.h b/ext/standard/pack.h
index 36a55091a3..6cc65f3a35 100644
--- a/ext/standard/pack.h
+++ b/ext/standard/pack.h
@@ -39,4 +39,6 @@ extern int php3_minit_pack(INIT_FUNC_ARGS);
 extern void php3_pack(INTERNAL_FUNCTION_PARAMETERS);
 extern void php3_unpack(INTERNAL_FUNCTION_PARAMETERS);
 
+#define phpext_pack_ptr pack_module_ptr
+
 #endif /* _PACK_H */
diff --git a/ext/standard/php3_browscap.h b/ext/standard/php3_browscap.h
index 0b5e8cafd4..b3720acca0 100644
--- a/ext/standard/php3_browscap.h
+++ b/ext/standard/php3_browscap.h
@@ -40,4 +40,6 @@ extern int php3_mshutdown_browscap(SHUTDOWN_FUNC_ARGS);
 extern void php3_get_browser(INTERNAL_FUNCTION_PARAMETERS);
 
 
+#define phpext_browscap_ptr browscap_module_ptr
+
 #endif /* _PHP3_BROWSCAP_H */
diff --git a/ext/standard/php3_crypt.h b/ext/standard/php3_crypt.h
index c740dc55ec..20671b2f6f 100644
--- a/ext/standard/php3_crypt.h
+++ b/ext/standard/php3_crypt.h
@@ -10,4 +10,6 @@ extern int php_minit_crypt(INIT_FUNC_ARGS);
 #define crypt_module_ptr NULL
 #endif
 
+#define phpext_crypt_ptr crypt_module_ptr
+
 #endif
diff --git a/ext/standard/php3_dir.h b/ext/standard/php3_dir.h
index ee0e719dd7..33e6f15643 100644
--- a/ext/standard/php3_dir.h
+++ b/ext/standard/php3_dir.h
@@ -45,4 +45,6 @@ extern void php3_rewinddir(INTERNAL_FUNCTION_PARAMETERS);
 extern void php3_readdir(INTERNAL_FUNCTION_PARAMETERS);
 extern void php3_getdir(INTERNAL_FUNCTION_PARAMETERS);
 
+#define phpext_dir_ptr php3_dir_module_ptr
+
 #endif /* _PHP3_DIR_H */
diff --git a/ext/standard/php3_filestat.h b/ext/standard/php3_filestat.h
index 6c82124b36..87ac93a697 100644
--- a/ext/standard/php3_filestat.h
+++ b/ext/standard/php3_filestat.h
@@ -61,4 +61,6 @@ extern void php3_touch(INTERNAL_FUNCTION_PARAMETERS);
 extern php3_module_entry php3_filestat_module_entry;
 #define php3_filestat_module_ptr &php3_filestat_module_entry
 
+#define phpext_filestat_ptr php3_filestat_module_ptr
+
 #endif /* _FILESTAT_H */
diff --git a/ext/standard/php3_mail.h b/ext/standard/php3_mail.h
index 71ac97fe8f..cd2acabfaf 100644
--- a/ext/standard/php3_mail.h
+++ b/ext/standard/php3_mail.h
@@ -43,4 +43,7 @@ extern int _php3_mail(char *to, char *subject, char *message, char *headers);
 #else
 #define mail_module_ptr NULL
 #endif
+
+#define phpext_mail_ptr mail_module_ptr
+
 #endif /* _MAIL_H */
diff --git a/ext/standard/php3_syslog.h b/ext/standard/php3_syslog.h
index 028a5aa018..458e597254 100644
--- a/ext/standard/php3_syslog.h
+++ b/ext/standard/php3_syslog.h
@@ -27,6 +27,10 @@
    |                                                                      |
    +----------------------------------------------------------------------+
  */
+
+#ifndef _PHP_SYSLOG_H
+#define _PHP_SYSLOG_H
+
 #if HAVE_SYSLOG_H
 extern php3_module_entry syslog_module_entry;
 #define syslog_module_ptr &syslog_module_entry
@@ -42,3 +46,7 @@ extern void php3_define_syslog_variables(INTERNAL_FUNCTION_PARAMETERS);
 #else
 #define syslog_module_ptr NULL
 #endif
+
+#define phpext_syslog_ptr syslog_module_ptr
+
+#endif /* _PHP_SYSLOG_H */