Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3: Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails
php · Apr 16, 2012 · 5d15650 · 5d15650
2 parents 1a44faf + 1c435ae
commit 5d15650
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/ext/ldap/tests/ldap_set_rebind_proc_error.phpt b/ext/ldap/tests/ldap_set_rebind_proc_error.phpt
@@ -5,6 +5,16 @@ Patrick Allaert <patrickallaert@php.net>
 # Belgian PHP Testfest 2009
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
+<?php
+	if (!function_exists("ldap_set_rebind_proc")) {
+		die("skip ldap_set_rebind_proc() does not exist");
+	}
+	require "connect.inc";
+	$link = fsockopen($host, $port);
+	if (!$link) {
+		die("skip no server listening");
+	}
+?>
 --FILE--
 <?php
 require "connect.inc";