diff --git a/ext/standard/string.c b/ext/standard/string.c
index 2f05b65bb939c..805dbdbc57d80 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1791,7 +1791,7 @@ PHP_FUNCTION(strstr)
    An alias for strstr */
 /* }}} */
 
-/* {{{ proto int strpos(string haystack, string needle [, int offset])
+/* {{{ proto int strpos(string haystack, string needle [, int offset [, int length]])
    Finds position of first occurrence of a string within another */
 PHP_FUNCTION(strpos)
 {
@@ -1801,12 +1801,27 @@ PHP_FUNCTION(strpos)
 	char  needle_char[2];
 	long  offset = 0;
 	int   haystack_len;
+	zval  **len_zv = NULL;
+	long  len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|l", &haystack, &haystack_len, &needle, &offset) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|lZ", &haystack, &haystack_len, &needle, &offset, &len_zv) == FAILURE) {
 		return;
 	}
 
-	if (offset < 0 || offset > haystack_len) {
+	if (len_zv != NULL && Z_TYPE_PP(len_zv) != IS_NULL) {
+		convert_to_long_ex(len_zv);
+		len = Z_LVAL_PP(len_zv);
+		if (len < 0) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter may not be negative");
+			RETURN_FALSE;
+		} else if (len == 0) {
+			len = -1;
+		}
+	} else {
+		len = -1;
+	}
+
+	if (offset < 0 || offset > haystack_len || (len != -1 && (offset + len) > haystack_len)) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string");
 		RETURN_FALSE;
 	}
@@ -1820,7 +1835,7 @@ PHP_FUNCTION(strpos)
 		found = php_memnstr(haystack + offset,
 			                Z_STRVAL_P(needle),
 			                Z_STRLEN_P(needle),
-			                haystack + haystack_len);
+			                (len != -1) ? haystack + offset + len : haystack + haystack_len);
 	} else {
 		if (php_needle_char(needle, needle_char TSRMLS_CC) != SUCCESS) {
 			RETURN_FALSE;
@@ -1830,7 +1845,7 @@ PHP_FUNCTION(strpos)
 		found = php_memnstr(haystack + offset,
 							needle_char,
 							1,
-		                    haystack + haystack_len);
+		                    (len != -1) ? haystack + offset + len : haystack + haystack_len);
 	}
 
 	if (found) {
@@ -1841,7 +1856,7 @@ PHP_FUNCTION(strpos)
 }
 /* }}} */
 
-/* {{{ proto int stripos(string haystack, string needle [, int offset])
+/* {{{ proto int stripos(string haystack, string needle [, int offset [, int length]])
    Finds position of first occurrence of a string within another, case insensitive */
 PHP_FUNCTION(stripos)
 {
@@ -1852,12 +1867,27 @@ PHP_FUNCTION(stripos)
 	char *needle_dup = NULL, *haystack_dup;
 	char needle_char[2];
 	zval *needle;
+	zval  **len_zv = NULL;
+	long  len;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|l", &haystack, &haystack_len, &needle, &offset) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|lZ", &haystack, &haystack_len, &needle, &offset, &len_zv) == FAILURE) {
 		return;
 	}
 
-	if (offset < 0 || offset > haystack_len) {
+	if (len_zv != NULL && Z_TYPE_PP(len_zv) != IS_NULL) {
+		convert_to_long_ex(len_zv);
+		len = Z_LVAL_PP(len_zv);
+		if (len < 0) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter may not be negative");
+			RETURN_FALSE;
+		} else if (len == 0) {
+			len = -1;
+		}
+	} else {
+		len = -1;
+	}
+
+	if (offset < 0 || offset > haystack_len || (len != -1 && (offset + len) > haystack_len)) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string");
 		RETURN_FALSE;
 	}
@@ -1877,7 +1907,7 @@ PHP_FUNCTION(stripos)
 
 		needle_dup = estrndup(Z_STRVAL_P(needle), Z_STRLEN_P(needle));
 		php_strtolower(needle_dup, Z_STRLEN_P(needle));
-		found = php_memnstr(haystack_dup + offset, needle_dup, Z_STRLEN_P(needle), haystack_dup + haystack_len);
+		found = php_memnstr(haystack_dup + offset, needle_dup, Z_STRLEN_P(needle), (len != -1) ? haystack_dup + offset + len : haystack_dup + haystack_len);
 	} else {
 		if (php_needle_char(needle, needle_char TSRMLS_CC) != SUCCESS) {
 			efree(haystack_dup);
@@ -1888,7 +1918,7 @@ PHP_FUNCTION(stripos)
 		found = php_memnstr(haystack_dup + offset,
 							needle_char,
 							sizeof(needle_char) - 1,
-							haystack_dup + haystack_len);
+							(len != -1) ? haystack_dup + offset + len : haystack_dup + haystack_len);
 	}
 
 	efree(haystack_dup);
diff --git a/ext/standard/tests/strings/bug52124.phpt b/ext/standard/tests/strings/bug52124.phpt
new file mode 100644
index 0000000000000..b51e6297ad8c5
--- /dev/null
+++ b/ext/standard/tests/strings/bug52124.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test for bug #52124: [strpos] Limit search inside $haystack by new $length parameter
+--CREDITS--
+Boro Sitnikovski <buritomath@yahoo.com>
+--FILE--
+<?php
+$string = "The big string [with some data here] and with MoRe DaTa there";
+
+var_dump(strpos($string, "data", 16, 15));
+var_dump(strpos($string, "more data", 16, 150));
+var_dump(strpos($string, "more data", 16, -1));
+
+var_dump(stripos($string, "more data", 46, 9));
+var_dump(stripos($string, "more data", 16, 150));
+var_dump(stripos($string, "more data", 16, -1));
+?>
+--EXPECTF--
+int(26)
+
+Warning: strpos(): Offset not contained in string in %s on line %d
+bool(false)
+
+Warning: strpos(): Length parameter may not be negative in %s on line %d
+bool(false)
+int(46)
+
+Warning: stripos(): Offset not contained in string in %s on line %d
+bool(false)
+
+Warning: stripos(): Length parameter may not be negative in %s on line %d
+bool(false)
diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt
index 44785ef6c8664..b626a1b9519f3 100644
Binary files a/ext/standard/tests/strings/strpos.phpt and b/ext/standard/tests/strings/strpos.phpt differ