[project @ fpeters@0d.be-20080423100400-sbs984j19ik6dxzi]

merge


Original author: Frederic Peters <fpeters@0d.be>
Date: 2008-04-23 12:04:00.477000+02:00

1 files changed, 6 insertions, 16 deletions

diff --git a/bindings/lang_php5_helpers/php_code.py b/bindings/lang_php5_helpers/php_code.py
index a15a08b1..8b8eef84 100644
--- a/bindings/lang_php5_helpers/php_code.py
+++ b/bindings/lang_php5_helpers/php_code.py
@@ -52,20 +52,7 @@ class PhpCode:
 
 // Try to load Lasso extension if it's not already loaded.
 if (!extension_loaded('lasso')) {
-    if (strtolower(substr(PHP_OS, 0, 3)) === 'win') {
-        $extension_module = 'lasso.dll';
-    } else {
-        // PHP_SHLIB_SUFFIX is available as of PHP 4.3.0, for older PHP assume 'so'.
-        // It gives 'dylib' on MacOS X which is for libraries, modules are 'so'.
-        if (PHP_SHLIB_SUFFIX === 'PHP_SHLIB_SUFFIX' || PHP_SHLIB_SUFFIX === 'dylib') {
-            $extension_module = 'lasso.so';
-        } else {
-            $extension_module = 'lasso.'.PHP_SHLIB_SUFFIX;
-        }
-    }
-    if (!dl($extension_module)) {
-        die('E: Could not load Lasso extension module.\n');
-    }
+    die("Lasso extension is not loaded");
 }
 
 /*
@@ -83,9 +70,13 @@ function cptrToPhp ($cptr) {
     return null;
 }
 
-function getRequestTypeFromSoapMsg($mesg) {
+function lassoGetRequestTypeFromSoapMsg($mesg) {
     return lasso_get_request_type_from_soap_msg($mesg);
 }
+
+function lassoRegisterIdWsf2DstService($prefix, $href) {
+    lasso_register_idwsf2_dst_service($prefix, $href);
+}
 '''
 
     def generate_class(self, klass):
@@ -482,6 +473,5 @@ class LassoError extends Exception {
 
     def generate_footer(self):
         print >> self.fd, '''\
-        lasso_init();
 ?>'''