Fix mppe packaging from #1742

[openwrt.git] / package / busybox / patches / 330-httpd_user_agent.patch

diff --git a/package/busybox/patches/330-httpd_user_agent.patch b/package/busybox/patches/330-httpd_user_agent.patch
index 7cf3f53..316604e 100644 (file)
--- a/package/busybox/patches/330-httpd_user_agent.patch
+++ b/package/busybox/patches/330-httpd_user_agent.patch
@@ -1,29 +1,28 @@
---- busybox-1.1.0.orig/networking/httpd.c      2006-02-06 16:41:57.000000000 +0100
-+++ busybox-1.1.0/networking/httpd.c   2006-02-06 16:41:26.000000000 +0100
-@@ -247,6 +247,7 @@
+diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c
+--- busybox.old/networking/httpd.c     2007-01-19 22:22:59.000000000 +0100
++++ busybox.dev/networking/httpd.c     2007-01-22 13:09:03.000000000 +0100
+@@ -137,6 +137,7 @@
+       const char *query;

  
  

- #ifdef CONFIG_FEATURE_HTTPD_CGI
-   char *referer;
-+  char *user_agent;
- #endif
+       USE_FEATURE_HTTPD_CGI(char *referer;)
++      USE_FEATURE_HTTPD_CGI(char *user_agent;)
+ 
+       const char *configFile;

  
  

-   const char *configFile;
-@@ -1192,6 +1193,7 @@
-       addEnv("SERVER",         "PROTOCOL", "HTTP/1.0");
-       addEnv("GATEWAY_INTERFACE", "",      "CGI/1.1");
-       addEnv("REMOTE",         "ADDR",     config->rmt_ip_str);
-+      addEnv("HTTP","USER_AGENT", config->user_agent);
- #ifdef CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
-       addEnvPort("REMOTE");
+@@ -1066,6 +1067,7 @@
+                       if (cp) *cp = '\0'; /* delete :PORT */
+                       setenv1("REMOTE_ADDR", p);
+               }
++              setenv1("HTTP_USER_AGENT", config->user_agent);
+ #if ENABLE_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
+               setenv_long("REMOTE_PORT", config->port);

  #endif
  #endif

-@@ -1737,6 +1739,10 @@
-                 for(test = buf + 8; isspace(*test); test++)
-                         ;
-                 config->referer = strdup(test);
-+      } else if ((strncasecmp(buf, "User-Agent:",11) ==0)) {
-+              for(test = buf + 11; isspace(*test); test++)
-+                      ;
-+              config->user_agent = strdup(test);
-       }
+@@ -1629,6 +1631,8 @@
+                                       content_type = strdup(skip_whitespace(buf + sizeof("Content-Type:")-1));
+                               } else if ((STRNCASECMP(buf, "Referer:") == 0)) {
+                                       config->referer = strdup(skip_whitespace(buf + sizeof("Referer:")-1));
++                              } else if ((STRNCASECMP(buf, "User-Agent:") == 0)) {
++                                      config->user_agent = strdup(skip_whitespace(buf + sizeof("User-Agent:")-1));
+                               }

  #endif
  
  #endif