Attmpt to fix "Unable to reattach to base address" problem. (Matt Ficken)

Author: dstogov

NEWS

@@ -24,6 +24,9 @@ PHP                                                                        NEWS
   . Fixed bug #70279 (HTTP Authorization Header is sometimes passed to newer
     reqeusts). (Laruence)
 
+- Opcache
+  . Attmpt to fix "Unable to reattach to base address" problem. (Matt Ficken)
+
 - OpenSSL
   . Require at least OpenSSL version 0.9.8. (Jakub Zelenka)
   . Fixed bug #68312 (Lookup for openssl.cnf causes a message box). (Anatol)

ext/opcache/shared_alloc_win32.c

@@ -206,12 +206,17 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_
 			/* Mapping failed, wait for mapping object to get freed and retry */
             CloseHandle(memfile);
 			memfile = NULL;
+			if (++map_retries < MAX_MAP_RETRIES) {
+				break;
+			}
+			zend_shared_alloc_unlock_win32();
 			Sleep(1000 * (map_retries + 1));
+			zend_shared_alloc_lock_win32();
 		} else {
 			zend_shared_alloc_unlock_win32();
 			return ret;
 		}
-	} while (++map_retries < MAX_MAP_RETRIES);
+	} while (1);
 
 	if (map_retries == MAX_MAP_RETRIES) {
 		zend_shared_alloc_unlock_win32();