diff options
author | Stanislav Malyshev <stas@php.net> | 2016-11-26 14:48:40 -0800 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2016-11-26 14:48:40 -0800 |
commit | 58cdd03d9267db3ee62a084492af3cdd12b86cdc (patch) | |
tree | 9d36cc5b0e2079bde1dfcc0f6f1acc9facfdcb74 /ext/standard/string.c | |
parent | 003727d851da770c60555a2aecf6d82497b04f42 (diff) | |
parent | 5ee02b207d95dcddb0401a13773e17cfaaa18e95 (diff) | |
download | php-git-58cdd03d9267db3ee62a084492af3cdd12b86cdc.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Add more mbfl string size checks (bug #73505)
Diffstat (limited to 'ext/standard/string.c')
-rw-r--r-- | ext/standard/string.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 491e97a070..246f452913 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -20,8 +20,6 @@ /* $Id$ */ -/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ - #include <stdio.h> #include "php.h" #include "php_rand.h" |