X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_any.c;h=5328dee1561034394b487b9c3047b31d2407c3a2;hb=c620a713f1418315efcd4e6fab225e036775d365;hp=9ca2cb255bf3973128a068c3c05df4e50665c15b;hpb=19af2bd8dfd21731cc978beccd1346133d614c67;p=yaz-moved-to-github.git

diff --git a/odr/ber_any.c b/odr/ber_any.c
index 9ca2cb2..5328dee 100644
--- a/odr/ber_any.c
+++ b/odr/ber_any.c
@@ -1,70 +1,13 @@
 /*
- * Copyright (c) 1995-2000, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Log: ber_any.c,v $
- * Revision 1.18  2000-02-29 13:44:55  adam
- * Check for config.h (currently not generated).
- *
- * Revision 1.17  2000/01/31 13:15:21  adam
- * Removed uses of assert(3). Cleanup of ODR. CCL parser update so
- * that some characters are not surrounded by spaces in resulting term.
- * ILL-code updates.
- *
- * Revision 1.16  1999/11/30 13:47:11  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.15  1999/01/08 11:23:20  adam
- * Added const modifier to some of the BER/ODR encoding routines.
- *
- * Revision 1.14  1998/02/11 11:53:34  adam
- * Changed code so that it compiles as C++.
- *
- * Revision 1.13  1997/05/14 06:53:56  adam
- * C++ support.
- *
- * Revision 1.12  1995/09/29 17:12:15  quinn
- * Smallish
- *
- * Revision 1.11  1995/09/27  15:02:54  quinn
- * Modified function heads & prototypes.
- *
- * Revision 1.10  1995/05/16  08:50:42  quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.9  1995/04/18  08:15:12  quinn
- * Added dynamic memory allocation on encoding (whew). Code is now somewhat
- * neater. We'll make the same change for decoding one day.
- *
- * Revision 1.8  1995/04/17  09:37:42  quinn
- * *** empty log message ***
- *
- * Revision 1.7  1995/03/17  10:17:39  quinn
- * Added memory management.
- *
- * Revision 1.6  1995/03/08  12:12:02  quinn
- * Added better error checking.
- *
- * Revision 1.5  1995/02/14  20:39:54  quinn
- * Fixed bugs in completeBER and (serious one in) ber_oid.
- *
- * Revision 1.4  1995/02/14  11:54:33  quinn
- * Adjustments.
- *
- * Revision 1.3  1995/02/10  18:57:24  quinn
- * More in the way of error-checking.
- *
- * Revision 1.2  1995/02/10  15:55:28  quinn
- * Bug fixes, mostly.
- *
- * Revision 1.1  1995/02/09  15:51:45  quinn
- * Works better now.
- *
+ * $Id: ber_any.c,v 1.21 2003-02-12 15:06:43 adam Exp $
  */
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <yaz/odr.h>
+#include "odr-priv.h"
 
 int ber_any(ODR o, Odr_any **p)
 {
@@ -104,6 +47,47 @@ int completeBER(const unsigned char *buf, int len)
     	return 0;
     if (!buf[0] && !buf[1])
     	return 0;
+    if (len > 5 && buf[0] >= 0x20 && buf[0] < 0x7f
+		&& buf[1] >= 0x20 && buf[1] < 0x7f
+		&& buf[2] >= 0x20 && buf[2] < 0x7f)
+    {
+        /* deal with HTTP request/response */
+	int i = 2, content_len = 0;
+
+        while (i <= len-4)
+        {
+            if (buf[i] == '\r' && buf[i+1] == '\n')
+            {
+                i += 2;
+                if (buf[i] == '\r' && buf[i+1] == '\n')
+                {
+                    /* i += 2 seems not to work with GCC -O2 .. 
+                       so i+2 is used instead .. */
+                    if (len >= (i+2)+ content_len)
+                        return (i+2)+ content_len;
+                    break;
+                }
+                if (i < len-18)
+                {
+                    if (!memcmp(buf+i, "Content-Length:", 15))
+                    {
+                        i+= 15;
+                        if (buf[i] == ' ')
+                            i++;
+                        content_len = 0;
+                        while (i <= len-4 && isdigit(buf[i]))
+                            content_len = content_len*10 + (buf[i++] - '0');
+                        if (content_len < 0) /* prevent negative offsets */
+                            content_len = 0;
+                    }
+                }
+            }
+            else
+                i++;
+        }
+        return 0;
+    }
+    /* BER from now on .. */
     if ((res = ber_dectag(b, &zclass, &tag, &cons)) <= 0)
     	return 0;
     if (res > len)