BUG#: 4384

TITLE: Enable OOP by default on HP-UX
DESCRIPTION: Set the default for forceProviderProcesses to true for HP-UX (based on a build variable).

diff --git a/TestMakefile b/TestMakefile
index be696b6c9bb36b1085fb405ea03c7135e6cbcd09..6c2319bd39910009544dc8567d31f8c2f3ff8c4d 100644 (file)
--- a/TestMakefile
+++ b/TestMakefile
@@ -277,6 +277,11 @@ endif
 ##
 ###############################################################################
 OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true
+ifndef PEGASUS_DEFAULT_OOP_FALSE
+    ifeq ($(OS),HPUX)
+        OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false
+    endif
+endif
 OOP_TS1_TEST_CMDS = \
         TestClient
 

diff --git a/mak/config.mak b/mak/config.mak
index b5eb96f1e253c48e61895d74500c45b34c1731c3..8b1a062d0a465b109c38b35752c4e369ebf6df78 100644 (file)
--- a/mak/config.mak
+++ b/mak/config.mak
@@ -397,6 +397,14 @@ ifdef PEGASUS_OVERRIDE_PRODUCT_ID
     DEFINES += -DPEGASUS_OVERRIDE_PRODUCT_ID
 endif
 
+#
+# PEP 72
+# Allow Out-of-Process Providers to be disabled by default
+#
+ifdef PEGASUS_DEFAULT_OOP_FALSE
+    DEFINES += -DPEGASUS_DEFAULT_OOP_FALSE
+endif
+
 #
 # PEP 197
 # Allow the Provider User Context feature to be disabled.

diff --git a/src/Pegasus/Config/DefaultPropertyTableHpux.h b/src/Pegasus/Config/DefaultPropertyTableHpux.h
index 95bd159f56b0ca62763918769bcb9af8c42ac20f..b9765b01de3968fb5615759a2f6bb99449301af0 100644 (file)
--- a/src/Pegasus/Config/DefaultPropertyTableHpux.h
+++ b/src/Pegasus/Config/DefaultPropertyTableHpux.h
@@ -50,7 +50,11 @@
     {"enableIndicationService", "true", IS_STATIC, 0, 0, IS_VISIBLE},
     // Removed for now because unresolved PEP {"maximumEnumerationBreadth", "50", IS_STATIC, 0, 0},
     {"sslClientVerificationMode", "disabled", IS_STATIC, 0, 0, IS_VISIBLE},
+# ifdef PEGASUS_DEFAULT_OOP_FALSE
     {"forceProviderProcesses", "false", IS_STATIC, 0, 0, IS_VISIBLE},
+# else
+    {"forceProviderProcesses", "true", IS_STATIC, 0, 0, IS_VISIBLE},
+# endif
     {"maxProviderProcesses", "0", IS_STATIC, 0, 0, IS_VISIBLE}
 #else
     {"httpPort", "", IS_STATIC, 0, 0, IS_VISIBLE},
@@ -64,7 +68,11 @@
     {"enableIndicationService", "true", IS_STATIC, 0, 0, IS_VISIBLE},
     {"maximumEnumerationBreadth", "50", IS_STATIC, 0, 0, IS_VISIBLE},
     {"sslClientVerificationMode", "disabled", IS_STATIC, 0, 0, IS_VISIBLE},
+# ifdef PEGASUS_DEFAULT_OOP_FALSE
     {"forceProviderProcesses", "false", IS_STATIC, 0, 0, IS_VISIBLE},
+# else
+    {"forceProviderProcesses", "true", IS_STATIC, 0, 0, IS_VISIBLE},
+# endif
     {"maxProviderProcesses", "0", IS_STATIC, 0, 0, IS_VISIBLE}
 #endif