[PHP-DEV] RE: [PHP-CVS] cvs: php4 /ext/standard fsock.c fsock.h /main network.c php_network.h php_streams.h streams.c

2001-05-05 Thread Wez Furlong

On 2001-05-05 20:30:25, Andi Gutmans [EMAIL PROTECTED] wrote:
 Your patch has broken my build.
 On Linux doing a simple ./configure ; make dies with:
 /home/andi/php-cvs/main/network.c: In function `php_hostconnect':
 /home/andi/php-cvs/main/network.c:274: storage size of `timeoutval'
isn't
known

 Please see what you can do and merge your fix to the PHP_4_0_6 branch.
 RC1 will have to wait for this... I'll remove the RC1 tag.

Fixed and on the PHP_4_0_6 branch.

Sorry again - I didn't see you mail about branching until after I had
commited the patch.

--Wez.


-- 
PHP Development 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]




[PHP-DEV] Re: [PHP-CVS] cvs: php4 /ext/standard fsock.c fsock.h /main network.c php_network.h php_streams.h streams.c

2001-05-05 Thread Wez Furlong

On 2001-05-05 20:30:25, Andi Gutmans [EMAIL PROTECTED] wrote:
 Hi,
 
 Your patch has broken my build.
 On Linux doing a simple ./configure ; make dies with:
 
 gcc  -I. -I/home/andi/php-cvs/main -I/home/andi/php-cvs/cgi/main 
 -I/home/andi/php-cvs -I/home/andi/php-cvs/cgi/Zend 
 -I/home/andi/php-cvs/ext/mysql/libmysql 
 -I/home/andi/php-cvs/ext/xml/expat/xmltok 
 -I/home/andi/php-cvs/ext/xml/expat/xmlparse -I/home/andi/php-cvs/cgi/TSRM

 -I/home/andi/php-cvs/main -I/home/andi/php-cvs/Zend 
 -I/home/andi/php-cvs/TSRM  -DSUPPORT_UTF8 -DXML_BYTE_ORDER=12 -g -O2  -c

 /home/andi/php-cvs/main/network.c  touch network.lo
 /home/andi/php-cvs/main/network.c: In function `php_hostconnect':
 /home/andi/php-cvs/main/network.c:274: storage size of `timeoutval' isn't
known
 
 Please see what you can do and merge your fix to the PHP_4_0_6 branch.
 RC1 will have to wait for this... I'll remove the RC1 tag.
 
 Andi
 
 
 
 At 06:36 PM 5/5/2001 +, Wez Furlong wrote:
 wez Sat May  5 11:36:24 2001 EDT
 
Modified files:
  /php4/main  streams.c php_streams.h network.c php_network.h
  /php4/ext/standard  fsock.h fsock.c
Log:
Nuke buffering from php_streams, move connect_nonb() from fsock.c to

  network.c
and rename to php_connect_nonb().
Use php_connect_nonb() instead of connect() in php_hostconnect() - 
  timeouts
should now work in php_hostconnect().
sock streams abstraction now uses php_sockbuf as the abstract
pointer.
 
 
 --
 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]





On 2001-05-05 20:30:25, Andi Gutmans [EMAIL PROTECTED] wrote:
 Your patch has broken my build.
 On Linux doing a simple ./configure ; make dies with:
 /home/andi/php-cvs/main/network.c: In function `php_hostconnect':
 /home/andi/php-cvs/main/network.c:274: storage size of `timeoutval'
isn't
known
 
 Please see what you can do and merge your fix to the PHP_4_0_6 branch.
 RC1 will have to wait for this... I'll remove the RC1 tag.

Sorry; it worked for me on SuSE Linux 7.0.  The problem is a missing
#include sys/time.h from php_network.h

Having never had to merge between branches before, it might be easier for
you to do it, just so I can't screw it up ;-)

Just add this before the function prototypes in main/php_network.h

#ifdef HAVE_SYS_TIME_H
#include sys/time.h
#endif

Sorry again.

--Wez.





-- 
PHP Development 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]


[PHP-DEV] Re: [PHP-CVS] cvs: php4 /ext/standard fsock.c fsock.h /main network.c php_network.h php_streams.h streams.c

2001-05-05 Thread Andi Gutmans

Hi,

Your patch has broken my build.
On Linux doing a simple ./configure ; make dies with:

gcc  -I. -I/home/andi/php-cvs/main -I/home/andi/php-cvs/cgi/main 
-I/home/andi/php-cvs -I/home/andi/php-cvs/cgi/Zend 
-I/home/andi/php-cvs/ext/mysql/libmysql 
-I/home/andi/php-cvs/ext/xml/expat/xmltok 
-I/home/andi/php-cvs/ext/xml/expat/xmlparse -I/home/andi/php-cvs/cgi/TSRM 
-I/home/andi/php-cvs/main -I/home/andi/php-cvs/Zend 
-I/home/andi/php-cvs/TSRM  -DSUPPORT_UTF8 -DXML_BYTE_ORDER=12 -g -O2  -c 
/home/andi/php-cvs/main/network.c  touch network.lo
/home/andi/php-cvs/main/network.c: In function `php_hostconnect':
/home/andi/php-cvs/main/network.c:274: storage size of `timeoutval' isn't known

Please see what you can do and merge your fix to the PHP_4_0_6 branch.
RC1 will have to wait for this... I'll remove the RC1 tag.

Andi



At 06:36 PM 5/5/2001 +, Wez Furlong wrote:
wez Sat May  5 11:36:24 2001 EDT

   Modified files:
 /php4/main  streams.c php_streams.h network.c php_network.h
 /php4/ext/standard  fsock.h fsock.c
   Log:
   Nuke buffering from php_streams, move connect_nonb() from fsock.c to 
 network.c
   and rename to php_connect_nonb().
   Use php_connect_nonb() instead of connect() in php_hostconnect() - 
 timeouts
   should now work in php_hostconnect().
   sock streams abstraction now uses php_sockbuf as the abstract pointer.


--
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]


-- 
PHP Development 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]