Move the trans-sid mechanism to use the output buffering mechanism.

Advantages:
- Would work with the output buffering mechanism in general, and with
  output compression in particular
- Should yield better performance (untested as of yet)

1 files changed, 1 insertions, 10 deletions

diff --git a/main/output.c b/main/output.c
index d8a10cfa6d..e78b9e2d5a 100644
--- a/main/output.c
+++ b/main/output.c
@@ -21,7 +21,6 @@
 
 #include "php.h"
 #include "ext/standard/head.h"
-#include "ext/session/php_session.h"
 #include "ext/standard/basic_functions.h"
 #include "SAPI.h"
 
@@ -253,10 +252,6 @@ PHPAPI void php_end_ob_buffers(zend_bool send_buffer TSRMLS_DC)
 	while (OG(ob_nesting_level)!=0) {
 		php_end_ob_buffer(send_buffer, 0 TSRMLS_CC);
 	}
-
-	if (!OG(disable_output) && send_buffer && BG(use_trans_sid)) {
-		session_adapt_flush(OG(php_header_write) TSRMLS_CC);
-	}
 }
 /* }}} */
 
@@ -427,11 +422,7 @@ static int php_ub_body_write_no_header(const char *str, uint str_length TSRMLS_D
 
 	if (OG(disable_output)) {
 		return 0;
-	}
-	if (BG(use_trans_sid)) {
-		session_adapt_uris(str, str_length, &newstr, &new_length TSRMLS_CC);
-	}
-		
+	}		
 	if (newstr) {
 		str = newstr;
 		str_length = new_length;