<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14348] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14348">14348</a></dd>
<dt>Author</dt> <dd>rupa</dd>
<dt>Date</dt> <dd>2009-07-24 12:06:22 -0500 (Fri, 24 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/MODAPP-307">MODAPP-307</a> - support http post in mod_curl</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_curlmod_curlc">freeswitch/trunk/src/mod/applications/mod_curl/mod_curl.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_curlmod_curlc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_curl/mod_curl.c (14347 => 14348)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_curl/mod_curl.c 2009-07-24 15:56:23 UTC (rev 14347)
+++ freeswitch/trunk/src/mod/applications/mod_curl/mod_curl.c 2009-07-24 17:06:22 UTC (rev 14348)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> */
</span><span class="cx"> SWITCH_MODULE_DEFINITION(mod_curl, mod_curl_load, mod_curl_shutdown, NULL);
</span><span class="cx">
</span><del>-static char *SYNTAX = "curl url [headers|json]";
</del><ins>+static char *SYNTAX = "curl url [headers|json] [get|head|post [url_encoded_data]]";
</ins><span class="cx">
</span><span class="cx"> static struct {
</span><span class="cx"> switch_memory_pool_t *pool;
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> return realsize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static http_data_t *do_lookup_url(switch_memory_pool_t *pool, const char *url) {
</del><ins>+static http_data_t *do_lookup_url(switch_memory_pool_t *pool, const char *url, const char *method, const char *data) {
</ins><span class="cx">
</span><span class="cx"> CURL *curl_handle = NULL;
</span><span class="cx"> long httpRes = 0;
</span><span class="lines">@@ -117,14 +117,26 @@
</span><span class="cx">
</span><span class="cx"> gethostname(hostname, sizeof(hostname));
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "url: %s\n", url);
</del><ins>+ if (!method) {
+ method = "get";
+ }
+
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "method: %s, url: %s\n", method, url);
</ins><span class="cx"> curl_handle = curl_easy_init();
</span><span class="cx">
</span><span class="cx"> if (!strncasecmp(url, "https", 5)) {
</span><span class="cx"> curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0);
</span><span class="cx"> curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0);
</span><span class="cx"> }
</span><del>- curl_easy_setopt(curl_handle, CURLOPT_POST, SWITCH_FALSE);
</del><ins>+ if (!strcasecmp(method, "head")) {
+ curl_easy_setopt(curl_handle, CURLOPT_NOBODY, SWITCH_TRUE);
+ } else if(!strcasecmp(method, "post")) {
+ curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDSIZE, strlen(data));
+ curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, (void *) data);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Post data: %s\n", data);
+ } else {
+ curl_easy_setopt(curl_handle, CURLOPT_HTTPGET, SWITCH_TRUE);
+ }
</ins><span class="cx"> curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 0);
</span><span class="cx"> curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 0);
</span><span class="cx"> curl_easy_setopt(curl_handle, CURLOPT_URL, url);
</span><span class="lines">@@ -226,11 +238,14 @@
</span><span class="cx"> switch_memory_pool_t *pool = NULL;
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="cx"> char *url = NULL;
</span><ins>+ char *method = NULL;
+ char *postdata = NULL;
</ins><span class="cx"> switch_bool_t do_headers = SWITCH_FALSE;
</span><span class="cx"> switch_bool_t do_json = SWITCH_FALSE;
</span><span class="cx"> http_data_t *http_data = NULL;
</span><span class="cx"> struct curl_slist *slist = NULL;
</span><span class="cx"> switch_stream_handle_t stream = { 0 };
</span><ins>+ int i = 0;
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (session) {
</span><span class="lines">@@ -249,17 +264,26 @@
</span><span class="cx">
</span><span class="cx"> url = switch_core_strdup(pool, argv[0]);
</span><span class="cx">
</span><del>- if (argc > 1) {
- if (!strcasecmp("headers", argv[1])) {
</del><ins>+ for (i =1; i < argc; i++) {
+ if (!strcasecmp("headers", argv[i])) {
</ins><span class="cx"> do_headers = SWITCH_TRUE;
</span><del>- }
- if (!strcasecmp("json", argv[1])) {
</del><ins>+ } else if (!strcasecmp("json", argv[i])) {
</ins><span class="cx"> do_json = SWITCH_TRUE;
</span><ins>+ } else if ( !strcasecmp("get", argv[i]) ||
+ !strcasecmp("head", argv[i])) {
+ method = switch_core_strdup(pool, argv[i]);
+ } else if (!strcasecmp("post", argv[i])) {
+ if ( ++i < argc) {
+ postdata = switch_core_strdup(pool, argv[i]);
+ switch_url_decode(postdata);
+ } else {
+ postdata = "";
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- http_data = do_lookup_url(pool, url);
</del><ins>+ http_data = do_lookup_url(pool, url, method, postdata);
</ins><span class="cx"> if (do_json) {
</span><span class="cx"> switch_channel_set_variable(channel, "curl_response_data", print_json(pool, http_data));
</span><span class="cx"> } else {
</span><span class="lines">@@ -278,6 +302,7 @@
</span><span class="cx"> }
</span><span class="cx"> switch_channel_set_variable(channel, "curl_response_code",
</span><span class="cx"> switch_core_sprintf(pool, "%ld", http_data->http_response_code));
</span><ins>+ switch_channel_set_variable(channel, "curl_method", method);
</ins><span class="cx">
</span><span class="cx"> switch_goto_status(SWITCH_STATUS_SUCCESS, done);
</span><span class="cx">
</span><span class="lines">@@ -301,10 +326,13 @@
</span><span class="cx"> int argc;
</span><span class="cx"> char *mydata = NULL;
</span><span class="cx"> char *url = NULL;
</span><ins>+ char *method = NULL;
+ char *postdata = NULL;
</ins><span class="cx"> switch_bool_t do_headers = SWITCH_FALSE;
</span><span class="cx"> switch_bool_t do_json = SWITCH_FALSE;
</span><span class="cx"> struct curl_slist *slist = NULL;
</span><span class="cx"> http_data_t *http_data = NULL;
</span><ins>+ int i = 0;
</ins><span class="cx">
</span><span class="cx"> switch_memory_pool_t *pool = NULL;
</span><span class="cx">
</span><span class="lines">@@ -326,16 +354,26 @@
</span><span class="cx">
</span><span class="cx"> url = switch_core_strdup(pool, argv[0]);
</span><span class="cx">
</span><del>- if (argc > 1) {
- if (!strcasecmp("headers", argv[1])) {
</del><ins>+ for (i =1; i < argc; i++) {
+ if (!strcasecmp("headers", argv[i])) {
</ins><span class="cx"> do_headers = SWITCH_TRUE;
</span><del>- }
- if (!strcasecmp("json", argv[1])) {
</del><ins>+ } else if (!strcasecmp("json", argv[i])) {
</ins><span class="cx"> do_json = SWITCH_TRUE;
</span><ins>+ } else if ( !strcasecmp("get", argv[i]) ||
+ !strcasecmp("head", argv[i])) {
+ method = switch_core_strdup(pool, argv[i]);
+ } else if (!strcasecmp("post", argv[i])) {
+ method = "post";
+ if ( ++i < argc) {
+ postdata = switch_core_strdup(pool, argv[i]);
+ switch_url_decode(postdata);
+ } else {
+ postdata = "";
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- http_data = do_lookup_url(pool, url);
</del><ins>+ http_data = do_lookup_url(pool, url, method, postdata);
</ins><span class="cx"> if (do_json) {
</span><span class="cx"> stream->write_function(stream, "%s", print_json(pool, http_data));
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>