From: Stig Bakken Date: Wed, 13 Mar 2002 06:26:22 +0000 (+0000) Subject: * muscat extension moved to PECL (it is GPL'ed and it has never been X-Git-Tag: help~16 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=923c47893a8aec9e7726bae603e7007259328ca3;p=php * muscat extension moved to PECL (it is GPL'ed and it has never been appropriate to distribute it with PHP) --- diff --git a/ext/muscat/EXPERIMENTAL b/ext/muscat/EXPERIMENTAL deleted file mode 100644 index 4f0b763eeb..0000000000 --- a/ext/muscat/EXPERIMENTAL +++ /dev/null @@ -1 +0,0 @@ -This extension cannot be distributed with PHP - It is GPL'ed diff --git a/ext/muscat/LICENSE b/ext/muscat/LICENSE deleted file mode 100644 index 8677a0cce2..0000000000 --- a/ext/muscat/LICENSE +++ /dev/null @@ -1,282 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - diff --git a/ext/muscat/LICENSE.about b/ext/muscat/LICENSE.about deleted file mode 100644 index aaeec10074..0000000000 --- a/ext/muscat/LICENSE.about +++ /dev/null @@ -1,30 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Muscat/Empower 1.5 Module for PHP version 4.0 | - +----------------------------------------------------------------------+ - | Copyright (c) 2000 Ananova Ltd | - | http://www.ananova.com | - | Ananova Ltd, PO Box 36, Leeds, LS11 5ZA, United Kingdom | - +----------------------------------------------------------------------+ - | This program is free software; you can redistribute it and/or | - | modify it under the terms of the GNU General Public License | - | as published by the Free Software Foundation; either version 2 | - | of the License, or (at your option) any later version. | - | | - | This program is distributed in the hope that it will be useful, | - | but WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | - | GNU General Public License for more details. | - | | - | You should have received a copy of the GNU General Public License | - | along with this program; if not, write to the Free Software | - | Foundation, Inc., 59 Temple Place - Suite 330, Boston, | - | MA 02111-1307, USA. | - | | - | A copy is availble at http://www.gnu.org/copyleft/gpl.txt | - +----------------------------------------------------------------------+ - | Author: Sam Liddicott | - +----------------------------------------------------------------------+ - */ - - diff --git a/ext/muscat/config.m4 b/ext/muscat/config.m4 deleted file mode 100644 index bd2acab3e6..0000000000 --- a/ext/muscat/config.m4 +++ /dev/null @@ -1,37 +0,0 @@ -dnl -dnl $Id$ -dnl - -PHP_ARG_WITH(muscat, for Muscat support, -[ --with-muscat[=DIR] Include Muscat support.]) - -if test "$PHP_MUSCAT" != "no"; then - PHP_NEW_EXTENSION(muscat, muscat.c muscat_net.c, $ext_shared) - for i in $PHP_MUSCAT /usr/local /usr /usr/local/empower /usr/local/empower/developer; do - if test -f $i/include/Muscat.h; then - MUSCAT_INCDIR=$i/include - MUSCAT_DIR=$i - fi - if test -f $i/libs/libhdmuscat3.6.a; then - MUSCAT_LIBDIR=$i/libs - MUSCAT_DIR=$i - elif test -f $i/lib/libhdmuscat3.6.a; then - MUSCAT_LIBDIR=$i/lib - MUSCAT_DIR=$i - fi - done - - if test -z "$MUSCAT_INCDIR"; then - AC_MSG_ERROR(Cannot find Muscat include dir) - fi - - if test -z "$MUSCAT_LIBDIR"; then - AC_MSG_ERROR(Cannot find Muscat lib dir) - fi - - AC_DEFINE(HAVE_MUSCAT, 1, [ ]) - PHP_SUBST(MUSCAT_SHARED_LIBADD) - AC_DEFINE_UNQUOTED(PHP_MUSCAT_DIR, "$MUSCAT_DIR", [ ]) - PHP_ADD_LIBRARY_WITH_PATH(hdmuscat3.6, $MUSCAT_LIBDIR, MUSCAT_SHARED_LIBADD) - PHP_ADD_INCLUDE($MUSCAT_INCDIR) -fi diff --git a/ext/muscat/muscat.c b/ext/muscat/muscat.c deleted file mode 100644 index 616e5468a5..0000000000 --- a/ext/muscat/muscat.c +++ /dev/null @@ -1,352 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Muscat/Empower 1.5 Module for PHP version 4.0 | - +----------------------------------------------------------------------+ - | Copyright (c) 2000 Ananova Ltd | - | http://www.ananova.com | - | Ananova Ltd, PO Box 36, Leeds, LS11 5ZA, United Kingdom | - +----------------------------------------------------------------------+ - | This program is free software; you can redistribute it and/or | - | modify it under the terms of the GNU General Public License | - | as published by the Free Software Foundation; either version 2 | - | of the License, or (at your option) any later version. | - | | - | This program is distributed in the hope that it will be useful, | - | but WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | - | GNU General Public License for more details. | - | | - | You should have received a copy of the GNU General Public License | - | along with this program; if not, write to the Free Software | - | Foundation, Inc., 59 Temple Place - Suite 330, Boston, | - | MA 02111-1307, USA. | - | | - | A copy is availble at http://www.gnu.org/copyleft/gpl.txt | - +----------------------------------------------------------------------+ - | Author: Sam Liddicott | - +----------------------------------------------------------------------+ - */ - - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "php.h" -#include "php_ini.h" -#include "php_muscat.h" - -/* You should tweak config.m4 so this symbol (or some else suitable) - gets defined. -*/ -#if HAVE_MUSCAT -#include -#include "../standard/file.h" - -/* If you declare any globals in php_muscat.h uncomment this:*/ -ZEND_DECLARE_MODULE_GLOBALS(muscat) - -/* True global resources - no need for thread safety here */ -static int le_muscat; - -/* Every user visible function must have an entry in muscat_functions[]. -*/ -function_entry muscat_functions[] = { - PHP_FE(muscat_setup, NULL) - PHP_FE(muscat_setup_net, NULL) - PHP_FE(muscat_give, NULL) - PHP_FE(muscat_get, NULL) - PHP_FE(muscat_close, NULL) - {NULL, NULL, NULL} /* Must be the last line in muscat_functions[] */ -}; - -zend_module_entry muscat_module_entry = { - STANDARD_MODULE_HEADER, - "muscat", - muscat_functions, - PHP_MINIT(muscat), - PHP_MSHUTDOWN(muscat), - PHP_RINIT(muscat), /* Replace with NULL if there's nothing to do at request start */ - PHP_RSHUTDOWN(muscat), /* Replace with NULL if there's nothing to do at request end */ - PHP_MINFO(muscat), - NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES -}; - -#ifdef COMPILE_DL_MUSCAT -ZEND_GET_MODULE(muscat) -#endif - -/* {{{ destructor to close and free muscat handles - */ -void _muscat_close(_muscat_handle * handle) { - if (handle->open) { - if (handle->net) _net_muscat_close(&handle->handles.muscatnet_handle); - else H_Close_Muscat(&handle->handles.muscat_handle); - handle->open=0; - } -} - -/* {{{ destructor to close and free muscat handles - */ -void _muscat_dispose(_muscat_handle * handle) { - if (handle->open) { - _muscat_close(handle); - } - efree(handle); -} - -/* }}} */ - -/* Remove comments and fill if you need to have entries in php.ini -PHP_INI_BEGIN() -PHP_INI_END() -*/ - -PHP_MINIT_FUNCTION(muscat) -{ -/* Remove comments if you have entries in php.ini - REGISTER_INI_ENTRIES(); -*/ - le_muscat=register_list_destructors(_muscat_dispose, NULL); - return SUCCESS; -} - -PHP_MSHUTDOWN_FUNCTION(muscat) -{ - return SUCCESS; -} - -/* Remove if there's nothing to do at request start */ -PHP_RINIT_FUNCTION(muscat) -{ - return SUCCESS; -} - -/* Remove if there's nothing to do at request end */ -PHP_RSHUTDOWN_FUNCTION(muscat) -{ - return SUCCESS; -} - -PHP_MINFO_FUNCTION(muscat) -{ - php_info_print_table_start(); - php_info_print_table_header(2, "muscat support", "enabled"); - php_info_print_table_row(2, "Muscat/Empower 1.5 Module for PHP version 4.0
Copyright (c) 2000 Ananova Ltd","For information on Muscat/Empower without php see www.smartlogik.com
Muscat and Empower are probably trade marks"); - php_info_print_table_row(2, "muscat path", PHP_MUSCAT_DIR); - php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ -} - -/* {{{ _local_discard(Muscat_handle * handle) { - This is not a user function, it throws away all muscat_get output */ -void _local_discard(struct Muscat_handle * handle) { - while(! H_Getfrom_Muscat(handle)) {}; -} -/* }}} */ - -/* {{{ _discard(Muscat_handle * handle) { - This is not a user function, it throws away all muscat_get output */ -void _discard(_muscat_handle * handle) { - if (handle->net) _net_discard(&handle->handles.muscatnet_handle); - else _local_discard(&handle->handles.muscat_handle); -} -/* }}} */ - - -/* {{{ proto resource muscat_setup(int size [, string muscat_dir]) - Creates a new muscat session and returns the handle. Size is the ammount of memory in bytes to allocate for muscat muscat_dir is the muscat installation dir e.g. "/usr/local/empower", it defaults to the compile time muscat directory */ -PHP_FUNCTION(muscat_setup) -{ - zval **size_arg, **muscat_dir_arg; - int size; - int muscat_dir_len; - char *muscat_dir = NULL; - int r; - - _muscat_handle *handle=emalloc(sizeof(_muscat_handle)); - handle->net=0; - handle->open=0; - - switch (ZEND_NUM_ARGS()) { - case 1: - if (zend_get_parameters_ex(1, &size_arg)==FAILURE) WRONG_PARAM_COUNT; - muscat_dir=PHP_MUSCAT_DIR; - muscat_dir_len=strlen(muscat_dir); - break; - case 2: - if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &size_arg, &muscat_dir_arg) == FAILURE) WRONG_PARAM_COUNT; - convert_to_string_ex(muscat_dir_arg); - muscat_dir = Z_STRVAL_PP(muscat_dir_arg); - muscat_dir_len = Z_STRLEN_PP(muscat_dir_arg); - default: - WRONG_PARAM_COUNT; - } - convert_to_long_ex(size_arg); - size = Z_LVAL_PP(size_arg); - - if (r=H_Setup_Muscat(&handle->handles.muscat_handle,size,muscat_dir,"",0)) { - handle->open=1; - _discard(handle); - ZEND_REGISTER_RESOURCE(return_value, handle, le_muscat); - } else { // destroy this failure! - efree(handle); - RETURN_FALSE; - } -} -/* }}} */ - -/* {{{ proto resource muscat_setup_net(string muscat_host, int port) - Creates a new muscat session and returns the handle. muscat_host is the hostname to connect to port is the port number to connect to - actually takes exactly the same args as fsockopen */ -PHP_FUNCTION(muscat_setup_net) -{ - zval **socket_arg; - _muscat_handle * handle; - void *what; - - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &socket_arg) == FAILURE){ - WRONG_PARAM_COUNT; - } - - if (Z_TYPE_PP(socket_arg)!=IS_RESOURCE) { - zend_error(E_ERROR,"First parameter must be a socket handle"); - RETURN_FALSE; - } - - // Must have been successful open - handle=emalloc(sizeof(_muscat_handle)); - memset(handle,0,sizeof(*handle)); - MAKE_STD_ZVAL(handle->handles.muscatnet_handle.socketr); - handle->net=1; - handle->open=1; - // now need to store this result to keep its reference counted - *(handle->handles.muscatnet_handle.socketr)=**socket_arg; - zval_copy_ctor(handle->handles.muscatnet_handle.socketr); - - // but for our convenience extract the FD - what=zend_fetch_resource(socket_arg TSRMLS_CC,-1,"Socket-Handle",NULL,1,php_file_le_socket()); - ZEND_VERIFY_RESOURCE(what); - handle->handles.muscatnet_handle.socketd=*(int*)what; - php_set_sock_blocking(handle->handles.muscatnet_handle.socketd,1); - _discard(handle); - ZEND_REGISTER_RESOURCE(return_value, handle, le_muscat); -} - -PHP_FUNCTION(muscat_setup_net_) -{ - _muscat_handle * handle; - void *what; - -// php_fsockopen(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); - if ((return_value)->type!=IS_RESOURCE) return; - - // Must have been successful open - handle=emalloc(sizeof(_muscat_handle)); - memset(handle,0,sizeof(*handle)); - handle->net=1; - handle->open=1; - // now need to store this result to keep its reference counted - *handle->handles.muscatnet_handle.socketr=*return_value; - zval_copy_ctor(handle->handles.muscatnet_handle.socketr); - // but for our convenience extract the FD - what=zend_fetch_resource(&return_value TSRMLS_CC,-1,"File-Handle",NULL,1,php_file_le_socket); - ZEND_VERIFY_RESOURCE(what); - handle->handles.muscatnet_handle.socketd=*(int*)what; - _discard(handle); - ZEND_REGISTER_RESOURCE(return_value, handle, le_muscat); -} -/* }}} */ - -/* {{{ proto int muscat_give(resource muscat_handle, string string) - Sends string to the core muscat api */ -PHP_FUNCTION(muscat_give) -{ - zval **Muscat_handle_arg, **string_arg; - int string_len; - char *string = NULL; - _muscat_handle *handle; - int r; - - if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &Muscat_handle_arg, &string_arg) == FAILURE){ - WRONG_PARAM_COUNT; - } - - ZEND_FETCH_RESOURCE(handle, _muscat_handle *, - Muscat_handle_arg, -1, MUSCAT_HANDLE_RESOURCE, le_muscat); - - convert_to_string_ex(string_arg); - string = Z_STRVAL_PP(string_arg); - string_len = Z_STRLEN_PP(string_arg); - _discard(handle); - if (handle->net) r=_net_muscat_give(&handle->handles.muscatnet_handle,string); - else r=H_Give_Muscat(&handle->handles.muscat_handle,string); -} -/* }}} */ - -/* {{{ proto string muscat_get(resource muscat_handle) - Gets a line back from the core muscat api. Returns a literal FALSE when there is no more to get (as opposed to ""). Use === FALSE or !== FALSE to check for this */ -PHP_FUNCTION(muscat_get) -{ - zval **Muscat_handle_arg; - _muscat_handle *handle; - int r; - - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &Muscat_handle_arg) == FAILURE){ - WRONG_PARAM_COUNT; - } - - ZEND_FETCH_RESOURCE(handle, _muscat_handle *, - Muscat_handle_arg, -1, MUSCAT_HANDLE_RESOURCE, le_muscat); - - if (handle->net) { // returns strings for US, no need to dup - if (! (r=_net_muscat_get(&handle->handles.muscatnet_handle))) { - RETURN_STRINGL(handle->handles.muscatnet_handle.muscat_response.p, - handle->handles.muscatnet_handle.muscat_response.length,0); - } else RETURN_FALSE; - } else { // must dup string - if (! (r=H_Getfrom_Muscat(&handle->handles.muscat_handle))) { - RETURN_STRINGL(handle->handles.muscat_handle.p, - handle->handles.muscat_handle.length,1); - } else RETURN_FALSE; - } -} -/* }}} */ - -/* {{{ proto int muscat_close(resource muscat_handle) - Shuts down the muscat session and releases any memory back to php. [Not back to the system, note!] */ -PHP_FUNCTION(muscat_close) -{ - zval **muscat_handle_arg; - _muscat_handle *handle; - - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &muscat_handle_arg) == FAILURE){ - WRONG_PARAM_COUNT; - } - if (Z_TYPE_PP(muscat_handle_arg)!=IS_RESOURCE) { - zend_error(E_ERROR,"First parameter must be a muscat handle"); - RETURN_FALSE; - } - - ZEND_FETCH_RESOURCE(handle, _muscat_handle *, - muscat_handle_arg, -1, MUSCAT_HANDLE_RESOURCE, le_muscat); - - _muscat_close(handle); - // Let destructor take care of efree! - zend_list_delete(Z_LVAL_PP(muscat_handle_arg)); -} -/* }}} */ - - -#endif /* HAVE_MUSCAT */ - - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ diff --git a/ext/muscat/muscat.php b/ext/muscat/muscat.php deleted file mode 100644 index 86c9db9d3d..0000000000 --- a/ext/muscat/muscat.php +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/ext/muscat/muscat_handles.h b/ext/muscat/muscat_handles.h deleted file mode 100644 index 47862d9a40..0000000000 --- a/ext/muscat/muscat_handles.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Muscat/Empower 1.5 Module for PHP version 4.0 | - +----------------------------------------------------------------------+ - | Copyright (c) 2000 Ananova Ltd | - | http://www.ananova.com | - | Ananova Ltd, PO Box 36, Leeds, LS11 5ZA, United Kingdom | - +----------------------------------------------------------------------+ - | This program is free software; you can redistribute it and/or | - | modify it under the terms of the GNU General Public License | - | as published by the Free Software Foundation; either version 2 | - | of the License, or (at your option) any later version. | - | | - | This program is distributed in the hope that it will be useful, | - | but WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | - | GNU General Public License for more details. | - | | - | You should have received a copy of the GNU General Public License | - | along with this program; if not, write to the Free Software | - | Foundation, Inc., 59 Temple Place - Suite 330, Boston, | - | MA 02111-1307, USA. | - | | - | A copy is availble at http://www.gnu.org/copyleft/gpl.txt | - +----------------------------------------------------------------------+ - | Author: Sam Liddicott | - +----------------------------------------------------------------------+ - */ - - -#ifndef PHP_MUSCAT_HANDLES_H -#define PHP_MUSCAT_HANDLES_H - -#if HAVE_MUSCAT -#include -#include - -typedef union _muscat_handles_union { - struct Muscat_handle muscat_handle; - struct MuscatNet_handle muscatnet_handle; - struct Muscat_response muscat_response; -} _muscat_handles; - -typedef struct _muscat_handle_struct { - int open; - int net; - _muscat_handles handles; -} _muscat_handle; - -#endif - -#endif /* PHP_MUSCAT_HANDLES_H */ - - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ diff --git a/ext/muscat/muscat_net.c b/ext/muscat/muscat_net.c deleted file mode 100644 index c053951ddc..0000000000 --- a/ext/muscat/muscat_net.c +++ /dev/null @@ -1,91 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Muscat/Empower 1.5 Module for PHP version 4.0 | - +----------------------------------------------------------------------+ - | Copyright (c) 2000 Ananova Ltd | - | http://www.ananova.com | - | Ananova Ltd, PO Box 36, Leeds, LS11 5ZA, United Kingdom | - +----------------------------------------------------------------------+ - | This program is free software; you can redistribute it and/or | - | modify it under the terms of the GNU General Public License | - | as published by the Free Software Foundation; either version 2 | - | of the License, or (at your option) any later version. | - | | - | This program is distributed in the hope that it will be useful, | - | but WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | - | GNU General Public License for more details. | - | | - | You should have received a copy of the GNU General Public License | - | along with this program; if not, write to the Free Software | - | Foundation, Inc., 59 Temple Place - Suite 330, Boston, | - | MA 02111-1307, USA. | - | | - | A copy is availble at http://www.gnu.org/copyleft/gpl.txt | - +----------------------------------------------------------------------+ - | Author: Sam Liddicott | - +----------------------------------------------------------------------+ - */ - - -#include "php.h" -#include "php_ini.h" -#include "php_muscat.h" - -#if HAVE_MUSCAT -#include "muscat_net.h" - -int _net_muscat_close(struct MuscatNet_handle *handle) { - -} - -int _net_muscat_give(struct MuscatNet_handle *handle, char* string) { - Z_TYPE(handle->muscat_response)=' '; - SOCK_WRITEL(string,strlen(string),handle->socketd); - SOCK_WRITEL("\n",1,handle->socketd); -} - -int _net_muscat_get(struct MuscatNet_handle * handle) { - char *buf; - char *end; - size_t ammount; - int clen; - int rlen; - - if (Z_TYPE(handle->muscat_response) == 'P') return GIVING; - - // we can use bcom ourselves!!! - // read in the 6 byte header... - if (end=php_sock_fgets((char *)&(handle->muscat_response.bcom), 6, handle->socketd)==NULL) { - ammount=(char *) end - (char *) (&(handle->muscat_response.bcom)) +1; - return 1; // NEED TO RAISE ERROR HERE - } - ammount=strlen((char *)&(handle->muscat_response.bcom)); - if (handle->muscat_response.bcom[5]!=' ') { - printf("%s 5 was not space but [%d]\n",&handle->muscat_response.bcom,handle->muscat_response.bcom[5]); - return 1; // NEED TO RAISE ERROR HERE - } - handle->muscat_response.bcom[5]=0; - Z_TYPE(handle->muscat_response)=handle->muscat_response.bcom[0]; - // now read bcom[1-4] and turn to an int - clen=atoi(&(handle->muscat_response.bcom[1]))+1; - - // now read length bytes in! - buf=emalloc(clen+1); - memset(buf,0,clen+1); - - if (end=php_sock_fgets(buf, clen, handle->socketd)==NULL) { - ammount=(char *) end - (char *) (&(handle->muscat_response.bcom)) +1; - } - handle->muscat_response.p=buf; - handle->muscat_response.length=strlen(buf); - return 0; -} - -void _net_discard(struct MuscatNet_handle * handle) { - while(Z_TYPE(handle->muscat_response)!='P') { - if (0!=_net_muscat_get(handle)) break; - } -} - -#endif /* HAVE_MUSCAT */ diff --git a/ext/muscat/muscat_net.h b/ext/muscat/muscat_net.h deleted file mode 100644 index 79be6039f3..0000000000 --- a/ext/muscat/muscat_net.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Muscat/Empower 1.5 Module for PHP version 4.0 | - +----------------------------------------------------------------------+ - | Copyright (c) 2000 Ananova Ltd | - | http://www.ananova.com | - | Ananova Ltd, PO Box 36, Leeds, LS11 5ZA, United Kingdom | - +----------------------------------------------------------------------+ - | This program is free software; you can redistribute it and/or | - | modify it under the terms of the GNU General Public License | - | as published by the Free Software Foundation; either version 2 | - | of the License, or (at your option) any later version. | - | | - | This program is distributed in the hope that it will be useful, | - | but WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | - | GNU General Public License for more details. | - | | - | You should have received a copy of the GNU General Public License | - | along with this program; if not, write to the Free Software | - | Foundation, Inc., 59 Temple Place - Suite 330, Boston, | - | MA 02111-1307, USA. | - | | - | A copy is availble at http://www.gnu.org/copyleft/gpl.txt | - +----------------------------------------------------------------------+ - | Author: Sam Liddicott | - +----------------------------------------------------------------------+ - */ - - -#ifndef PHP_MUSCAT_NET_H -#define PHP_MUSCAT_NET_H - -#if HAVE_MUSCAT - -#include "../standard/fsock.h" -struct MuscatNet_handle { - struct Muscat_response muscat_response; - zval *socketr; - int socketd; - char buffer[1024]; -}; - -int _net_muscat_close(struct MuscatNet_handle *handle); -int _net_muscat_give(struct MuscatNet_handle *handle, char* string); -int _net_muscat_get(struct MuscatNet_handle * handle); -void _net_discard(struct MuscatNet_handle * handle); - -#endif - -#endif /* PHP_MUSCAT_NET_H */ - - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ diff --git a/ext/muscat/php_muscat.h b/ext/muscat/php_muscat.h deleted file mode 100644 index 7981a6813c..0000000000 --- a/ext/muscat/php_muscat.h +++ /dev/null @@ -1,97 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Muscat/Empower 1.5 Module for PHP version 4.0 | - +----------------------------------------------------------------------+ - | Copyright (c) 2000 Ananova Ltd | - | http://www.ananova.com | - | Ananova Ltd, PO Box 36, Leeds, LS11 5ZA, United Kingdom | - +----------------------------------------------------------------------+ - | This program is free software; you can redistribute it and/or | - | modify it under the terms of the GNU General Public License | - | as published by the Free Software Foundation; either version 2 | - | of the License, or (at your option) any later version. | - | | - | This program is distributed in the hope that it will be useful, | - | but WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | - | GNU General Public License for more details. | - | | - | You should have received a copy of the GNU General Public License | - | along with this program; if not, write to the Free Software | - | Foundation, Inc., 59 Temple Place - Suite 330, Boston, | - | MA 02111-1307, USA. | - | | - | A copy is availble at http://www.gnu.org/copyleft/gpl.txt | - +----------------------------------------------------------------------+ - | Author: Sam Liddicott | - +----------------------------------------------------------------------+ - */ - - -#ifndef PHP_MUSCAT_H -#define PHP_MUSCAT_H - -/* You should tweak config.m4 so this symbol (or some else suitable) - gets defined. -*/ -#if HAVE_MUSCAT -#include - -#define MUSCAT_HANDLE_RESOURCE "muscat handle" - -extern zend_module_entry muscat_module_entry; -#define phpext_muscat_ptr &muscat_module_entry - -#ifdef PHP_WIN32 -#define PHP_MUSCAT_API __declspec(dllexport) -#else -#define PHP_MUSCAT_API -#endif - -PHP_MINIT_FUNCTION(muscat); -PHP_MSHUTDOWN_FUNCTION(muscat); -PHP_RINIT_FUNCTION(muscat); -PHP_RSHUTDOWN_FUNCTION(muscat); -PHP_MINFO_FUNCTION(muscat); - -PHP_FUNCTION(muscat_setup); -PHP_FUNCTION(muscat_setup_net); -PHP_FUNCTION(muscat_give); -PHP_FUNCTION(muscat_get); -PHP_FUNCTION(muscat_close); - -/* - Declare any global variables you may need between the BEGIN - and END macros here: -*/ -ZEND_BEGIN_MODULE_GLOBALS(muscat) -ZEND_END_MODULE_GLOBALS(muscat) - -/* In every function that needs to use variables in php_muscat_globals, - do call MUSCATLS_FETCH(); after declaring other variables used by - that function, and always refer to them as MUSCATG(variable). - You are encouraged to rename these macros something shorter, see - examples in any other php module directory. -*/ - -#ifdef ZTS -#define MUSCATG(v) TSRMG(muscat_globals_id, php_muscat_globals *, v) -#else -#define MUSCATG(v) (muscat_globals.v) -#endif - -#else - -#define phpext_muscat_ptr NULL - -#endif - -#endif /* PHP_MUSCAT_H */ - - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */