Merge branch 'master' into preload

* master:
  Stop Apache if PHP wasn't started successful.
  Execute zend_post_startup() with module_initialized flag set.
  Removed dead code
  Fix mb_strrpos() with encoding passed as 3rd param

Author: dstogov

ext/mbstring/mbstring.c

@@ -2399,12 +2399,6 @@ PHP_FUNCTION(mb_strrpos)
 		return;
 	}
 
-	haystack.no_language = needle.no_language = MBSTRG(language);
-	haystack.encoding = needle.encoding = php_mb_get_encoding(enc_name);
-	if (!haystack.encoding) {
-		RETURN_FALSE;
-	}
-
 	if (zoffset) {
 		if (Z_TYPE_P(zoffset) == IS_STRING) {
 			enc_name2     = Z_STRVAL_P(zoffset);
@@ -2446,6 +2440,12 @@ PHP_FUNCTION(mb_strrpos)
 		}
 	}
 
+	haystack.no_language = needle.no_language = MBSTRG(language);
+	haystack.encoding = needle.encoding = php_mb_get_encoding(enc_name);
+	if (!haystack.encoding) {
+		RETURN_FALSE;
+	}
+
 	if (offset != 0) {
 		size_t haystack_char_len = mbfl_strlen(&haystack);
 		if ((offset > 0 && offset > haystack_char_len) ||

ext/mbstring/tests/mb_strrpos_encoding_3rd_param.phpt

@@ -0,0 +1,11 @@
+--TEST--
+Passing encoding as 3rd param to mb_strrpos (legacy)
+--FILE--
+<?php
+
+mb_internal_encoding('UTF-16');
+var_dump(mb_strrpos("abc abc abc", "abc", "UTF-8"));
+
+?>
+--EXPECT--
+int(8)