From a2139988d05d67fee9f67b4766aa0bab44ae41ab Mon Sep 17 00:00:00 2001 From: Sara Golemon Date: Thu, 11 Jul 2013 13:05:47 -0700 Subject: [PATCH] Update url_raw_encode() to ignore '~' characters Per Bug#53248, tilde characters should not be encoded. --- hphp/runtime/base/zend/zend_url.cpp | 2 +- hphp/test/zend/{bad => good}/ext-standard-url/bug53248.php | 0 .../zend/{bad => good}/ext-standard-url/bug53248.php.expectf | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename hphp/test/zend/{bad => good}/ext-standard-url/bug53248.php (100%) rename hphp/test/zend/{bad => good}/ext-standard-url/bug53248.php.expectf (100%) diff --git a/hphp/runtime/base/zend/zend_url.cpp b/hphp/runtime/base/zend/zend_url.cpp index d173843be..cdc94ec56 100644 --- a/hphp/runtime/base/zend/zend_url.cpp +++ b/hphp/runtime/base/zend/zend_url.cpp @@ -439,7 +439,7 @@ char *url_raw_encode(const char *s, int &len) { if ((str[y] < '0' && str[y] != '-' && str[y] != '.') || (str[y] < 'A' && str[y] > '9') || (str[y] > 'Z' && str[y] < 'a' && str[y] != '_') || - (str[y] > 'z')) { + (str[y] > 'z' && str[y] != '~')) { str[y++] = '%'; str[y++] = hexchars[(unsigned char) s[x] >> 4]; str[y] = hexchars[(unsigned char) s[x] & 15]; diff --git a/hphp/test/zend/bad/ext-standard-url/bug53248.php b/hphp/test/zend/good/ext-standard-url/bug53248.php similarity index 100% rename from hphp/test/zend/bad/ext-standard-url/bug53248.php rename to hphp/test/zend/good/ext-standard-url/bug53248.php diff --git a/hphp/test/zend/bad/ext-standard-url/bug53248.php.expectf b/hphp/test/zend/good/ext-standard-url/bug53248.php.expectf similarity index 100% rename from hphp/test/zend/bad/ext-standard-url/bug53248.php.expectf rename to hphp/test/zend/good/ext-standard-url/bug53248.php.expectf