simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Work-around for an IE6 bug when doing HTTPS through proxies.

Browse source 
git-svn-id: https://shellinabox.googlecode.com/svn/trunk@86 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
zodiac 2009-03-21 19:09:05 +00:00
parent 0596dc00c3
commit abba562359
5 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -3,6 +3,8 @@
* Possible fix for IE problems with horizontal positioning of * Possible fix for IE problems with horizontal positioning of
cursor if the line ends in spaces. cursor if the line ends in spaces.
* Work-around for an IE6 bug when doing HTTPS through proxies.
2009-03-21 Markus Gutschke <markus@shellinabox.com> 2009-03-21 Markus Gutschke <markus@shellinabox.com>
* Released version 2.5 * Released version 2.5

2
config.h
View file

@ -95,7 +95,7 @@
#define STDC_HEADERS 1 #define STDC_HEADERS 1
/* Most recent revision number in the version control system */ /* Most recent revision number in the version control system */
#define VCS_REVISION "85" #define VCS_REVISION "86"
/* Version number of package */ /* Version number of package */
#define VERSION "2.5" #define VERSION "2.5"

2
configure vendored
View file

@ -2055,7 +2055,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_compiler_gnu=$ac_cv_c_compiler_gnu
VCS_REVISION=85 VCS_REVISION=86
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF

2
configure.ac
View file

@ -2,7 +2,7 @@ AC_PREREQ(2.57)
dnl This is the one location where the authoritative version number is stored dnl This is the one location where the authoritative version number is stored
AC_INIT(shellinabox, 2.5, markus@shellinabox.com) AC_INIT(shellinabox, 2.5, markus@shellinabox.com)
VCS_REVISION=85 VCS_REVISION=86
AC_SUBST(VCS_REVISION) AC_SUBST(VCS_REVISION)
AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
[Most recent revision number in the version control system]) [Most recent revision number in the version control system])

17
libhttp/httpconnection.c
View file

@ -183,7 +183,6 @@ static int httpShutdown(struct HttpConnection *http, int how) {
} }
sslFreeHndl(&http->sslHndl); sslFreeHndl(&http->sslHndl);
} }
return rc;
} }
return shutdown(http->fd, how); return shutdown(http->fd, how);
} }
@ -449,6 +448,18 @@ void httpTransfer(struct HttpConnection *http, char *msg, int len) {
http->msgLength = len; http->msgLength = len;
} }
// Internet Explorer prior to version 7 has a bug when send XMLHttpRequests
// over HTTPS that go through a proxy. It won't see the reply until we
// close the connection.
int ieBug = 0;
if (http->sslHndl) {
const char *userAgent = getFromHashMap(&http->header, "user-agent");
const char *msie = userAgent ? strstr(userAgent, "MSIE ") : NULL;
if (msie && msie[5] >= '4' && msie[5] <= '6') {
ieBug++;
}
}
// The caller can suspend the connection, so that it can send an // The caller can suspend the connection, so that it can send an
// asynchronous reply. Once the reply has been sent, the connection // asynchronous reply. Once the reply has been sent, the connection
// gets reactivated. Normally, this means it would go back to listening // gets reactivated. Normally, this means it would go back to listening
@ -494,6 +505,10 @@ void httpTransfer(struct HttpConnection *http, char *msg, int len) {
} }
} }
} }
if (ieBug) {
httpCloseRead(http);
}
} }
void httpTransferPartialReply(struct HttpConnection *http, char *msg, int len){ void httpTransferPartialReply(struct HttpConnection *http, char *msg, int len){