View | Details | Raw Unified | Return to bug 48568
Collapse All | Expand All

(-)tags/v2_3_4/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java (-5 / +9 lines)
Lines 27-32 Link Here
27
import java.net.URL;
27
import java.net.URL;
28
28
29
import org.apache.jmeter.protocol.http.control.AuthManager;
29
import org.apache.jmeter.protocol.http.control.AuthManager;
30
import org.apache.jmeter.protocol.http.control.Cookie;
30
import org.apache.jmeter.protocol.http.control.CookieManager;
31
import org.apache.jmeter.protocol.http.control.CookieManager;
31
import org.apache.jmeter.protocol.http.control.Header;
32
import org.apache.jmeter.protocol.http.control.Header;
32
import org.apache.jmeter.protocol.http.control.HeaderManager;
33
import org.apache.jmeter.protocol.http.control.HeaderManager;
Lines 177-183 Link Here
177
        setInt(getHeaderSize(method, url));
178
        setInt(getHeaderSize(method, url));
178
        String hdr = setConnectionHeaders(url, host, method);
179
        String hdr = setConnectionHeaders(url, host, method);
179
        res.setRequestHeaders(hdr);
180
        res.setRequestHeaders(hdr);
180
        setConnectionCookies(url, getCookieManager());
181
        res.setCookies(setConnectionCookies(url, getCookieManager()));
181
        setByte((byte)0xff); // Attributes not supported
182
        setByte((byte)0xff); // Attributes not supported
182
    }
183
    }
183
184
Lines 302-317 Link Here
302
        return newValue.toString();
303
        return newValue.toString();
303
    }
304
    }
304
305
305
    private void setConnectionCookies(URL url, CookieManager cookies) {
306
    private String setConnectionCookies(URL url, CookieManager cookies) {
307
        String cookieHeader = null;
306
        if(cookies != null) {
308
        if(cookies != null) {
309
            cookieHeader = cookies.getCookieHeaderForURL(url);
307
            CollectionProperty coll = cookies.getCookies();
310
            CollectionProperty coll = cookies.getCookies();
308
            PropertyIterator i = coll.iterator();
311
            PropertyIterator i = coll.iterator();
309
            while(i.hasNext()) {
312
            while(i.hasNext()) {
310
                JMeterProperty header = i.next();
313
                Cookie cookie = (Cookie)(i.next().getObjectValue());
311
                setInt(0xA009); // Cookie
314
                setInt(0xA009); // Cookie
312
                setString(header.getName()+"="+header.getStringValue());//$NON-NLS-1$
315
                setString(cookie.getName()+"="+cookie.getValue());//$NON-NLS-1$
313
            }
316
            }
314
        }
317
        }
318
        return cookieHeader;
315
    }
319
    }
316
320
317
    private int translateHeader(String n) {
321
    private int translateHeader(String n) {
Lines 482-485 Link Here
482
        inpos+= len+1;
486
        inpos+= len+1;
483
        return s;
487
        return s;
484
    }
488
    }
485
}
489
}

Return to bug 48568