]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 23 Mar 2018 17:57:16 +0000 (18:57 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 23 Mar 2018 17:57:58 +0000 (18:57 +0100)
1  2 
Zend/tests/bug43450.phpt
ext/ldap/tests/ldap_exop_refresh.phpt
ext/mysqli/tests/014.phpt
ext/sockets/tests/bug63000.phpt

Simple merge
index 2c579931ca4c6fd27a318da4bdadfdc54740080f,0000000000000000000000000000000000000000..13539d53c16283c2c3728ff5e576fa7fe611a929
mode 100644,000000..100644
--- /dev/null
@@@ -1,43 -1,0 +1,43 @@@
-               die("Overlay DDS not available");
 +--TEST--
 +ldap_exop_refresh() - Test LDAP refresh extended operation
 +--CREDITS--
 +Emmanuel Dreyfus <manu@netbsd.org>
 +--SKIPIF--
 +<?php require_once('skipif.inc'); ?>
 +<?php require_once('skipifbindfailure.inc'); ?>
 +<?php
 +      $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
 +      $r = ldap_read($link, '', 'objectClass=*', array('dynamicsubtrees'));
 +      $info = ldap_get_entries($link, $r)[0];
 +      if (!isset($info['dynamicsubtrees'])) {
++              die("skip Overlay DDS not available");
 +      }
 +?>
 +--FILE--
 +<?php
 +require "connect.inc";
 +
 +$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
 +
 +insert_dummy_data($link, $base);
 +ldap_add($link, "cn=tmp,$base", array(
 +      "objectclass" => array("person", "dynamicObject"),
 +      "cn" => "tmp",
 +      "sn" => "tmp"
 +));
 +var_dump(
 +      ldap_exop_refresh($link, "cn=tmp,$base", 1234)
 +);
 +?>
 +===DONE===
 +--CLEAN--
 +<?php
 +include "connect.inc";
 +
 +$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
 +ldap_delete($link, "cn=tmp,$base");
 +remove_dummy_data($link, $base);
 +?>
 +--EXPECT--
 +int(1234)
 +===DONE===
Simple merge
Simple merge