From: Côme Bernigaud <mcmic@php.net>
Date: Thu, 7 Jul 2016 03:11:56 +0000 (+0200)
Subject: Merge branch 'pull-request/1955'
X-Git-Tag: php-7.1.0beta1~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c53aadbba3d51d598316a219c941e99798217122;p=php

Merge branch 'pull-request/1955'

* pull-request/1955:
  Add parenthesis to if statements
  Correctly add to the length of the final string
  Correctly add to the length of the final string
  Fix minor spacing issue
  Make LDAP_ESCAPE_DN compliant with RFC 4514
---

c53aadbba3d51d598316a219c941e99798217122