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

(-)trunk/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 179-185 Link Here
179
        setInt(getHeaderSize(method, url));
180
        setInt(getHeaderSize(method, url));
180
        String hdr = setConnectionHeaders(url, host, method);
181
        String hdr = setConnectionHeaders(url, host, method);
181
        res.setRequestHeaders(hdr);
182
        res.setRequestHeaders(hdr);
182
        setConnectionCookies(url, getCookieManager());
183
        res.setCookies(setConnectionCookies(url, getCookieManager()));
183
        setByte((byte)0xff); // Attributes not supported
184
        setByte((byte)0xff); // Attributes not supported
184
    }
185
    }
185
186
Lines 304-319 Link Here
304
        return newValue.toString();
305
        return newValue.toString();
305
    }
306
    }
306
307
307
    private void setConnectionCookies(URL url, CookieManager cookies) {
308
    private String setConnectionCookies(URL url, CookieManager cookies) {
309
        String cookieHeader = null;
308
        if(cookies != null) {
310
        if(cookies != null) {
311
            cookieHeader = cookies.getCookieHeaderForURL(url);
309
            CollectionProperty coll = cookies.getCookies();
312
            CollectionProperty coll = cookies.getCookies();
310
            PropertyIterator i = coll.iterator();
313
            PropertyIterator i = coll.iterator();
311
            while(i.hasNext()) {
314
            while(i.hasNext()) {
312
                JMeterProperty header = i.next();
315
                Cookie cookie = (Cookie)(i.next().getObjectValue());
313
                setInt(0xA009); // Cookie
316
                setInt(0xA009); // Cookie
314
                setString(header.getName()+"="+header.getStringValue());//$NON-NLS-1$
317
                setString(cookie.getName()+"="+cookie.getValue());//$NON-NLS-1$
315
            }
318
            }
316
        }
319
        }
320
        return cookieHeader;
317
    }
321
    }
318
322
319
    private int translateHeader(String n) {
323
    private int translateHeader(String n) {
Lines 484-487 Link Here
484
        inpos+= len+1;
488
        inpos+= len+1;
485
        return s;
489
        return s;
486
    }
490
    }
487
}
491
}

Return to bug 48568