Download as
Browse Code »

Commit 66d149cbb53b07afe9f121d37433054462ddeff5

Authored by perry.werneck@gmail.com
1 parent d4e4ff84
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Negociação SSL estava travando em windows

Showing 3 changed files with 6 additions and 4 deletions   Show diff stats
src/lib3270/ssl.c
  Diff comments   View file @66d149c
... ... @@ -177,6 +177,8 @@ int ssl_negotiate(H3270 *hSession)
177 177  
178 178 /* Tell the world that we are (still) connected, now in secure mode. */
179 179 lib3270_set_connected(hSession);
  180 + non_blocking(hSession,True);
  181 +
180 182 return 0;
181 183 }
182 184 #endif // HAVE_LIBSSL
... ...
src/pw3270/v3270/iocallback.c
  Diff comments   View file @66d149c
... ... @@ -182,14 +182,14 @@ static gboolean IO_check(GSource *source)
182 182 */
183 183 #ifdef _WIN32
184 184  
185   - fd_set rfds, wfds, xfds;
  185 + fd_set rfds, wfds;
186 186 struct timeval tm;
187 187  
188 188 memset(&tm,0,sizeof(tm));
189 189  
190 190 FD_ZERO(&rfds);
191 191 FD_ZERO(&wfds);
192   - FD_ZERO(&xfds);
  192 +// FD_ZERO(&xfds);
193 193  
194 194 if(((IO_Source *) source)->poll.events & G_IO_IN)
195 195 {
... ... @@ -201,7 +201,7 @@ static gboolean IO_check(GSource *source)
201 201 FD_SET(((IO_Source *) source)->poll.fd, &wfds);
202 202 }
203 203  
204   - if(select(((IO_Source *) source)->poll.fd+1, &rfds, &wfds, &xfds, &tm) > 0)
  204 + if(select(((IO_Source *) source)->poll.fd+1, &rfds, &wfds, NULL, &tm) > 0)
205 205 return TRUE;
206 206  
207 207 #else
... ...
ui/98trace.xml
  Diff comments   View file @66d149c
... ... @@ -37,8 +37,8 @@
37 37 <menuitem action='toggle' id='screentrace' label='Trace screen contents' />
38 38 <menuitem action='toggle' id='nettrace' label='Trace network data flow' />
39 39 <menuitem action='toggle' id='eventtrace' label='Trace user interface events' />
40   - <menuitem action='toggle' id='fieldattr' label='View Field Delimiters' />
41 40 </menu>
  41 + <menuitem action='toggle' id='fieldattr' label='Field Delimiters' />
42 42 </menu>
43 43  
44 44 </menubar>
... ...