From 22219ed80793df5c42bd64a9e7f5045757486f0c Mon Sep 17 00:00:00 2001
From: OKAZAKI Tetsurou <okazaki@FreeBSD.org>
Date: Tue, 28 Aug 2007 10:55:06 +0000
Subject: Update to 0.9

Brush up Makefile:
- Use PORTEXAMPLES (and honor NOPORTEXAMPLES)
- Remove obsolete constructs and simplify some expressions
- use LOCALBASE instead of PREFIX where appropriate

PR:		115874
Submitted by:	maintainer
---
 www/gatling/files/patch-gatling.c | 55 +++++++--------------------------------
 1 file changed, 9 insertions(+), 46 deletions(-)

(limited to 'www/gatling/files/patch-gatling.c')

diff --git a/www/gatling/files/patch-gatling.c b/www/gatling/files/patch-gatling.c
index 90e453213142..74c43a1a3e3e 100644
--- a/www/gatling/files/patch-gatling.c
+++ b/www/gatling/files/patch-gatling.c
@@ -1,47 +1,10 @@
---- gatling.c.orig	Sat Jan 13 15:37:09 2007
-+++ gatling.c	Sat Jan 13 15:47:04 2007
-@@ -865,7 +865,7 @@ static inline int issafe(unsigned char c
-   return (c!='"' && c!='%' && c>=' ' && c!='+');
- }
+--- gatling.c.orig	Mon Aug 27 16:08:00 2007
++++ gatling.c	Mon Aug 27 16:08:06 2007
+@@ -101,7 +101,6 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <ctype.h>
+-#include <crypt.h>
+ #include "havealloca.h"
+ #include "havesetresuid.h"
  
--unsigned long fmt_urlencoded(char* dest,const char* src,unsigned long len) {
-+size_t fmt_urlencoded(char* dest,const char* src,size_t len) {
-   register const unsigned char* s=(const unsigned char*) src;
-   unsigned long written=0,i;
-   for (i=0; i<len; ++i) {
-@@ -1011,7 +1011,7 @@ username2:password2
-  * authentication was OK or -1 if authentication is needed (the HTTP
-  * response was then already written to the iob). */
- int http_dohtaccess(struct http_data* h) {
--  unsigned long filesize;
-+  size_t filesize;
-   char* map;
-   char* s;
-   char* auth;
-@@ -1031,7 +1031,7 @@ int http_dohtaccess(struct http_data* h)
-       char* username,* password;
-       char* decoded;
-       int i;
--      unsigned long l,dl,ul;
-+      size_t l,dl,ul;
-       auth+=6;
-       while (*auth==' ' || *auth=='\t') ++auth;
-       i=str_chr(auth,'\n');
-@@ -1103,7 +1103,7 @@ int64 http_openfile(struct http_data* h,
-   char* dir=0;
-   char* s;
-   char* args;
--  unsigned long i;
-+  size_t i;
-   int64 fd;
-   int doesgzip,doesbzip2;
- 
-@@ -2948,7 +2948,7 @@ void forkslave(int fd,buffer* in) {
- 		j=str_chr(x,'\n'); if (j && x[j-1]=='\r') { --j; }
- 		k=str_chr(x,' ');
- 		if (k<j) {
--		  unsigned long dl;
-+		  size_t dl;
- 		  remoteuser=alloca(20+k-j);
- 		  i=fmt_str(remoteuser,"REMOTE_USER=");
- 		  scan_base64(x+k+1,remoteuser+i,&dl);
-- 
cgit v1.2.3