diff options
| author | Pierre Joye <pajoye@php.net> | 2006-03-08 00:43:32 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2006-03-08 00:43:32 +0000 |
| commit | bb1ec86f9da24fe6b49bae68353d53ba96b7228f (patch) | |
| tree | 8a395f4ff82f2bfc5dfbb143231340c80ec3d9e4 /ext/standard/streamsfuncs.c | |
| parent | b7d6d705f1e471544418cf8febb62943ece9e8ce (diff) | |
| download | php-git-bb1ec86f9da24fe6b49bae68353d53ba96b7228f.tar.gz | |
- remove magic_quotes_gpc, magic_quotes_runtime, magic_quotes_sybase
(calling ini_set('magic_....') returns 0|false
- get_magic_quotes_gpc, get_magic_quotes_runtime are kept but always return false
- set_magic_quotes_runtime raises an E_CORE_ERROR
Diffstat (limited to 'ext/standard/streamsfuncs.c')
| -rw-r--r-- | ext/standard/streamsfuncs.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 569dc47be4..0d3050d149 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -370,14 +370,7 @@ PHP_FUNCTION(stream_socket_recvfrom) } read_buf[recvd] = '\0'; - if (PG(magic_quotes_runtime)) { - Z_TYPE_P(return_value) = IS_STRING; - Z_STRVAL_P(return_value) = php_addslashes(Z_STRVAL_P(return_value), - Z_STRLEN_P(return_value), &Z_STRLEN_P(return_value), 1 TSRMLS_CC); - return; - } else { - RETURN_STRINGL(read_buf, recvd, 0); - } + RETURN_STRINGL(read_buf, recvd, 0); } efree(read_buf); @@ -407,12 +400,6 @@ PHP_FUNCTION(stream_get_contents) } if ((len = php_stream_copy_to_mem(stream, &contents, maxlen, 0)) > 0) { - - if (PG(magic_quotes_runtime)) { - contents = php_addslashes(contents, len, &newlen, 1 TSRMLS_CC); /* 1 = free source string */ - len = newlen; - } - RETVAL_STRINGL(contents, len, 0); } else if (len == 0) { RETVAL_EMPTY_STRING(); |