diff --git a/src/wp-admin/includes/ajax-actions.php b/src/wp-admin/includes/ajax-actions.php
index 75d7a61000..e7619f2a1b 100644
--- a/src/wp-admin/includes/ajax-actions.php
+++ b/src/wp-admin/includes/ajax-actions.php
@@ -3558,7 +3558,7 @@ function wp_ajax_get_revision_diffs() {
 
 	// Removes the script timeout limit by setting it to 0 allowing ample time for diff UI setup.
 	if ( function_exists( 'set_time_limit' ) ) {
-		set_time_limit( 0 );
+		set_time_limit( 120 );
 	}
 
 	foreach ( $_REQUEST['compare'] as $compare_key ) {
diff --git a/src/wp-includes/class-pop3.php b/src/wp-includes/class-pop3.php
index b4eab75044..50b43dc3b5 100644
--- a/src/wp-includes/class-pop3.php
+++ b/src/wp-includes/class-pop3.php
@@ -47,7 +47,7 @@ class POP3 {
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct ( $server = '', $timeout = '' ) {
+    function __construct ( $server = '', $timeout = 120 ) {
         settype($this->BUFFER,"integer");
         if( !empty($server) ) {
             // Do not allow programs to alter MAILSERVER