com php-src: Remove php_varname_check: ext/standard/php _var.h
| From: | Nikita Popov | Date: | Mon, 22 Sep 2014 16:34:40 +0000 |
| Subject: | com php-src: Remove php_varname_check: ext/standard/php _var.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81862@lists.php.net to get a copy of this message | ||
Commit: 483697617feff9a1746045c0a1fa7967cba35054
Author: Nikita Popov <nikic@php.net> Mon, 22 Sep 2014 00:47:03 +0200
Parents: 0c0d43bd4ee71f831c51ba2077869e8ab0345198
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=483697617feff9a1746045c0a1fa7967cba35054
Log:
Remove php_varname_check
This is a leftover from PHP < 5.4.
Also removed the php_create_empty_class declaration, which no longer
exists.
Changed paths:
M ext/standard/php_var.h
Diff:
diff --git a/ext/standard/php_var.h b/ext/standard/php_var.h
index 9097915..12adc51 100644
--- a/ext/standard/php_var.h
+++ b/ext/standard/php_var.h
@@ -120,50 +120,4 @@ PHPAPI void var_push_dtor(php_unserialize_data_t *var_hash, zval *val);
PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval *rval);
PHPAPI void var_destroy(php_unserialize_data_t *var_hash);
-PHPAPI zend_class_entry *php_create_empty_class(char *class_name, int len);
-
-static inline int php_varname_check(char *name, int name_len, zend_bool silent TSRMLS_DC) /* {{{ */
-{
- if (name_len == sizeof("GLOBALS") - 1 && !memcmp(name, "GLOBALS",
sizeof("GLOBALS") - 1)) {
- if (!silent) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempted GLOBALS variable overwrite");
- }
- return FAILURE;
- } else if (name[0] == '_' &&
- (
- (name_len == sizeof("_GET") - 1 && !memcmp(name, "_GET",
sizeof("_GET") - 1)) ||
- (name_len == sizeof("_POST") - 1 && !memcmp(name, "_POST",
sizeof("_POST") - 1)) ||
- (name_len == sizeof("_COOKIE") - 1 && !memcmp(name,
"_COOKIE", sizeof("_COOKIE") - 1)) ||
- (name_len == sizeof("_ENV") - 1 && !memcmp(name, "_ENV",
sizeof("_ENV") - 1)) ||
- (name_len == sizeof("_SERVER") - 1 && !memcmp(name,
"_SERVER", sizeof("_SERVER") - 1)) ||
- (name_len == sizeof("_SESSION") - 1 && !memcmp(name,
"_SESSION", sizeof("_SESSION") - 1)) ||
- (name_len == sizeof("_FILES") - 1 && !memcmp(name,
"_FILES", sizeof("_FILES") - 1)) ||
- (name_len == sizeof("_REQUEST") -1 && !memcmp(name,
"_REQUEST", sizeof("_REQUEST") - 1))
- )
- ) {
- if (!silent) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempted super-global (%s) variable
overwrite", name);
- }
- return FAILURE;
- } else if (name[0] == 'H' &&
- (
- (name_len == sizeof("HTTP_POST_VARS") - 1 && !memcmp(name,
"HTTP_POST_VARS", sizeof("HTTP_POST_VARS") - 1)) ||
- (name_len == sizeof("HTTP_GET_VARS") - 1 && !memcmp(name,
"HTTP_GET_VARS", sizeof("HTTP_GET_VARS") - 1)) ||
- (name_len == sizeof("HTTP_COOKIE_VARS") - 1 && !memcmp(name,
"HTTP_COOKIE_VARS", sizeof("HTTP_COOKIE_VARS") - 1)) ||
- (name_len == sizeof("HTTP_ENV_VARS") - 1 && !memcmp(name,
"HTTP_ENV_VARS", sizeof("HTTP_ENV_VARS") - 1)) ||
- (name_len == sizeof("HTTP_SERVER_VARS") - 1 && !memcmp(name,
"HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS") - 1)) ||
- (name_len == sizeof("HTTP_SESSION_VARS") - 1 && !memcmp(name,
"HTTP_SESSION_VARS", sizeof("HTTP_SESSION_VARS") - 1)) ||
- (name_len == sizeof("HTTP_RAW_POST_DATA") - 1 && !memcmp(name,
"HTTP_RAW_POST_DATA", sizeof("HTTP_RAW_POST_DATA") - 1)) ||
- (name_len == sizeof("HTTP_POST_FILES") - 1 && !memcmp(name,
"HTTP_POST_FILES", sizeof("HTTP_POST_FILES") - 1))
- )
- ) {
- if (!silent) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempted long input array (%s)
overwrite", name);
- }
- return FAILURE;
- }
- return SUCCESS;
-}
-/* }}} */
-
#endif /* PHP_VAR_H */