Re: cvs: pear /Net_Server/Server Driver.php /Net_Server/Server/Driver Fork.php Multiprocess.php Sequential.php

From:	Hannes Magnusson	Date:	Wed, 15 Feb 2006 12:36:21 +0000
Subject:	Re: cvs: pear /Net_Server/Server Driver.php /Net_Server/Server/Driver Fork.php Multiprocess.php Sequential.php
References:	1	Groups:	php.pear.cvs
Request:	Send a blank email to pear-cvs+get-38253@lists.php.net to get a copy of this message

Hmh. Missing sanity check? On 2/15/06, Christian Weiske <cweiske@php.net> wrote: > cweiske Wed Feb 15 12:12:22 2006 UTC > > Modified files: > /pear/Net_Server/Server Driver.php > /pear/Net_Server/Server/Driver Fork.php Multiprocess.php > Sequential.php > Log: > Fixing request #4462 IPv6 support > > > http://cvs.php.net/viewcvs.cgi/pear/Net_Server/Server/Driver.php?r1=1.11&r2=1.12&diff_format=u > Index: pear/Net_Server/Server/Driver.php > diff -u pear/Net_Server/Server/Driver.php:1.11 pear/Net_Server/Server/Driver.php:1.12 > --- pear/Net_Server/Server/Driver.php:1.11 Wed Feb 15 11:49:25 2006 > +++ pear/Net_Server/Server/Driver.php Wed Feb 15 12:12:22 2006 > @@ -16,7 +16,7 @@ > // | Authors: Stephan Schmidt <schst@php.net> | > // +----------------------------------------------------------------------+ > // > -// $Id: Driver.php,v 1.11 2006/02/15 11:49:25 cweiske Exp $ > +// $Id: Driver.php,v 1.12 2006/02/15 12:12:22 cweiske Exp $ > > /** > * Base class for all drivers > @@ -57,6 +57,15 @@ > var $domain = "localhost"; > > /** > + * The connection protocol: > + * AF_INET, AF_INET6, AF_UNIX > + * > + * @access private > + * @var integer > + */ > + var $protocol = AF_INET; > + > + /** > * all file descriptors are stored here > * @access private > * @var array $clientFD > @@ -136,14 +145,16 @@ > * @access private > * @param string $domain domain to bind to > * @param integer $port port to listen to > + * @param integer $protocol protocol type: AF_INET (default), AF_INET6, AF_UNIX > * @see Net_Server::create() > */ > - function Net_Server_Driver($domain = "localhost", $port = 10000) > + function Net_Server_Driver($domain = "localhost", $port = 10000, $protocol = > AF_INET) > { > $this->PEAR(); > > - $this->domain = $domain; > - $this->port = $port; > + $this->domain = $domain; > + $this->port = $port; > + $this->protocol = $protocol; > } > > /** > > http://cvs.php.net/viewcvs.cgi/pear/Net_Server/Server/Driver/Fork.php?r1=1.10&r2=1.11&diff_format=u > Index: pear/Net_Server/Server/Driver/Fork.php > diff -u pear/Net_Server/Server/Driver/Fork.php:1.10 pear/Net_Server/Server/Driver/Fork.php:1.11 > --- pear/Net_Server/Server/Driver/Fork.php:1.10 Wed Feb 15 11:57:20 2006 > +++ pear/Net_Server/Server/Driver/Fork.php Wed Feb 15 12:12:22 2006 > @@ -16,7 +16,7 @@ > // | Authors: Stephan Schmidt <schst@php.net> | > // +----------------------------------------------------------------------+ > // > -// $Id: Fork.php,v 1.10 2006/02/15 11:57:20 cweiske Exp $ > +// $Id: Fork.php,v 1.11 2006/02/15 12:12:22 cweiske Exp $ > > /** > * Forking server class. > @@ -82,7 +82,7 @@ > return $this->raiseError('Needs pcntl extension to fork processes.', > NET_SERVER_ERROR_PCNTL_REQUIRED); > } > > - $this->initFD = @socket_create(AF_INET, SOCK_STREAM, 0); > + $this->initFD = @socket_create($this->protocol, SOCK_STREAM, 0); > if (!$this->initFD) { > return $this->raiseError("Could not create socket."); > } > > http://cvs.php.net/viewcvs.cgi/pear/Net_Server/Server/Driver/Multiprocess.php?r1=1.1&r2=1.2&diff_format=u)Ʌ��.ƒ� > ',+tR� > Index: pear/Net_Server/Server/DriZ��xw�+%i��k��~ @m@��g �y��nû��!�Ty��:f�3��#�e &��#�4�� 6��Z)��_��`X�>8j�p��A>��߼=�F��w��l��3M�6�!��Bպ;�1��+֏�W��{�0�j��V�߈�s�=��?Gx(�k��6iWa��M _&�P��0fB�=��:��j@�G�W,yI% �'n<�B�m(;3��<��fװ"�7�zZ{��P|��2�c�̈́s?"�H!z�t�]Pω�m�Xg�2�H>��C[.l��9��ݑ��Ȣ:�m��L*�GN�.��M��0�i)��TL�碁@bs��`Ѩ��#�ˠ�#g$̲Բ��IM,s8��fX��?ZpK'b�5��ƣm=�1U��t�n�b^��M�\5~��\�e5��d�#[.~W�|5�ܹ��¬��#+Z��/|�� <��m,��N�|I� ^;��TLn%��^�z�) �oܬ:�D��#Z��%�fP��:�}�7��{H7y��MK�焄8�z�'ah�:ł_ �q��$��O)��[�͂L�u��\+?��s<'d.+"x�=�h��_�� (�*G�آ�W�.�l��p�Y��E�>U*q��XE��H�ɪ��}K��e�X�}ֺ�{=��LBF5�嬈T�=�k�zm��7�q�a��}��y��U0�\��67J~��(��C�+=��$>M1�u�j�-Noā�o��N�T�Մ,��D�ʄ5 ��:��^��3��MiuorAW?:�l�3H�|�u��(�4k� u7�9@��OǬ�?�/K��C��Z�bA0l 2[��-��St�G}��j'�@d�՝i��@��q!�0���+MZH(r)�Oš1��A�e*`�o��%g�/&3��X�� Q�-�[eW�;t_23@��b�:��é[;v��2�Ї��1ڿ��(�� yβ'yQ<��K��5p^��)5I,�I� %�G�%�G��3�<�Ct�ɟ�O.Lω��N-�� n��ocߒY��#�ԍ/Gx�i��ϓ�EnK��~a

�U��5,|���;��G�s�K����T��<�.^��g1��>��sYZX>\��~Q���状��j,z��Iϗg����y��T"Yy�u(;�F'�s���gK�Y���%�͹��z��=rE~O(�4u�v5�

TG�.��=�\��퀩��+{$ wF��pDJ�l}�uI�Bn�z�f���I~o(P��V٢� ��3f=�:12:22 cweiske Exp $ > > /** > * Sequential server class. > @@ -80,7 +80,7 @@ > */ > function start() > { > - $this->initFD = @socket_create(AF_INET, SOCK_STREAM, 0); > + $this->initFD = @socket_create($this->protocol, SOCK_STREAM, 0); > if (!$this->initFD) { > return $this->raiseError("Could not create socket."); > } > > -- > PEAR CVS Mailing List (http://pear.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > >

« previous	php.pear.cvs (#38253)	next »