You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@locus.apache.org on 2000/05/12 00:20:37 UTC
cvs commit: apache-2.0/src/main buff.c
stoddard 00/05/11 15:20:36
Modified: src ApacheCore.def
src/include buff.h
src/main buff.c
Log:
Create ap_bpop_iol to pop the buff off the iol and unregister the
cleanup.
Revision Changes Path
1.16 +2 -2 apache-2.0/src/ApacheCore.def
Index: ApacheCore.def
===================================================================
RCS file: /home/cvs/apache-2.0/src/ApacheCore.def,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ApacheCore.def 2000/04/24 14:31:50 1.15
+++ ApacheCore.def 2000/05/11 22:20:31 1.16
@@ -37,8 +37,8 @@
ap_blookc @30
;ap_bnonblock @31
ap_bonerror @32
- ;ap_bpushfd @33
- ;ap_bpushh @34
+ ap_bpush_iol @33
+ ap_bpop_iol @34
ap_bputs @35
ap_bread @36
ap_bsetflag @37
1.20 +1 -0 apache-2.0/src/include/buff.h
Index: buff.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/buff.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- buff.h 2000/04/14 15:58:16 1.19
+++ buff.h 2000/05/11 22:20:33 1.20
@@ -174,6 +174,7 @@
API_EXPORT(BUFF *) ap_bcreate(ap_pool_t *p, int flags);
API_EXPORT(void) ap_bpush_iol(BUFF *fb, ap_iol *iol);
+API_EXPORT(void) ap_bpop_iol(ap_iol **iol, BUFF *fb);
/* XXX - unused right now - mvsk */
API_EXPORT(BUFF *) ap_bopenf(ap_pool_t *a, const char *name, int flg, int mode);
1.39 +5 -0 apache-2.0/src/main/buff.c
Index: buff.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/buff.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- buff.c 2000/04/20 15:20:31 1.38
+++ buff.c 2000/05/11 22:20:35 1.39
@@ -182,6 +182,11 @@
fb->iol = iol;
ap_register_cleanup(fb->pool, fb, bcleanup, bcleanup);
}
+API_EXPORT(void) ap_bpop_iol(ap_iol **iol, BUFF *fb)
+{
+ *iol = fb->iol;
+ ap_kill_cleanup(fb->pool, fb, bcleanup);
+}
API_EXPORT(ap_status_t) ap_bsetopt(BUFF *fb, int optname, const void *optval)
{