[PHP-CVS] cvs: php4 /sapi/apache2filter apache_config.c sapi_apache2.c

[Sascha Schumann]

sas             Wed Feb 28 06:11:35 2001 EDT

  Modified files:              
    /php4/sapi/apache2filter    apache_config.c sapi_apache2.c 
  Log:
  Now it actually loads, but it segfaults upon a request.
  
  
Index: php4/sapi/apache2filter/apache_config.c
diff -u php4/sapi/apache2filter/apache_config.c:1.10 
php4/sapi/apache2filter/apache_config.c:1.11
--- php4/sapi/apache2filter/apache_config.c:1.10        Wed Feb 28 06:03:58 2001
+++ php4/sapi/apache2filter/apache_config.c     Wed Feb 28 06:11:34 2001
@@ -150,7 +150,7 @@
 
        phpapdebug((stderr, "Creating new config (%p) for %s\n", newx, dummy));
        zend_hash_init(&newx->config, 0, NULL, NULL, 1);
-       apr_register_cleanup(p, newx, destroy_php_config, NULL);
+       apr_pool_cleanup_register(p, newx, destroy_php_config, NULL);
        return (void *) newx;
 }
 
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.26 
php4/sapi/apache2filter/sapi_apache2.c:1.27
--- php4/sapi/apache2filter/sapi_apache2.c:1.26 Wed Feb 28 06:03:58 2001
+++ php4/sapi/apache2filter/sapi_apache2.c      Wed Feb 28 06:11:34 2001
@@ -60,7 +60,7 @@
        while (str_length > 0) {
                now = MIN(str_length, 4096);
                b = apr_bucket_transient_create(str, now);
-               AP_BRIGADE_INSERT_TAIL(bb, b);
+               APR_BRIGADE_INSERT_TAIL(bb, b);
                str += now;
                str_length -= now;
        }
@@ -171,7 +171,7 @@
        
        bb = apr_brigade_create(ctx->f->r->pool);
        b = apr_bucket_flush_create();
-       AP_BRIGADE_INSERT_TAIL(bb, b);
+       APR_BRIGADE_INSERT_TAIL(bb, b);
        if (ap_pass_brigade(ctx->f->next, bb) != APR_SUCCESS) {
                php_handle_aborted_connection();
        }
@@ -184,7 +184,7 @@
 
        ctx = SG(server_context);
 
-       apr_puts(msg, ctx->f->r->server->error_log);
+       apr_file_puts(msg, ctx->f->r->server->error_log);
 }
 
 static sapi_module_struct apache2_sapi_module = {
@@ -339,7 +339,7 @@
        /* If we have received all data from the previous filters,
         * we "flatten" the buckets by creating a single string buffer.
         */
-       if (ctx->state == 1 && apr_bucket_IS_EOS(AP_BRIGADE_LAST(ctx->bb))) {
+       if (ctx->state == 1 && APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(ctx->bb))) {
                int fd;
                zend_file_handle zfd;
                smart_str content = {0};
@@ -401,18 +401,18 @@
 skip_execution:
 #define NO_DATA "php_filter did not get ANY data"
                eos = apr_bucket_transient_create(NO_DATA, sizeof(NO_DATA)-1);
-               AP_BRIGADE_INSERT_HEAD(bb, eos);
+               APR_BRIGADE_INSERT_HEAD(bb, eos);
 ok:
                php_apache_request_dtor(f SLS_CC);
 
                SG(server_context) = 0;
                /* Pass EOS bucket to next filter to signal end of request */
                eos = apr_bucket_eos_create();
-               AP_BRIGADE_INSERT_TAIL(bb, eos);
+               APR_BRIGADE_INSERT_TAIL(bb, eos);
                
                return ap_pass_brigade(f->next, bb);
        } else
-               ap_brigade_destroy(bb);
+               apr_brigade_destroy(bb);
 
        return APR_SUCCESS;
 }
@@ -432,7 +432,7 @@
        tsrm_startup(1, 1, 0, NULL);
        sapi_startup(&apache2_sapi_module);
        apache2_sapi_module.startup(&apache2_sapi_module);
-       apr_register_cleanup(pchild, NULL, php_apache_server_shutdown, NULL);
+       apr_pool_cleanup_register(pchild, NULL, php_apache_server_shutdown, NULL);
        php_apache_register_module();
 }
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]