Reverting to previous state.

diff --git a/output.c b/output.c
index 380181d1a56ef9ace87f2cb536be85094c36691f..e1363d6c4263cc61bea68fd045c0ba4dd15fdc26 100644 (file)
--- a/output.c
+++ b/output.c
@@ -190,10 +190,8 @@ static int zend_ub_body_write_no_header(const char *str, uint str_length)
 
 static int zend_ub_body_write(const char *str, uint str_length)
 {
-#ifdef TRANS_SID
        char *newstr = NULL;
        uint new_length;
-#endif
        int result = 0;
        SLS_FETCH();
 
@@ -201,23 +199,19 @@ static int zend_ub_body_write(const char *str, uint str_length)
                zend_bailout();
        }
        if (php3_header()) {
-#ifdef TRANS_SID
                session_adapt_uris(str, str_length, &newstr, &new_length);
                
                if (newstr) {
                        str = newstr;
                        str_length = new_length;
                }
-#endif
 
                zend_body_write = zend_ub_body_write_no_header;
                result = zend_header_write(str, str_length);
 
-#ifdef TRANS_SID
                if (newstr) {
                        free(newstr);
                }
-#endif
        }
 
        return result;