diff options
| -rw-r--r-- | cpp/config/Make.rules.Darwin | 4 | ||||
| -rw-r--r-- | php/config/Make.rules.Darwin | 3 | ||||
| -rw-r--r-- | php/test/Ice/proxy/Client.php | 24 |
3 files changed, 14 insertions, 17 deletions
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin index c0205611727..de9c2fc8f93 100644 --- a/cpp/config/Make.rules.Darwin +++ b/cpp/config/Make.rules.Darwin @@ -52,10 +52,6 @@ ifeq ($(RPATH_DIR),) endif LDPLATFORMFLAGS = -Wl,-rpath,$(RPATH_DIR) -ifeq ($(CXX),g++) - LDPLATFORMFLAGS += -rdynamic -endif - mklib = libtool -static -o $(1) $(2) mkshlib = $(CXX) -dynamiclib $(LDFLAGS) -o $(1) -install_name @rpath/$(2) $(3) $(4) diff --git a/php/config/Make.rules.Darwin b/php/config/Make.rules.Darwin index 4258ef7e440..4fe1b1c6e1a 100644 --- a/php/config/Make.rules.Darwin +++ b/php/config/Make.rules.Darwin @@ -13,4 +13,5 @@ include $(top_srcdir)/../cpp/config/Make.rules.$(UNAME) -shlibldflags = ${wl}-flat_namespace ${wl}-undefined ${wl}suppress -Wl,-rpath,$(embedded_runpath_prefix)/$(libsubdir) +LDPLATFORMFLAGS := ${wl}-flat_namespace ${wl}-undefined ${wl}suppress \ + -Wl,-rpath,$(embedded_runpath_prefix)/$(libsubdir) $(LDPLATFORMFLAGS) diff --git a/php/test/Ice/proxy/Client.php b/php/test/Ice/proxy/Client.php index bbcf6837e42..16d310b0437 100644 --- a/php/test/Ice/proxy/Client.php +++ b/php/test/Ice/proxy/Client.php @@ -687,11 +687,11 @@ function allTests($communicator) test($communicator->proxyToString($p2) == "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000"); // Working? - if($communicator->getProperties()->getProperty("Ice.IPv6") == "" || - $communicator->getProperties()->getProperty("Ice.IPv6") == "0") + if($communicator->getProperties()->getPropertyAsInt("Ice.IPv6") == 0) { $ssl = $communicator->getProperties()->getProperty("Ice.Default.Protocol") == "ssl"; - if(!$ssl) + $tcp = $communicator->getProperties()->getProperty("Ice.Default.Protocol") == "tcp"; + if($tcp) { $p1->ice_encodingVersion($Ice_Encoding_1_0)->ice_ping(); } @@ -707,13 +707,13 @@ function allTests($communicator) // $p1 = $communicator->stringToProxy("test -e 1.0:opaque -t 2 -e 1.0 -v CTEyNy4wLjAuMREnAAD/////AA==:opaque -t 99 -e 1.0 -v abch"); $pstr = $communicator->proxyToString($p1); - if(!$ssl) + if($ssl) { - test($pstr == "test -t -e 1.0:opaque -t 2 -e 1.0 -v CTEyNy4wLjAuMREnAAD/////AA==:opaque -t 99 -e 1.0 -v abch"); + test($pstr == "test -t -e 1.0:ssl -h 127.0.0.1 -p 10001 -t infinite:opaque -t 99 -e 1.0 -v abch"); } - else + elseif($tcp) { - test($pstr == "test -t -e 1.0:ssl -h 127.0.0.1 -p 10001 -t infinite:opaque -t 99 -e 1.0 -v abch"); + test($pstr == "test -t -e 1.0:opaque -t 2 -e 1.0 -v CTEyNy4wLjAuMREnAAD/////AA==:opaque -t 99 -e 1.0 -v abch"); } // @@ -736,7 +736,7 @@ function allTests($communicator) } elseif($ex instanceof $cre) { - test($ssl); + test(!$tcp); } else { @@ -752,13 +752,13 @@ function allTests($communicator) // $p2 = $derived->_echo($p1); $pstr = $communicator->proxyToString($p2); - if(!$ssl) + if($ssl) { - test($pstr == "test -t -e 1.0:opaque -t 2 -e 1.0 -v CTEyNy4wLjAuMREnAAD/////AA==:opaque -t 99 -e 1.0 -v abch"); + test($pstr == "test -t -e 1.0:ssl -h 127.0.0.1 -p 10001 -t infinite:opaque -t 99 -e 1.0 -v abch"); } - else + elseif($tcp) { - test($pstr == "test -t -e 1.0:ssl -h 127.0.0.1 -p 10001 -t infinite:opaque -t 99 -e 1.0 -v abch"); + test($pstr == "test -t -e 1.0:opaque -t 2 -e 1.0 -v CTEyNy4wLjAuMREnAAD/////AA==:opaque -t 99 -e 1.0 -v abch"); } } echo "ok\n"; |