Ticket #34697: 34697.diff

src/wp-login.php

@@ -562 +562 @@
 case 'resetpass' :
 case 'rp' :
         list( $rp_path ) = explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) );
+        rtrim( $rp_path, '/' );
         $rp_cookie = 'wp-resetpass-' . COOKIEHASH;
         if ( isset( $_GET['key'] ) ) {
                 $value = sprintf( '%s:%s', wp_unslash( $_GET['login'] ), wp_unslash( $_GET['key'] ) );