forked from enlightenment/efl
url of ecore-con-url is now stringshared
SVN revision: 61607
This commit is contained in:
parent
a10530a6f4
commit
48bb4c6252
|
@ -1198,7 +1198,7 @@ EAPI Eina_Bool ecore_con_url_url_set(Ecore_Con_Url *url_con,
|
||||||
* Gets the URL to send the request to.
|
* Gets the URL to send the request to.
|
||||||
*
|
*
|
||||||
* @param url_con Connection object through which the request will be sent.
|
* @param url_con Connection object through which the request will be sent.
|
||||||
* @return URL that will receive the request, NULL on failure
|
* @return URL that will receive the request, NULL on failure. URL is stringshared.
|
||||||
* @since 1.1
|
* @since 1.1
|
||||||
*/
|
*/
|
||||||
EAPI const char *ecore_con_url_url_get(Ecore_Con_Url *url_con);
|
EAPI const char *ecore_con_url_url_get(Ecore_Con_Url *url_con);
|
||||||
|
|
|
@ -181,7 +181,7 @@ struct _Ecore_Con_Url
|
||||||
struct curl_slist *headers;
|
struct curl_slist *headers;
|
||||||
Eina_List *additional_headers;
|
Eina_List *additional_headers;
|
||||||
Eina_List *response_headers;
|
Eina_List *response_headers;
|
||||||
char *url;
|
const char *url;
|
||||||
|
|
||||||
Ecore_Con_Url_Time time_condition;
|
Ecore_Con_Url_Time time_condition;
|
||||||
double timestamp;
|
double timestamp;
|
||||||
|
|
|
@ -372,7 +372,7 @@ ecore_con_url_free(Ecore_Con_Url *url_con)
|
||||||
free(s);
|
free(s);
|
||||||
EINA_LIST_FREE(url_con->response_headers, s)
|
EINA_LIST_FREE(url_con->response_headers, s)
|
||||||
free(s);
|
free(s);
|
||||||
free(url_con->url);
|
eina_stringshare_del(url_con->url);
|
||||||
free(url_con);
|
free(url_con);
|
||||||
#else
|
#else
|
||||||
return;
|
return;
|
||||||
|
@ -410,12 +410,7 @@ ecore_con_url_url_set(Ecore_Con_Url *url_con,
|
||||||
if (url_con->active)
|
if (url_con->active)
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
|
|
||||||
if (url_con->url)
|
eina_stringshare_replace(&url_con->url, url);
|
||||||
free(url_con->url);
|
|
||||||
|
|
||||||
url_con->url = NULL;
|
|
||||||
if (url)
|
|
||||||
url_con->url = strdup(url);
|
|
||||||
|
|
||||||
if (url_con->url)
|
if (url_con->url)
|
||||||
curl_easy_setopt(url_con->curl_easy, CURLOPT_URL,
|
curl_easy_setopt(url_con->curl_easy, CURLOPT_URL,
|
||||||
|
|
Loading…
Reference in New Issue