diff --git a/gsoap-03-seqpoint.diff b/gsoap-03-seqpoint.diff index f03ceab..c8c4095 100644 --- a/gsoap-03-seqpoint.diff +++ b/gsoap-03-seqpoint.diff @@ -12,44 +12,22 @@ stdsoap2_ssl.c:15576:14: note: in expansion of macro ‘soap_get1’ ^ --- - gsoap/stdsoap2.cpp | 2 -- - gsoap/stdsoap2.h | 3 +-- - 2 files changed, 1 insertion(+), 4 deletions(-) + gsoap/stdsoap2.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) Index: gsoap-2.8.28/gsoap/stdsoap2.cpp =================================================================== --- gsoap-2.8.28.orig/gsoap/stdsoap2.cpp +++ gsoap-2.8.28/gsoap/stdsoap2.cpp -@@ -1591,7 +1591,6 @@ soap_get0(struct soap *soap) - - /******************************************************************************/ - --#ifdef WITH_LEAN - #ifndef PALM_1 - soap_wchar - soap_get1(struct soap *soap) -@@ -1600,7 +1599,6 @@ soap_get1(struct soap *soap) - return (unsigned char)soap->buf[soap->bufidx++]; - } - #endif --#endif - - /******************************************************************************/ - -Index: gsoap-2.8.28/gsoap/stdsoap2.h -=================================================================== ---- gsoap-2.8.28.orig/gsoap/stdsoap2.h -+++ gsoap-2.8.28/gsoap/stdsoap2.h -@@ -2788,11 +2788,10 @@ extern SOAP_NMAC struct Namespace namesp - - #ifndef WITH_LEAN - # define soap_get0(soap) (((soap)->bufidx>=(soap)->buflen && soap_recv(soap)) ? EOF : (unsigned char)(soap)->buf[(soap)->bufidx]) --# define soap_get1(soap) (((soap)->bufidx>=(soap)->buflen && soap_recv(soap)) ? EOF : (unsigned char)(soap)->buf[(soap)->bufidx++]) - #else - soap_wchar soap_get0(struct soap*); --soap_wchar soap_get1(struct soap*); - #endif -+soap_wchar soap_get1(struct soap*); - - #define soap_versioning_paste(name, ext) name##_REQUIRE_lib_v##ext - #define soap_versioning_ext(name, ext) soap_versioning_paste(name, ext) +@@ -16408,7 +16408,10 @@ soap_getgziphdr(struct soap *soap) + f = c; + } + if (f & 0x04) /* FEXTRA */ +- { for (i = soap_get1(soap) | (soap_get1(soap) << 8); i; i--) ++ { ++ int i = soap_get1(soap); ++ i |= soap_get1(soap) << 8; ++ while (i-- > 0) + { if ((int)soap_get1(soap) == EOF) + return soap->error = SOAP_ZLIB_ERROR; + } diff --git a/gsoap-mindeflateratio.diff b/gsoap-mindeflateratio.diff index d9598cf..465d5d0 100644 --- a/gsoap-mindeflateratio.diff +++ b/gsoap-mindeflateratio.diff @@ -12,11 +12,11 @@ However, the comment above explicitly says the minimum is gsoap/stdsoap2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: gsoap-2.8.22/gsoap/stdsoap2.h +Index: gsoap-2.8.28/gsoap/stdsoap2.h =================================================================== ---- gsoap-2.8.22.orig/gsoap/stdsoap2.h -+++ gsoap-2.8.22/gsoap/stdsoap2.h -@@ -1159,7 +1159,7 @@ extern "C" { +--- gsoap-2.8.28.orig/gsoap/stdsoap2.h ++++ gsoap-2.8.28/gsoap/stdsoap2.h +@@ -1212,7 +1212,7 @@ extern "C" { to the limit of 1032:1. */ #ifndef SOAP_MINDEFLATERATIO