Merge "(bug 44921) API should properly handle OPTIONS"

diff --combined RELEASE-NOTES-1.21
index c941089,bd72d8b..3737932
--- 1/RELEASE-NOTES-1.21
--- 2/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@@ -105,14 -105,6 +105,14 @@@ production
    on some external cluster instead of the primary cluster for a given wiki.
  * (bug 20281) test the parsing of inline URLs.
  * Added Special:PagesWithProp, which lists pages using a particular page property.
 +* Implemented language-specific collations for category sorting for 67 languages
 +  based in latin, greek and cyrillic alphabets. This allows one to *finally* get
 +  articles to be correctly sorted on category pages. They are named
 +  'uca-<langcode>', where <langcode> is one of: af, ast, az, be, bg, br, bs, ca,
 +  co, cs, cy, da, de, dsb, el, en, eo, es, et, eu, fi, fo, fr, fur, fy, ga, gd,
 +  gl, hr, hsb, hu, is, it, kk, kl, ku, ky, la, lb, lt, lv, mk, mo, mt, nl, no,
 +  oc, pl, pt, rm, ro, ru, rup, sco, sk, sl, smn, sq, sr, sv, tk, tl, tr, tt, uk,
 +  uz, vi.
  
  === Bug fixes in 1.21 ===
  * (bug 40353) SpecialDoubleRedirect should support interwiki redirects.
@@@ -241,6 -233,8 +241,8 @@@
    particular page property.
  * Added an API query module list=pagepropnames, which lists all page prop names
    currently in use on the wiki.
+ * (bug 44921) ApiMain::execute() will now return after the CORS check for an
+   HTTP OPTIONS request.
  
  === API internal changes in 1.21 ===
  * For debugging only, a new global $wgDebugAPI removes many API restrictions when true.