PageRenderTime 79ms CodeModel.GetById 21ms RepoModel.GetById 0ms app.codeStats 0ms

/monotone/03-url_escaping.diff

https://bitbucket.org/kaendfinger/aur-mirror
diff | 337 lines | 290 code | 47 blank | 0 comment | 0 complexity | d6b60f3b0adecc158dc942045d04bcf6 MD5 | raw file
Possible License(s): LGPL-2.0, Unlicense, AGPL-1.0, BitTorrent-1.0, EPL-1.0, GPL-3.0, BSD-3-Clause, GPL-2.0, MIT, CC-BY-SA-3.0, BSD-2-Clause, MPL-2.0, BSD-3-Clause-No-Nuclear-License-2014, JSON, AGPL-3.0, MPL-2.0-no-copyleft-exception, IPL-1.0, LGPL-2.1, ISC, CC-BY-3.0, WTFPL, 0BSD, CC0-1.0, LGPL-3.0, Cube, Apache-2.0 
    

  1. Description: Escape characters in URLs used by test suite.
    2. 

  2. Bug-Debian: http://bugs.debian.org/668457
    3. 

  3. Origin: upstream, commit: a0ed177b60caee5cf304c01d83e75812af1225e1
    4. 

  4. Index: monotone-1.0/test/func/attr_mtn_execute/__driver__.lua
    5. 

  5. ===================================================================
    6. 

  6. --- test/func/attr_mtn_execute/__driver__.lua	2012-04-28 15:41:51.595817578 +0100
    7. 

  7. +++ test/func/attr_mtn_execute/__driver__.lua	2012-04-28 15:43:21.839400322 +0100
    8. 

  8. @@ -30,7 +30,7 @@
    9. 

  9.  -- test clone with mtn:execute
    10. 

  10. 

  11.  copy("test.db", "test-clone.db")
    12. 

  12. -testURI="file://" .. test.root .. "/test-clone.db?testbranch"
    13. 

  13. +test_uri="file://" .. url_encode_path(test.root .. "/test-clone.db") .. "?testbranch"
    14. 

  14. 

  15. -check(nodb_mtn("clone", testURI, "clone"), 0, false, true)
    16. 

  16. +check(nodb_mtn("clone", test_uri, "clone"), 0, false, true)
    17. 

  17.  check(indir("clone", {"test", "-x","foo"}, 0, false, false))
    18. 

  18. Index: monotone-1.0/test/func/branch_leaves_sync_bug/__driver__.lua
    19. 

  19. ===================================================================
    20. 

  20. --- test/func/branch_leaves_sync_bug/__driver__.lua	2012-04-28 15:41:51.595817578 +0100
    21. 

  21. +++ test/func/branch_leaves_sync_bug/__driver__.lua	2012-04-28 15:43:21.839400322 +0100
    22. 

  22. @@ -46,7 +46,9 @@
    23. 

  23. 

  24.  -- Create Beth's workspace via checkout, so 'update' works
    25. 

  25.  chdir(test.root)
    26. 

  26. -check(abe_mtn("sync", "file://" .. test.root .. "/beth.db?*"), 0, false, false)
    27. 

  27. +
    28. 

  28. +test_uri="file://" .. url_encode_path(test.root .. "/beth.db") .. "?*"
    29. 

  29. +check(abe_mtn("sync", test_uri), 0, false, false)
    30. 

  30.  check(beth_mtn("checkout", "--branch", "testbranch", "Beth"), 0, false, false)
    31. 

  31.  chdir("Beth")
    32. 

  32.  check(beth_mtn("genkey", "beth@test.net"), 0, false, false, string.rep("beth@test.net\n", 2))
    33. 

  33. @@ -64,7 +66,7 @@
    34. 

  34.  rev_b = base_revision()
    35. 

  35. 

  36.  -- Sync dbs
    37. 

  37. -check(abe_mtn("sync", "file://" .. test.root .. "/beth.db?*"), 0, false, false)
    38. 

  38. +check(abe_mtn("sync", test_uri), 0, false, false)
    39. 

  39. 

  40.  -- Abe merges
    41. 

  41.  chdir("Abe")
    42. 

  42. @@ -80,7 +82,8 @@
    43. 

  43.  rev_d = base_revision()
    44. 

  44. 

  45.  -- Sync dbs (not clear if direction of sync matters)
    46. 

  46. -check(beth_mtn("sync", "file://" .. test.root .. "/abe.db?*"), 0, false, false)
    47. 

  47. +test_uri="file://" .. url_encode_path(test.root .. "/abe.db") .. "?*"
    48. 

  48. +check(beth_mtn("sync", test_uri), 0, false, false)
    49. 

  49. 

  50.  -- bug; rev_d and rev_c are both heads according to branch_leaves table.
    51. 

  51.  check(beth_mtn("db", "check"), 0, false, false)
    52. 

  52. Index: monotone-1.0/test/func/clone_aborts_on_branch_pattern_in_uri/__driver__.lua
    53. 

  53. ===================================================================
    54. 

  54. --- test/func/clone_aborts_on_branch_pattern_in_uri/__driver__.lua	2012-04-28 15:41:51.595817578 +0100
    55. 

  55. +++ test/func/clone_aborts_on_branch_pattern_in_uri/__driver__.lua	2012-04-28 15:43:21.839400322 +0100
    56. 

  56. @@ -6,9 +6,9 @@
    57. 

  57.  commit("mybranch")
    58. 

  58. 

  59.  copy("test.db", "test-clone.db")
    60. 

  60. -testURI="file://" .. test.root .. "/test-clone.db?mybranch*"
    61. 

  61. 

  62. -check(nodb_mtn("clone", testURI), 1, false, true)
    63. 

  63. +test_uri="file://" .. url_encode_path(test.root .. "/test-clone.db") .. "?mybranch*"
    64. 

  64. +check(nodb_mtn("clone", test_uri), 1, false, true)
    65. 

  65.  check(qgrep("you must specify an unambiguous branch to clone", "stderr"))
    66. 

  66. 

  67.  -- the branch option is invalid in non-URI mode
    68. 

  68. @@ -16,7 +16,7 @@
    69. 

  69.  check(qgrep("the '--branch' option is only valid with an URI to clone", "stderr"))
    70. 

  70. 

  71.  -- finally, this should succeed
    72. 

  72. -check(nodb_mtn("clone", testURI, "--branch=mybranch"), 0, false, false)
    73. 

  73. +check(nodb_mtn("clone", test_uri, "--branch=mybranch"), 0, false, false)
    74. 

  74.  check(exists("mybranch"))
    75. 

  75.  check(readfile("foo") == readfile("mybranch/foo"))
    76. 

  76. 

  77. Index: monotone-1.0/test/func/clone_branch_no_dir/__driver__.lua
    78. 

  78. ===================================================================
    79. 

  79. --- test/func/clone_branch_no_dir/__driver__.lua	2012-04-28 15:41:51.595817578 +0100
    80. 

  80. +++ test/func/clone_branch_no_dir/__driver__.lua	2012-04-28 15:43:21.839400322 +0100
    81. 

  81. @@ -6,18 +6,18 @@
    82. 

  82.  commit("mybranch")
    83. 

  83. 

  84.  copy("test.db", "test-clone.db")
    85. 

  85. -testURI="file://" .. test.root .. "/test-clone.db?mybranch"
    86. 

  86. 

  87. -check(nodb_mtn("clone", testURI), 0, false, false)
    88. 

  88. +test_uri="file://" .. url_encode_path(test.root .. "/test-clone.db") .. "?mybranch"
    89. 

  89. +check(nodb_mtn("clone", test_uri), 0, false, false)
    90. 

  90.  check(exists("mybranch"))
    91. 

  91.  check(readfile("foo") == readfile("mybranch/foo"))
    92. 

  92. 

  93.  -- but now that that directory exists, this clone should fail
    94. 

  94. -check(nodb_mtn("clone", testURI), 1, false, false)
    95. 

  95. +check(nodb_mtn("clone", test_uri), 1, false, false)
    96. 

  96. 

  97.  -- but succeed if given a specific dir
    98. 

  98. -check(nodb_mtn("clone", testURI, "otherdir"), 0, false, false)
    99. 

  99. +check(nodb_mtn("clone", test_uri, "otherdir"), 0, false, false)
    100. 

  100. 

  101.  -- clone into . should not fail, like checkout
    102. 

  102.  mkdir("test4")
    103. 

  103. -check(indir("test4", nodb_mtn("clone", testURI, ".")), 0, false, false)
    104. 

  104. +check(indir("test4", nodb_mtn("clone", test_uri, ".")), 0, false, false)
    105. 

  105. Index: monotone-1.0/test/func/clone_creates__MTN_log/__driver__.lua
    106. 

  106. ===================================================================
    107. 

  107. --- test/func/clone_creates__MTN_log/__driver__.lua	2012-04-28 15:41:51.595817578 +0100
    108. 

  108. +++ test/func/clone_creates__MTN_log/__driver__.lua	2012-04-28 15:43:21.840400284 +0100
    109. 

  109. @@ -13,9 +13,9 @@
    110. 

  110.  check(mtn("--branch=testbranch", "--rcfile=commit_log.lua", "commit"), 0, false, false)
    111. 

  111. 

  112.  copy("test.db", "test-clone.db")
    113. 

  113. -testURI="file://" .. test.root .. "/test-clone.db?testbranch"
    114. 

  114. 

  115. -check(nodb_mtn("clone", testURI, "testbranch"), 0, false, true)
    116. 

  116. +test_uri="file://" .. url_encode_path(test.root .. "/test-clone.db") .. "?testbranch"
    117. 

  117. +check(nodb_mtn("clone", test_uri, "testbranch"), 0, false, true)
    118. 

  118. 

  119.  check(exists("testbranch/_MTN/log"))
    120. 

  120.  check(fsize("_MTN/log") == 0)
    121. 

  121. Index: monotone-1.0/test/func/clone_creates_right__MTN_options/__driver__.lua
    122. 

  122. ===================================================================
    123. 

  123. --- test/func/clone_creates_right__MTN_options/__driver__.lua	2012-04-28 15:41:51.595817578 +0100
    124. 

  124. +++ test/func/clone_creates_right__MTN_options/__driver__.lua	2012-04-28 15:43:21.840400284 +0100
    125. 

  125. @@ -10,7 +10,7 @@
    126. 

  126.  writefile("testfile", "blah")
    127. 

  127.  commit()
    128. 

  128. 

  129. -testURI="file://" .. test.root .. "/test-clone.db?testbranch"
    130. 

  130. +test_uri="file://" .. url_encode_path(test.root .. "/test-clone.db") .. "?testbranch"
    131. 

  131. 

  132.  -- We use RAW_MTN because it used to be that passing --db= (as
    133. 

  133.  -- MTN does) would hide a bug in this functionality...
    134. 

  134. @@ -18,16 +18,17 @@
    135. 

  135.  -- all of these inherit options settings from the current _MTN dir
    136. 

  136.  -- unless they override them on the command line
    137. 

  137. 

  138. -check(nodb_mtn("clone", testURI, "test_dir1"), 0, false, false)
    139. 

  139. -check(nodb_mtn("clone", "--revision", rev, testURI, "test_dir2"), 0, false, false)
    140. 

  140. -check(nodb_mtn("--db=" .. test.root .. "/test-new.db", "clone", testURI, "test_dir3"), 0, false, false)
    141. 

  141. -check(nodb_mtn("--db=" .. test.root .. "/test-new.db", "clone", testURI, "--revision", rev, "test_dir4"), 0, false, false)
    142. 

  142. +check(nodb_mtn("clone", test_uri, "test_dir1"), 0, false, false)
    143. 

  143. +check(nodb_mtn("clone", "--revision", rev, test_uri, "test_dir2"), 0, false, false)
    144. 

  144. +check(nodb_mtn("--db=" .. test.root .. "/test-new.db", "clone", test_uri, "test_dir3"), 0, false, false)
    145. 

  145. +check(nodb_mtn("--db=" .. test.root .. "/test-new.db", "clone", test_uri, "--revision", rev, "test_dir4"), 0, false, false)
    146. 

  146. 

  147.  -- checkout fails if the specified revision is not a member of the specified branch
    148. 

  148. -testURI="file://" .. test.root .. "/test-clone.db?foobar"
    149. 

  149. -check(nodb_mtn("clone", testURI, "--revision", rev, "test_dir5"), 1, false, false)
    150. 

  150. +test_uri="file://" .. url_encode_path(test.root .. "/test-clone.db") .. "?foobar"
    151. 

  151. +
    152. 

  152. +check(nodb_mtn("clone", test_uri, "--revision", rev, "test_dir5"), 1, false, false)
    153. 

  153.  check(nodb_mtn("cert", rev, "branch", "foobar", "-d", "test-clone.db"), 0, false, false)
    154. 

  154. -check(nodb_mtn("clone", testURI, "--revision", rev, "test_dir6"), 0, false, false)
    155. 

  155. +check(nodb_mtn("clone", test_uri, "--revision", rev, "test_dir6"), 0, false, false)
    156. 

  156. 

  157. 

  158.  for i = 1,2 do
    159. 

  159. Index: monotone-1.0/test/func/clone_validates_target_directory/__driver__.lua
    160. 

  160. ===================================================================
    161. 

  161. --- test/func/clone_validates_target_directory/__driver__.lua	2012-04-28 15:41:51.595817578 +0100
    162. 

  162. +++ test/func/clone_validates_target_directory/__driver__.lua	2012-04-28 15:43:21.840400284 +0100
    163. 

  163. @@ -6,15 +6,15 @@
    164. 

  164.  commit()
    165. 

  165. 

  166.  copy("test.db", "test-clone.db")
    167. 

  167. -testURI="file://" .. test.root .. "/test-clone.db?testbranch"
    168. 

  168. 

  169. -check(nodb_mtn("clone", testURI, "test_dir1"), 0, false, false)
    170. 

  170. +test_uri="file://" .. url_encode_path(test.root .. "/test-clone.db") .. "?testbranch"
    171. 

  171. +check(nodb_mtn("clone", test_uri, "test_dir1"), 0, false, false)
    172. 

  172. 

  173.  writefile("test_dir2")
    174. 

  174. -check(nodb_mtn("clone", testURI, "test_dir2"), 1, false, false)
    175. 

  175. +check(nodb_mtn("clone", test_uri, "test_dir2"), 1, false, false)
    176. 

  176. 

  177.  mkdir("test_dir3")
    178. 

  178. -check(nodb_mtn("clone", testURI, "test_dir3"), 1, false, false)
    179. 

  179. +check(nodb_mtn("clone", test_uri, "test_dir3"), 1, false, false)
    180. 

  180. 

  181.  if existsonpath("chmod") and existsonpath("test") then
    182. 

  182.    -- skip this part if run as root (hi Gentoo!)
    183. 

  183. @@ -27,9 +27,9 @@
    184. 

  184.    else
    185. 

  185.      mkdir("test_dir4")
    186. 

  186.      check({"chmod", "444", "test_dir4"}, 0, false)
    187. 

  187. -    check(nodb_mtn("clone", testURI, "test_dir4"),
    188. 

  188. +    check(nodb_mtn("clone", test_uri, "test_dir4"),
    189. 

  189.               1, false, false)
    190. 

  190. -    check(nodb_mtn("clone", testURI, "test_dir4/subdir"),
    191. 

  191. +    check(nodb_mtn("clone", test_uri, "test_dir4/subdir"),
    192. 

  192.               1, false, false)
    193. 

  193.      -- Reset the permissions so Autotest can correctly clean up our
    194. 

  194.      -- temporary directory.
    195. 

  195. Index: monotone-1.0/test/func/clone_warning_with_multiple_heads/__driver__.lua
    196. 

  196. ===================================================================
    197. 

  197. --- test/func/clone_warning_with_multiple_heads/__driver__.lua	2012-04-28 15:41:51.595817578 +0100
    198. 

  198. +++ monotone-1.0/test/func/clone_warning_with_multiple_heads/__driver__.lua	2012-04-28 15:43:21.840400284 +0100
    199. 

  199. @@ -16,9 +16,9 @@
    200. 

  200.  REV3=base_revision()
    201. 

  201. 

  202.  copy("test.db", "test-clone.db")
    203. 

  203. -testURI="file://" .. test.root .. "/test-clone.db?testbranch"
    204. 

  204. 

  205. -check(nodb_mtn("clone", testURI, "test_dirA"),
    206. 

  206. +test_uri="file://" .. url_encode_path(test.root .. "/test-clone.db") .. "?testbranch"
    207. 

  207. +check(nodb_mtn("clone", test_uri, "test_dirA"),
    208. 

  208.           1, false, true)
    209. 

  209.  check(qgrep(REV2, "stderr"))
    210. 

  210.  check(qgrep(REV3, "stderr"))
    211. 

  211. Index: monotone-1.0/test/func/clone_weird_branch_names/__driver__.lua
    212. 

  212. ===================================================================
    213. 

  213. --- test/func/clone_weird_branch_names/__driver__.lua	2012-04-28 15:41:51.595817578 +0100
    214. 

  214. +++ test/func/clone_weird_branch_names/__driver__.lua	2012-04-28 15:43:21.840400284 +0100
    215. 

  215. @@ -6,10 +6,11 @@
    216. 

  216.  commit("my-branch[1,2]-1^3")
    217. 

  217. 

  218.  copy("test.db", "test-clone.db")
    219. 

  219. --- some of the special chars need to get double-escaped to get "through"
    220. 

  220. -testURI="file://" .. test.root .. "/test-clone.db?my-branch\\\[1,2\\\]-1^3"
    221. 

  221. 

  222. -check(nodb_mtn("clone", testURI), 0, false, false)
    223. 

  223. +-- some of the special chars need to get double-escaped to get "through"
    224. 

  224. +test_uri="file://" .. url_encode_path(test.root .. "/test-clone.db") ..
    225. 

  225. +  "?" .. url_encode_query("my-branch\\\[1,2\\\]-1^3")
    226. 

  226. +check(nodb_mtn("clone", test_uri), 0, false, false)
    227. 

  227.  check(exists("my-branch[1,2]-1^3"))
    228. 

  228.  check(readfile("foo") == readfile("my-branch[1,2]-1^3/foo"))
    229. 

  229. 

  230. Index: monotone-1.0/test/func/imp_test_filesync_confdir/__driver__.lua
    231. 

  231. ===================================================================
    232. 

  232. --- test/func/imp_test_filesync_confdir/__driver__.lua	2012-04-28 15:41:51.595817578 +0100
    233. 

  233. +++ test/func/imp_test_filesync_confdir/__driver__.lua	2012-04-28 15:43:21.840400284 +0100
    234. 

  234. @@ -18,7 +18,8 @@
    235. 

  235.     rcfile:close()
    236. 

  236.  end
    237. 

  237. 

  238. -check(mtn("sync", "file://" .. test.root .. "/test2.db?testbranch"), 0, true, false)
    239. 

  239. +test_uri="file://" .. url_encode_path(test.root .. "/test2.db") .. "?testbranch"
    240. 

  240. +check(mtn("sync", test_uri), 0, true, false)
    241. 

  241. 

  242.  n = 0
    243. 

  243. 

  244. Index: monotone-1.0/test/func/netsync_over_pipes/__driver__.lua
    245. 

  245. ===================================================================
    246. 

  246. --- test/func/netsync_over_pipes/__driver__.lua	2012-04-28 15:41:51.595817578 +0100
    247. 

  247. +++ test/func/netsync_over_pipes/__driver__.lua	2012-04-28 15:43:21.840400284 +0100
    248. 

  248. @@ -7,6 +7,7 @@
    249. 

  249.  addfile("testfile", "foo")
    250. 

  250.  commit()
    251. 

  251. 

  252. -check(mtn("sync", "file://" .. test.root .. "/test2.db?testbranch"), 0, false, true)
    253. 

  253. +test_uri="file://" .. url_encode_path(test.root .. "/test2.db") .. "?testbranch"
    254. 

  254. +check(mtn("sync", test_uri), 0, false, true)
    255. 

  255.  check(not qgrep("error", "stderr"))
    256. 

  256.  check_same_db_contents("test.db", "test2.db")
    257. 

  257. Index: monotone-1.0/test/func/serve-automate-single-run/__driver__.lua
    258. 

  258. ===================================================================
    259. 

  259. --- test/func/serve-automate-single-run/__driver__.lua	2012-04-28 15:41:51.595817578 +0100
    260. 

  260. +++ test/func/serve-automate-single-run/__driver__.lua	2012-04-28 15:43:21.840400284 +0100
    261. 

  261. @@ -60,8 +60,9 @@
    262. 

  262.  -- 'file:' not supported on Windows
    263. 

  263. 

  264.  copy("allow-automate.lua", "custom_test_hooks.lua")
    265. 

  265. +test_uri="file://" .. url_encode_path(test.root .. "/test.db")
    266. 

  266.  check(mtn2("automate", "remote", "--remote-stdio-host",
    267. 

  267. -	   "file://"..test.root.."/test.db",
    268. 

  268. +	   test_uri,
    269. 

  269.  	   "get_file_of", "--", "-r".. R1, "foo"), 0, true, false)
    270. 

  270.  check(qgrep("bar", "stdout"))
    271. 

  271.  end
    272. 

  272. Index: monotone-1.0/test/func/serve-automate/__driver__.lua
    273. 

  273. ===================================================================
    274. 

  274. --- test/func/serve-automate/__driver__.lua	2012-04-28 15:41:51.595817578 +0100
    275. 

  275. +++ test/func/serve-automate/__driver__.lua	2012-04-28 15:43:21.840400284 +0100
    276. 

  276. @@ -56,7 +56,8 @@
    277. 

  277.  if ostype ~= "Windows" then
    278. 

  278.  -- 'file:' not supported on Windows
    279. 

  279. 

  280. -check(mtn2("automate", "remote_stdio", "file://" .. test.root .. "/test.db"),
    281. 

  281. +test_uri="file://" .. url_encode_path(test.root .. "/test.db")
    282. 

  282. +check(mtn2("automate", "remote_stdio", test_uri),
    283. 

  283.        0, true, false, "l17:interface_versione")
    284. 

  284.  check(parse_stdio(readfile("stdout"), 0, 0, "m") ~= nil)
    285. 

  285.  end
    286. 

  286. Index: monotone-1.0/test/func/util_mtnopt/__driver__.lua
    287. 

  287. ===================================================================
    288. 

  288. --- test/func/util_mtnopt/__driver__.lua	2012-04-28 15:41:51.595817578 +0100
    289. 

  289. +++ test/func/util_mtnopt/__driver__.lua	2012-04-28 15:43:21.840400284 +0100
    290. 

  290. @@ -6,6 +6,11 @@
    291. 

  291. 

  292.  normalized_testroot = normalize_path (test.root)
    293. 

  293. 

  294. +-- Escape regexp special characters to form a proper regexp that correctly
    295. 

  295. +-- checks for the given path.
    296. 

  296. +escaped_testroot = string.gsub(normalized_testroot, "([*+.()[\\^$|?])",
    297. 

  297. +  function (x) return "\\" .. x end)
    298. 

  298. +
    299. 

  299.  -- check default operation
    300. 

  300. 

  301.  -- MinGW does not process the shebang in mtnopt; must invoke sh directly
    302. 

  302. @@ -13,7 +18,7 @@
    303. 

  303.  -- Don't pass the full /bin/sh path, it looks like that doesn't always
    304. 

  304.  -- work under mingw.
    305. 

  305.  check({"sh", "./mtnopt"}, 0, true)
    306. 

  306. -check(qgrep('^MTN_database="' .. normalized_testroot .. '/test.db";$', "stdout"))
    307. 

  307. +check(qgrep('^MTN_database="' .. escaped_testroot .. '/test.db";$', "stdout"))
    308. 

  308.  check(qgrep('^MTN_branch="testbranch";$', "stdout"))
    309. 

  309. 

  310.  -- check operation with a specific key and just returning the value
    311. 

  311. Index: monotone-1.0/test/src/testlib.lua
    312. 

  312. ===================================================================
    313. 

  313. --- test/src/testlib.lua	2012-04-28 15:41:51.595817578 +0100
    314. 

  314. +++ test/src/testlib.lua	2012-04-28 15:43:21.841400246 +0100
    315. 

  315. @@ -144,6 +144,22 @@
    316. 

  316.    return n
    317. 

  317.  end
    318. 

  318. 

  319. +-- encodes a query by percent escaping reserved characters (as defined
    320. 

  320. +-- in RFC 3986) - except for the directory separator ('/').
    321. 

  321. +function url_encode_path(path)
    322. 

  322. +  path = string.gsub(path, "([!*'();:@&=+$,?#[%]])",
    323. 

  323. +    function (x) return string.format("%%%02X", string.byte(x)) end)
    324. 

  324. +  return string.gsub(path, " ", "+")
    325. 

  325. +end
    326. 

  326. +
    327. 

  327. +-- encodes a query by percent escaping reserved characters (as defined
    328. 

  328. +-- in RFC 3986) - except for the ampersand and equal sign ('&', '=')
    329. 

  329. +function url_encode_query(path)
    330. 

  330. +  path = string.gsub(path, "([!*'();:@+$,/?#[%]])",
    331. 

  331. +    function (x) return string.format("%%%02X", string.byte(x)) end)
    332. 

  332. +  return string.gsub(path, " ", "+")
    333. 

  333. +end
    334. 

  334. +
    335. 

  335.  function open_or_err(filename, mode, depth)
    336. 

  336.    local file, e = io.open(filename, mode)
    337. 

  337.    if file == nil then
    338. 

  338.