libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-12-13 20:33:22 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Merge pull request #6389 from fr500/master

Browse Source 
make sure to always encode urls, also change the PS3 default urls
This commit is contained in:
Twinaphex 2018-03-15 06:36:40 +01:00 committed by GitHub
commit 1eaa902b6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.def.h
View File

@ -719,11 +719,11 @@ static char buildbot_server_url[] = "";
#elif defined(WIIU) #elif defined(WIIU)
static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/"; static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/";
#elif defined(__CELLOS_LV2__) && defined(DEX_BUILD) #elif defined(__CELLOS_LV2__) && defined(DEX_BUILD)
static char buildbot_server_url[] = "http://xbins.org/libretro/nightly/playstation/ps3/latest/dex-ps3/"; static char buildbot_server_url[] = "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/dex-ps3/";
#elif defined(__CELLOS_LV2__) && defined(CEX_BUILD) #elif defined(__CELLOS_LV2__) && defined(CEX_BUILD)
static char buildbot_server_url[] = "http://xbins.org/libretro/nightly/playstation/ps3/latest/cex-ps3/"; static char buildbot_server_url[] = "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/cex-ps3/";
#elif defined(__CELLOS_LV2__) && defined(ODE_BUILD) #elif defined(__CELLOS_LV2__) && defined(ODE_BUILD)
static char buildbot_server_url[] = "http://xbins.org/libretro/nightly/playstation/ps3/latest/ode-ps3/"; static char buildbot_server_url[] = "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/ode-ps3/";
#else #else
static char buildbot_server_url[] = ""; static char buildbot_server_url[] = "";
#endif #endif

2
libretro-common/net/net_http.c
View File

@ -97,7 +97,7 @@ void urlencode_lut_init()
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++)
{ {
urlencode_lut[i] = isalnum(i) || i == '*' || i == '-' || i == '.' || i == '_' ? i : (i == ' ') ? '+' : 0; urlencode_lut[i] = isalnum(i) || i == '*' || i == '-' || i == '.' || i == '_' || i == '/' ? i : 0;
} }
} }

25
tasks/task_http.c
View File

@ -320,9 +320,32 @@ void* task_push_http_transfer(const char *url, bool mute,
retro_task_callback_t cb, void *user_data) retro_task_callback_t cb, void *user_data)
{ {
struct http_connection_t *conn; struct http_connection_t *conn;
char *tmp;
char url_domain[PATH_MAX_LENGTH];
char url_path[PATH_MAX_LENGTH];
char url_encoded[PATH_MAX_LENGTH];
conn = net_http_connection_new(url, "GET", NULL); int count = 0;
strlcpy (url_path, url, sizeof(url_path));
tmp = url_path;
while (count < 3 && tmp[0] != '\0')
{
tmp = strchr(tmp, '/');
count ++;
tmp++;
}
strlcpy(url_domain, url, tmp - url_path);
strlcpy(url_path, tmp, sizeof(url_path));
tmp = NULL;
net_http_urlencode_full (&tmp, url_path);
snprintf(url_encoded, sizeof(url_encoded), "%s/%s", url_domain, tmp);
conn = net_http_connection_new(url_encoded, "GET", NULL);
free (tmp);
return task_push_http_transfer_generic(conn, url, mute, type, cb, user_data); return task_push_http_transfer_generic(conn, url, mute, type, cb, user_data);
} }