Mercurial > prosody-hg
comparison core/s2smanager.lua @ 2892:9f214431de29
Merge 0.6->0.7
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 18 Mar 2010 01:25:50 +0000 |
| parents | 8dc5f3651501 c1e6df7cf56a |
| children | f47bd0f7e2e6 |
comparison
equal
deleted
inserted
replaced
| 2887:765e7070d0a8 | 2892:9f214431de29 |
|---|---|
| 367 | 367 |
| 368 if session.secure == false then | 368 if session.secure == false then |
| 369 session.secure = true; | 369 session.secure = true; |
| 370 end | 370 end |
| 371 | 371 |
| 372 if session.version >= 1.0 and not (attr.to and attr.from) then | |
| 373 (session.log or log)("warn", "Remote of stream "..(session.from_host or "(unknown)").."->"..(session.to_host or "(unknown)") | |
| 374 .." failed to specify to (%s) and/or from (%s) hostname as per RFC", tostring(attr.to), tostring(attr.from)); | |
| 375 end | |
| 376 | |
| 377 if session.direction == "incoming" then | 372 if session.direction == "incoming" then |
| 378 -- Send a reply stream header | 373 -- Send a reply stream header |
| 379 session.to_host = attr.to and nameprep(attr.to); | 374 session.to_host = attr.to and nameprep(attr.to); |
| 380 session.from_host = attr.from and nameprep(attr.from); | 375 session.from_host = attr.from and nameprep(attr.from); |
| 381 | 376 |