From: Joe Watkins <krakjoe@php.net>
Date: Mon, 6 Nov 2017 07:24:51 +0000 (+0000)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~1083
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21e4ab19779986fd4952cb614c5a718f4dc6af8f;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix proto documents for new global functions
---

21e4ab19779986fd4952cb614c5a718f4dc6af8f
diff --cc ext/mbstring/mbstring.c
index 12cdac9cda,f963ba6d97..fbd7c9e664
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@@ -5005,14 -5268,13 +5005,14 @@@ static inline char* php_mb_scrub(const 
  }
  
  
- /* {{{ proto bool mb_scrub([string str[, string encoding]]) */
+ /* {{{ proto string|false mb_scrub([string str[, string encoding]]) */
  PHP_FUNCTION(mb_scrub)
  {
 +	const mbfl_encoding *enc;
  	char* str;
  	size_t str_len;
 -	char *enc = NULL;
 -	size_t enc_len;
 +	char *enc_name = NULL;
 +	size_t enc_name_len;
  	char *ret;
  
  	ZEND_PARSE_PARAMETERS_START(1, 2)