--- /dev/null
+--TEST--
+rewriter uses arg_seperator.output for modifying URLs
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--INI--
+session.use_cookies=0
+session.cache_limiter=
+session.use_trans_sid=1
+arg_separator.output=&
+--FILE--
+<?php
+
+error_reporting(E_ALL);
+
+session_id("abtest");
+session_start();
+?>
+<a href="link.php?a=b">
+<?php
+session_destroy();
+?>
+--EXPECT--
+<a href="link.php?a=b&PHPSESSID=abtest">
--- /dev/null
+--TEST--
+rewriter handles <form> and <fieldset> correctly
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--INI--
+session.use_cookies=0
+session.cache_limiter=
+session.use_trans_sid=1
+--FILE--
+<?php
+
+error_reporting(E_ALL);
+
+session_id("abtest");
+session_start();
+?>
+<form>
+<fieldset>
+<?php
+
+ini_set("url_rewriter.tags", "a=href,area=href,frame=src,input=src,form=");
+
+?>
+<form>
+<fieldset>
+<?php
+
+ini_set("url_rewriter.tags", "a=href,area=href,frame=src,input=src,form=fakeentry");
+
+?>
+<form>
+<fieldset>
+<?php
+
+ini_set("url_rewriter.tags", "a=href,fieldset=,area=href,frame=src,input=src");
+
+?>
+<form>
+<fieldset>
+<?php
+session_destroy();
+?>
+--EXPECT--
+<form><input type="hidden" name="PHPSESSID" value="abtest" />
+<fieldset><input type="hidden" name="PHPSESSID" value="abtest" />
+<form><input type="hidden" name="PHPSESSID" value="abtest" />
+<fieldset>
+<form><input type="hidden" name="PHPSESSID" value="abtest" />
+<fieldset>
+<form>
+<fieldset><input type="hidden" name="PHPSESSID" value="abtest" />