Apache builds

Hi all, I've been struggling a bit with Apache tonight. I'd hoped to send real patches at the end of it, but... I got sapi/apache to build by adding a direct include for zend_globals.h to php_apache_http.h. I have no idea why the apache sapi would suddenly want that, I just know it showed no interest in anything else on offer - up to and including giving it the entire Zend library. This could be just my setup (experimental at present) and is almost certainly Windows-only even if it isn't, so I'll leave that one for others to comment. The apachefilter sapi must have been broken across all platforms since the arrival of re2c. I got it to build like so (patch inlined because it shouldn't be used, just demonstrating the problem): Index: sapi/apache2filter/sapi_apache2.c =================================================================== RCS file: /repository/php-src/sapi/apache2filter/sapi_apache2.c,v retrieving revision 1.136.2.2.2.8.2.2 diff -u -r1.136.2.2.2.8.2.2 sapi_apache2.c --- sapi/apache2filter/sapi_apache2.c 18 Mar 2008 22:23:20 -0000 1.136.2.2.2.8.2.2 +++ sapi/apache2filter/sapi_apache2.c 18 Jul 2008 02:20:05 -0000 @@ -523,8 +523,7 @@ zfd.handle.stream.handle = pbb; zfd.handle.stream.reader = php_apache_read_stream; zfd.handle.stream.closer = php_apache_close_stream; - zfd.handle.stream.fteller = php_apache_fteller_stream; - zfd.handle.stream.interactive = 0; + zfd.handle.stream.fsizer = php_apache_fteller_stream; zfd.filename = f->r->filename; zfd.opened_path = NULL; Obviously this is not a correct fix, but it appears to work; it gives me a build with only 2 minor warnings from the PHP side of the equation under VC6. If someone with a working brain could supply a proper fix before the 5.3 beta 'twould be good. No other sapis in core are affected by the fteller/fsizer changes. Thanks, - Steph