cvs: php4 /ext/java java.c java.dsp /sapi/servlet servlet.dsp
| From: | Sam Ruby | Date: | Thu, 17 Aug 2000 10:14:47 +0000 |
| Subject: | cvs: php4 /ext/java java.c java.dsp /sapi/servlet servlet.dsp | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1203@lists.php.net to get a copy of this message | ||
rubys Thu Aug 17 03:14:47 2000 EDT
Modified files:
/php4/sapi/servlet servlet.dsp
/php4/ext/java java.c java.dsp
Log:
Better error reporting when dll/shared library is not able to be loaded.
Submitted by: Bård Farstad <bf@ez.no>
Index: php4/sapi/servlet/servlet.dsp
diff -u php4/sapi/servlet/servlet.dsp:1.10 php4/sapi/servlet/servlet.dsp:1.11
--- php4/sapi/servlet/servlet.dsp:1.10 Fri Jun 30 07:33:45 2000
+++ php4/sapi/servlet/servlet.dsp Thu Aug 17 03:14:47 2000
@@ -154,6 +154,10 @@
SOURCE=.\servlet.c
# End Source File
+# Begin Source File
+
+SOURCE=.\..\..\win32\winutil.c
+# End Source File
# End Group
# Begin Group "Header Files"
Index: php4/ext/java/java.c
diff -u php4/ext/java/java.c:1.36 php4/ext/java/java.c:1.37
--- php4/ext/java/java.c:1.36 Fri Aug 4 11:55:47 2000
+++ php4/ext/java/java.c Thu Aug 17 03:14:47 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: java.c,v 1.36 2000/08/04 18:55:47 rubys Exp $ */
+/* $Id: java.c,v 1.37 2000/08/17 10:14:47 rubys Exp $ */
/*
* This module implements Zend OO syntax overloading support for Java
@@ -29,6 +29,13 @@
#include "php_ini.h"
#include "php_globals.h"
+#ifdef PHP_WIN32
+ #include "win32/winutil.h"
+ #define DL_ERROR php_win_err()
+#else
+ #define DL_ERROR dlerror()
+#endif
+
#include <jni.h>
#include <stdio.h>
@@ -185,7 +192,8 @@
dl_handle = DL_LOAD(javalib);
if (!dl_handle) {
- php_error(E_ERROR, "Unable to load Java Library %s", javalib);
+ php_error(E_ERROR, "Unable to load Java Library %s, error: %s",
+ javalib, DL_ERROR);
return -1;
}
}
Index: php4/ext/java/java.dsp
diff -u php4/ext/java/java.dsp:1.9 php4/ext/java/java.dsp:1.10
--- php4/ext/java/java.dsp:1.9 Mon Jun 12 13:33:11 2000
+++ php4/ext/java/java.dsp Thu Aug 17 03:14:47 2000
@@ -150,6 +150,10 @@
SOURCE=.\java.c
# End Source File
+# Begin Source File
+
+SOURCE=.\..\..\win32\winutil.c
+# End Source File
# End Group
# Begin Group "Header Files"