Index: src/os_unix.c
==================================================================
--- src/os_unix.c
+++ src/os_unix.c
@@ -4705,31 +4705,20 @@
       goto shm_open_err;
     }
 
     if( pInode->bProcessLock==0 ){
       const char *zRO;
+      int openFlags = O_RDWR | O_CREAT;
       zRO = sqlite3_uri_parameter(pDbFd->zPath, "readonly_shm");
       if( zRO && sqlite3GetBoolean(zRO) ){
-        pShmNode->h = robust_open(zShmFilename, O_RDONLY,
-                                  (sStat.st_mode & 0777));
+        openFlags = O_RDONLY;
         pShmNode->isReadonly = 1;
-      }else{
-        pShmNode->h = robust_open(zShmFilename, O_RDWR|O_CREAT,
-                               (sStat.st_mode & 0777));
       }
+      pShmNode->h = robust_open(zShmFilename, openFlags, (sStat.st_mode&0777));
       if( pShmNode->h<0 ){
-        const char *zRO;
-        zRO = sqlite3_uri_parameter(pDbFd->zPath, "readonly_shm");
-        if( zRO && sqlite3GetBoolean(zRO) ){
-          pShmNode->h = robust_open(zShmFilename, O_RDONLY,
-                                    (sStat.st_mode & 0777));
-          pShmNode->isReadonly = 1;
-        }
-        if( pShmNode->h<0 ){
-          rc = unixLogError(SQLITE_CANTOPEN_BKPT, "open", zShmFilename);
-          goto shm_open_err;
-        }
+        rc = unixLogError(SQLITE_CANTOPEN_BKPT, "open", zShmFilename);
+        goto shm_open_err;
       }
   
       /* Check to see if another process is holding the dead-man switch.
       ** If not, truncate the file to zero length. 
       */

Index: test/walro.test
==================================================================
--- test/walro.test
+++ test/walro.test
@@ -22,17 +22,10 @@
 if {$::tcl_platform(platform) != "unix"} {
   finish_test
   return
 }
 
-# these tests can't deal with the location of the -shm file under proxy locking
-#
-if {[forced_proxy_locking]} {
-  finish_test
-  return
-}
-
 # And only if the build is WAL-capable.
 #
 ifcapable !wal {
   finish_test
   return
@@ -148,20 +141,20 @@
     code1 { sqlite3 db test.db }
     csql1 { SELECT * FROM t1 }
   } {1 {unable to open database file}}
 
   # Also test that if the -shm file can be opened for read/write access,
-  # it is, even if readonly_shm=1 is present in the URI.
+  # it is not if readonly_shm=1 is present in the URI.
   do_test 1.3.2.1 {
     code1 { db close }
     code2 { db2 close }
     file exists test.db-shm
   } {0}
   do_test 1.3.2.2 {
     code1 { sqlite3 db file:test.db?readonly_shm=1 }
-    sql1 { SELECT * FROM t1 }
-  } {a b c d e f g h i j k l}
+    csql1 { SELECT * FROM sqlite_master }
+  } {1 {unable to open database file}}
   do_test 1.3.2.3 {
     code1 { db close }
     close [open test.db-shm w]
     file attributes test.db-shm -permissions r--r--r--
     code1 { sqlite3 db file:test.db?readonly_shm=1 }