<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://reviewboard.asterisk.org/r/3541/">https://reviewboard.asterisk.org/r/3541/</a>
</td>
</tr>
</table>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="https://reviewboard.asterisk.org/r/3541/diff/6/?file=59049#file59049line183" style="color: black; font-weight: bold; text-decoration: underline;">trunk/main/uri.c</a>
<span style="font-weight: normal;">
(Diff revision 6)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">183</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb"> </span><span class="cm">/* if path = "/" uriparser for some reason sets the path to "X" */</span></pre></td>
</tr>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">184</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb"> </span><span class="k">if</span> <span class="p">(</span><span class="n">path_start</span> <span class="o">&&</span> <span class="n">path_size</span> <span class="o">==</span> <span class="mi">2</span> <span class="o">&&</span> <span class="o">*</span><span class="n">path_start</span> <span class="o">==</span> <span class="sc">'X'</span><span class="p">)</span> <span class="p">{</span></pre></td>
</tr>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">185</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb"> </span><span class="tb"> </span><span class="n">path_start</span> <span class="o">=</span> <span class="s">""</span><span class="p">;</span></pre></td>
</tr>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">186</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb"> </span><span class="tb"> </span><span class="n">path_size</span> <span class="o">=</span> <span class="mi">1</span><span class="p">;</span></pre></td>
</tr>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">187</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb"> </span><span class="p">}</span></pre></td>
</tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">I'm not seeing that with the git version. And what happens when someone *does* want X in the URL?
My test against the git version:
src/uriparser-git$ cat 1.c
#include <uriparser/Uri.h>
#include <stdio.h>
int main(int argc, char **argv) {
UriParserStateA state;
UriUriA uri;
state.uri = &uri;
if (uriParseUriA(&state, argv[1]) != URI_SUCCESS) {
/* Failure */
uriFreeUriMembersA(&uri);
return 1;
}
#define P(s, c, k) do { \
if (c && k.first) { printf(s " = \"%.*s\"\n", \
(int)(k.afterLast - k.first), k.first); \
} else { printf(s " = null\n"); } } while(0)
P("scheme", 1, uri.scheme);
P("host", 1, uri.hostText);
P("path", uri.pathHead, uri.pathHead->text);
uriFreeUriMembersA(&uri);
return 0;
}
src/uriparser-git$ gcc 1.c src/*.c -I`pwd`/include -w
src/uriparser-git$ ./a.out "http://test"
scheme = "http"
host = "test"
path = null
src/uriparser-git$ ./a.out "http://test/"
scheme = "http"
host = "test"
path = ""
src/uriparser-git$ ./a.out "http://test/X"
scheme = "http"
host = "test"
path = "X"
uriparser-git$ ./a.out "http://test?1"
scheme = "http"
host = "test"
path = null
uriparser-git$ ./a.out "http://test/?1"
scheme = "http"
host = "test"
path = ""
Is something wrong with your path_size calculations above?
The "X" is indeed used as a placeholder for certain (missing?) items:
src/UriCommon.c:/*extern*/ const URI_CHAR * const URI_FUNC(SafeToPointTo) = _UT("X");
</pre>
</div>
<br />
<p>- wdoekes</p>
<br />
<p>On May 30th, 2014, 5:36 p.m. UTC, Kevin Harwell wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('https://reviewboard.asterisk.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Asterisk Developers and Joshua Colp.</div>
<div>By Kevin Harwell.</div>
<p style="color: grey;"><i>Updated May 30, 2014, 5:36 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>
<a href="https://issues.asterisk.org/jira/browse/ASTERISK-23742">ASTERISK-23742</a>
</div>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
Asterisk
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Add client websocket capabilities to Asterisk.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Created some unit tests.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>trunk/tests/test_websocket_client.c <span style="color: grey">(PRE-CREATION)</span></li>
<li>trunk/tests/test_uri.c <span style="color: grey">(PRE-CREATION)</span></li>
<li>trunk/res/res_http_websocket.exports.in <span style="color: grey">(414813)</span></li>
<li>trunk/res/res_http_websocket.c <span style="color: grey">(414813)</span></li>
<li>trunk/main/uri.c <span style="color: grey">(PRE-CREATION)</span></li>
<li>trunk/main/http.c <span style="color: grey">(414813)</span></li>
<li>trunk/include/asterisk/uri.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>trunk/include/asterisk/http_websocket.h <span style="color: grey">(414813)</span></li>
<li>trunk/include/asterisk/http.h <span style="color: grey">(414813)</span></li>
</ul>
<p><a href="https://reviewboard.asterisk.org/r/3541/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>