com php-src: we know that these funcs are deprecated, thankyouverymuch: ext/mysql/php_mysql.c ext/pcre/php_pcre.c
| From: | Antony Dovgal | Date: | Thu, 12 Dec 2013 08:47:42 +0000 |
| Subject: | com php-src: we know that these funcs are deprecated, thankyouverymuch: ext/mysql/php_mysql.c ext/pcre/php_pcre.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76637@lists.php.net to get a copy of this message | ||
Commit: 0af5ce003a83b21bf85b443d194d734d585d5901
Author: Antony Dovgal <tony2001@php.net> Wed, 7 Aug 2013 14:44:13 +0400
Parents: 8d5f20e32ae617a9761e2cd3da917ea76626f846
Branches: badoo-5.5_mysqlnd
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0af5ce003a83b21bf85b443d194d734d585d5901
Log:
we know that these funcs are deprecated, thankyouverymuch
Changed paths:
M ext/mysql/php_mysql.c
M ext/pcre/php_pcre.c
Diff:
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index edc504d..23410e0 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -735,10 +735,6 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
long connect_timeout;
zval *err_num = NULL, *err_str = NULL;
- php_error_docref(NULL TSRMLS_CC,
- E_DEPRECATED,
- "The mysql extension is deprecated and will be removed in the future: use
mysqli or PDO instead");
-
#if !defined(MYSQL_USE_MYSQLND)
if ((MYSQL_VERSION_ID / 100) != (mysql_get_client_version() / 100)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
@@ -1912,8 +1908,6 @@ PHP_FUNCTION(mysql_escape_string)
Z_STRVAL_P(return_value) = (char *) safe_emalloc(str_len, 2, 1);
Z_STRLEN_P(return_value) = mysql_escape_string(Z_STRVAL_P(return_value), str, str_len);
Z_TYPE_P(return_value) = IS_STRING;
-
- php_error_docref("function.mysql-real-escape-string" TSRMLS_CC, E_DEPRECATED, "This
function is deprecated; use mysql_real_escape_string() instead.");
}
/* }}} */
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 7d34d9f..0d5d505 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -1052,10 +1052,6 @@ PHPAPI char *php_pcre_replace_impl(pcre_cache_entry *pce, char *subject, int
sub
replace_end = replace + replace_len;
}
- if (eval) {
- php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "The /e modifier is deprecated, use
preg_replace_callback instead");
- }
-
/* Calculate the size of the offsets array, and allocate memory for it. */
rc = pcre_fullinfo(pce->re, extra, PCRE_INFO_CAPTURECOUNT, &num_subpats);
if (rc < 0) {