Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bad merge

Author: smalyshev

ext/standard/pack.c

@@ -275,6 +275,7 @@ PHP_FUNCTION(pack)
 
 			case 'a':
 			case 'A':
+			case 'Z':
 			case 'c':
 			case 'C':
 			case 'x':
@@ -349,7 +350,9 @@ PHP_FUNCTION(pack)
 		switch ((int) code) {
 			case 'a':
 			case 'A':
-				memset(&output[outputpos], (code == 'a') ? '\0' : ' ', arg);
+			case 'Z': {
+				int arg_cp = (code != 'Z') ? arg : MAX(0, arg - 1);
+				memset(&output[outputpos], (code == 'a' || code == 'Z') ? '\0' : ' ', arg);
 				val = argv[currentarg++];
 				if (Z_ISREF_PP(val)) {
 					SEPARATE_ZVAL(val);