Adjusted error names for prefix or name

Author: jorgsowa

ext/session/session.c

@@ -368,7 +368,7 @@ PHPAPI zend_result php_session_valid_key(const char *key) /* {{{ */
 				|| (c >= '0' && c <= '9')
 				|| c == ','
 				|| c == '-')) {
-			php_error_docref(NULL, E_WARNING, "Prefix cannot contain special characters. Only the A-Z, a-z, 0-9, \"-\", and \",\" characters are allowed");
+			php_error_docref(NULL, E_WARNING, "Prefix or name cannot contain special characters. Only the A-Z, a-z, 0-9, \"-\", and \",\" characters are allowed");
 			return FAILURE;
 		}
 	}
@@ -378,7 +378,7 @@ PHPAPI zend_result php_session_valid_key(const char *key) /* {{{ */
 	/* Somewhat arbitrary length limit here, but should be way more than
 	   anyone needs and avoids file-level warnings later on if we exceed MAX_PATH */
 	if (len == 0 || len > PS_MAX_SID_LENGTH) {
-		php_error_docref(NULL, E_WARNING, "Prefix cannot be larger than 256 characters");
+		php_error_docref(NULL, E_WARNING, "Prefix or name cannot be larger than 256 characters");
 		return FAILURE;
 	}
 

ext/session/tests/rfc1867_sid_invalid.phpt

@@ -52,13 +52,13 @@ session_destroy();
 @unlink(__DIR__ . DIRECTORY_SEPARATOR . "rfc1867_sid_invalid.post.txt");
 ?>
 --EXPECTF--
-Warning: PHP Request Startup: Prefix cannot contain special characters. Only the A-Z, a-z, 0-9, "-", and "," characters are allowed in Unknown on line 0
+Warning: PHP Request Startup: Prefix or name cannot contain special characters. Only the A-Z, a-z, 0-9, "-", and "," characters are allowed in Unknown on line 0
 
 Warning: PHP Request Startup: Failed to read session data: files (path: ) in Unknown on line 0
 
 Warning: PHP Request Startup: Failed to write session data (files). Please verify that the current setting of session.save_path is correct () in Unknown on line 0
 
-Warning: PHP Request Startup: Prefix cannot contain special characters. Only the A-Z, a-z, 0-9, "-", and "," characters are allowed in Unknown on line 0
+Warning: PHP Request Startup: Prefix or name cannot contain special characters. Only the A-Z, a-z, 0-9, "-", and "," characters are allowed in Unknown on line 0
 
 Warning: PHP Request Startup: Failed to read session data: files (path: ) in Unknown on line 0
 

ext/session/tests/session_create_id_invalid_prefix.phpt

@@ -22,13 +22,13 @@ try {
 ?>
 Done
 --EXPECTF--
-Warning: session_create_id(): Prefix cannot contain special characters. Only the A-Z, a-z, 0-9, "-", and "," characters are allowed in %s on line %d
+Warning: session_create_id(): Prefix or name cannot contain special characters. Only the A-Z, a-z, 0-9, "-", and "," characters are allowed in %s on line %d
 bool(false)
 
-Warning: session_create_id(): Prefix cannot contain special characters. Only the A-Z, a-z, 0-9, "-", and "," characters are allowed in %s on line %d
+Warning: session_create_id(): Prefix or name cannot contain special characters. Only the A-Z, a-z, 0-9, "-", and "," characters are allowed in %s on line %d
 bool(false)
 
-Warning: session_create_id(): Prefix cannot be larger than 256 characters in %s on line %d
+Warning: session_create_id(): Prefix or name cannot be larger than 256 characters in %s on line %d
 bool(false)
 session_create_id(): Argument #1 ($prefix) must not contain any null bytes
 Done