[PHP-CVS] cvs: functable /images flag_hk.gif
hholzgraWed Jan 17 13:11:02 2001 EDT Added files: /functable/images flag_hk.gif Log: added flag for hk translation -- 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-CVS] cvs: php4 /ext/gd gd.c
hholzgraThu Jan 25 12:52:53 2001 EDT
Modified files:
/php4/ext/gdgd.c
Log:
gd didn't work if no WBMP was available after rev 1.107 -> fixed
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.109 php4/ext/gd/gd.c:1.110
--- php4/ext/gd/gd.c:1.109 Thu Jan 25 06:35:36 2001
+++ php4/ext/gd/gd.cThu Jan 25 12:52:52 2001
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.109 2001/01/25 14:35:36 stas Exp $ */
+/* $Id: gd.c,v 1.110 2001/01/25 20:52:52 hholzgra Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -2664,7 +2664,12 @@
PHP_FUNCTION(jpeg2wbmp)
{
#ifdef HAVE_GD_JPG
+#ifdef HAVE_GD_WBMP
_php_image_convert (INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_JPG);
+#else /* HAVE_GD_WBMP */
+ php_error(E_WARNING, "jpeg2wbmp: No WBMP support in this PHP build");
+ RETURN_FALSE;
+#endif /* HAVE_GD_WBMP */
#else /* HAVE_GD_JPG */
php_error(E_WARNING, "jpeg2wbmp: No JPG support in this PHP build");
RETURN_FALSE;
@@ -2677,7 +2682,12 @@
PHP_FUNCTION(png2wbmp)
{
#ifdef HAVE_GD_PNG
+#ifdef HAVE_GD_WBMP
_php_image_convert (INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_PNG);
+#else /* HAVE_GD_WBMP */
+ php_error(E_WARNING, "png2wbmp: No WBMP support in this PHP build");
+ RETURN_FALSE;
+#endif /* HAVE_GD_WBMP */
#else /* HAVE_GD_PNG */
php_error(E_WARNING, "png2wbmp: No PNG support in this PHP build");
RETURN_FALSE;
@@ -2686,6 +2696,8 @@
/* }}} */
+
+#ifdef HAVE_GD_WBMP
/* It converts a gd Image to bw using a threshold value */
static void _php_image_bw_convert( gdImagePtr im_org, int threshold, FILE *out) {
gdImagePtr im_dest;
@@ -2907,6 +2919,8 @@
}
WRONG_PARAM_COUNT;
}
+#endif /* HAVE_GD_WBMP */
+
#endif /* HAVE_LIBGD */
--
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]
Re: [PHP-CVS] cvs: php4 /main main.c php_ini.c
Zeev Suraski wrote: > Wouldn't that happen even without the patch? I'd imagine the dynamic > extensions would be last on the list..? no, extensions found in php.ini were loaded and initialised immediately after ini parsing was done, before initialization of builtins and even before initialization of other things like fopen wrapper registration (in 4.0.4 exetensions were even loaded immediately within ini parsing) now the list of extensions to load is carried arround until all other initializations are done with they way i do it now is not very clever (to much copying of data) but at least should not qualify as dirty hack, and it makes it possible again to have dynamic extensions register fopen wrappers or info logos PS: there's another point i tried to address: module shutdown order right now module shutdown functions are called in the same order as initializers, this should be reversed IMHO ... -- Hartmut Holzgraefe [EMAIL PROTECTED] http://www.six.de +49-711-99091-77 Besuchen Sie uns auf der CeBIT 2001 - in Halle 6 Stand F62/4 -- 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-CVS] cvs: php4 /main php_ini.c php_ini.h
hholzgraWed Feb 21 03:16:16 2001 EDT
Modified files:
/php4/main php_ini.c php_ini.h
Log:
# make sebastian and compiler happy .)
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.50 php4/main/php_ini.c:1.51
--- php4/main/php_ini.c:1.50Tue Feb 20 17:43:15 2001
+++ php4/main/php_ini.c Wed Feb 21 03:16:15 2001
@@ -121,8 +121,9 @@
}
}
-static void php_config_ini_parser_cb(zval *arg1, zval *arg2, int callback_type,
php_extension_lists *extension_lists)
+static void php_config_ini_parser_cb(zval *arg1, zval *arg2, int callback_type, void
+*arg_list)
{
+ php_extension_lists *extension_lists =(php_extension_lists * )arg_list;
switch (callback_type) {
case ZEND_INI_PARSER_ENTRY: {
zval *entry;
@@ -163,6 +164,7 @@
int php_startup_loaded_extensions(void)
{
zend_llist_apply(php_load_extension_list, php_startup_loaded_extension_cb);
+ return SUCCESS;
}
static void php_load_function_extension_cb(void *arg)
@@ -171,7 +173,7 @@
if(! php_load_extension_list) {
php_load_extension_list=(zend_llist*)malloc(sizeof(zend_llist));
- zend_llist_init(php_load_extension_list, sizeof(char **),
free_estring, 1);
+ zend_llist_init(php_load_extension_list, sizeof(char **),
+(void(*)(void *))free_estring, 1);
}
zend_llist_add_element(php_load_extension_list, &extension);
@@ -207,8 +209,8 @@
be loaded in linked lists and process theese immediately
*after* we have finished setting up the ini mechanism
*/
- zend_llist_init(&extension_lists.engine , sizeof(char **), free_estring, 1);
- zend_llist_init(&extension_lists.functions, sizeof(char **), free_estring, 1);
+ zend_llist_init(&extension_lists.engine , sizeof(char **), (void(*)(void
+*))free_estring, 1);
+ zend_llist_init(&extension_lists.functions, sizeof(char **), (void(*)(void
+*))free_estring, 1);
safe_mode_state = PG(safe_mode);
open_basedir = PG(open_basedir);
Index: php4/main/php_ini.h
diff -u php4/main/php_ini.h:1.31 php4/main/php_ini.h:1.32
--- php4/main/php_ini.h:1.31Sun Jan 7 10:56:24 2001
+++ php4/main/php_ini.h Wed Feb 21 03:16:16 2001
@@ -23,6 +23,7 @@
int php_init_config(char *php_ini_path_override);
int php_shutdown_config(void);
+int php_startup_loaded_extensions(void);
zval *cfg_get_entry(char *name, uint name_length);
#define PHP_INI_USER ZEND_INI_USER
--
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-CVS] cvs: php4 /tests/strings 003.phpt
hholzgraThu Feb 22 10:35:23 2001 EDT
Modified files:
/php4/tests/strings 003.phpt
Log:
removed LC_* warnin
Index: php4/tests/strings/003.phpt
diff -u php4/tests/strings/003.phpt:1.1 php4/tests/strings/003.phpt:1.2
--- php4/tests/strings/003.phpt:1.1 Sun Aug 27 12:46:06 2000
+++ php4/tests/strings/003.phpt Thu Feb 22 10:35:22 2001
@@ -4,7 +4,7 @@
--GET--
--FILE--
\"&åÄ\n");
echo htmlentities ("<>\"&åÄ\n");
?>
--
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-CVS] cvs: functable / dslgen
hholzgraSun Mar 11 13:25:26 2001 EDT Modified files: /functable dslgen Log: added some linebreaks Index: functable/dslgen diff -u functable/dslgen:1.3 functable/dslgen:1.4 --- functable/dslgen:1.3Wed Feb 14 03:32:30 2001 +++ functable/dslgenSun Mar 11 13:25:25 2001 @@ -41,16 +41,16 @@ mysql_free_result($result); -echo ";; DO NOT EDIT THIS FILE !!!"; -echo ";; as it is auto-generated from the same database"; -echo ";; as the functiontable at "; -echo ";; http://www.zugeschaut-und-mitgebaut.de/php"; -echo ";; you can generate it yourself by unsing the code"; -echo ";; to be found under the functable repository in CVS"; -echo ";;"; -echo ";; if you think this is out of date :"; -echo ";; mailto:[EMAIL PROTECTED]"; -echo ";;"; +echo ";; DO NOT EDIT THIS FILE !!!\n"; +echo ";; as it is auto-generated from the same database\n"; +echo ";; as the functiontable at \n"; +echo ";; http://www.zugeschaut-und-mitgebaut.de/php\n"; +echo ";; you can generate it yourself by unsing the code\n"; +echo ";; to be found under the functable repository in CVS\n"; +echo ";;\n"; +echo ";; if you think this is out of date :\n"; +echo ";; mailto:[EMAIL PROTECTED]\n"; +echo ";;\n\n"; echo "(define (index-char-val ch) (case ch ((#\\A #\\a) 65) -- 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-CVS] cvs: functable / update.all xslgen
hholzgraSun Mar 11 13:26:47 2001 EDT Added files: /functable xslgen Modified files: /functable update.all Log: XSL version info for the phpdoc manual thanks to Jirka Kosek <[EMAIL PROTECTED]> Index: functable/update.all diff -u functable/update.all:1.3 functable/update.all:1.4 --- functable/update.all:1.3Thu Nov 23 04:53:03 2000 +++ functable/update.allSun Mar 11 13:26:46 2001 @@ -130,10 +130,11 @@ # version information for the manual -echo generate dsl +echo generate dsssl and xsl for manual # generate version info file ./dslgen > sources/phpdoc/version.dsl +./xslgen > sources/phpdoc/version.xsl # prepare distribution package -- 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-CVS] cvs: functable / update.all xslgen
hholzgraMon Mar 12 04:22:35 2001 EDT Modified files: /functable update.all xslgen Log: apply HTMLSpecialChars to generate valid XML for version info rename output file from .xsl to .xml Index: functable/update.all diff -u functable/update.all:1.4 functable/update.all:1.5 --- functable/update.all:1.4Sun Mar 11 13:26:46 2001 +++ functable/update.allMon Mar 12 04:22:33 2001 @@ -134,7 +134,7 @@ # generate version info file ./dslgen > sources/phpdoc/version.dsl -./xslgen > sources/phpdoc/version.xsl +./xslgen > sources/phpdoc/version.xml # prepare distribution package Index: functable/xslgen diff -u functable/xslgen:1.1 functable/xslgen:1.2 --- functable/xslgen:1.1Sun Mar 11 13:26:46 2001 +++ functable/xslgenMon Mar 12 04:22:33 2001 @@ -100,7 +100,7 @@ $ver34 = "$ver3, $ver4"; } -echo " \n"; +echo " \n"; } echo "\n"; ?> -- 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-CVS] cvs: php4 /ext/rtfm/tests 001.phpt
hholzgraWed Apr 25 14:01:49 2001 EDT Added files: /php4/ext/rtfm/tests001.phpt Log: guess what ... :) cvs: -- Index: php4/ext/rtfm/tests/001.phpt +++ php4/ext/rtfm/tests/001.phpt --TEST-- Check for rtfm presence --SKIPIF-- --POST-- --GET-- --FILE-- --EXPECT-- rtfm extension is available -- 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-CVS] cvs: php4 /ext/rtfm .cvsignore Makefile.in config.m4 php_rtfm.h rtfm.c
hholzgraWed Apr 25 14:02:46 2001 EDT
Added files:
/php4/ext/rtfm .cvsignore Makefile.in config.m4 php_rtfm.h rtfm.c
Log:
guess what ... :)
Index: php4/ext/rtfm/.cvsignore
+++ php4/ext/rtfm/.cvsignore
deps
Makefile
*.lo
*.la
libs
libs.mk
Index: php4/ext/rtfm/Makefile.in
+++ php4/ext/rtfm/Makefile.in
# $Id: Makefile.in,v 1.1 2001/04/25 21:02:46 hholzgra Exp $
LTLIBRARY_NAME= librtfm.la
LTLIBRARY_SOURCES = rtfm.c
LTLIBRARY_SHARED_NAME = rtfm.la
LTLIBRARY_SHARED_LIBADD = $(RTFM_SHARED_LIBADD)
include $(top_srcdir)/build/dynlib.mk
Index: php4/ext/rtfm/config.m4
+++ php4/ext/rtfm/config.m4
dnl $Id: config.m4,v 1.1 2001/04/25 21:02:46 hholzgra Exp $
PHP_ARG_ENABLE(rtfm, whether to enable rtfm support,
[ --disable-rtfm Enable rtfm support],yes)
if test "$PHP_RTFM" != "no"; then
PHP_EXTENSION(rtfm, $ext_shared)
fi
Index: php4/ext/rtfm/php_rtfm.h
+++ php4/ext/rtfm/php_rtfm.h
/*
+--+
| PHP version 4.0 |
+--+
| Copyright (c) 1997, 1998, 1999, 2000, 2001 The PHP Group |
+--+
| This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
| available at through the world-wide-web at |
| http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+--+
| Authors: Hartmut Holzgraefe <[EMAIL PROTECTED]> |
| Peter Petermann<[EMAIL PROTECTED]> |
+--+
*/
#ifndef PHP_RTFM_H
#define PHP_RTFM_H
extern zend_module_entry rtfm_module_entry;
#define phpext_rtfm_ptr &rtfm_module_entry
#ifdef PHP_WIN32
#define PHP_RTFM_API __declspec(dllexport)
#else
#define PHP_RTFM_API
#endif
PHP_MINIT_FUNCTION(rtfm);
PHP_MSHUTDOWN_FUNCTION(rtfm);
PHP_MINFO_FUNCTION(rtfm);
PHP_FUNCTION(rtfm);
ZEND_BEGIN_MODULE_GLOBALS(rtfm)
char *manual_url;
char *faq_url;
ZEND_END_MODULE_GLOBALS(rtfm)
#ifdef ZTS
#define RTFMG(v) (rtfm_globals->v)
#define RTFMLS_FETCH() zend_rtfm_globals *rtfm_globals = ts_resource(rtfm_globals_id)
#else
#define RTFMG(v) (rtfm_globals.v)
#define RTFMLS_FETCH()
#endif
#endif /* PHP_RTFM_H */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
*/
Index: php4/ext/rtfm/rtfm.c
+++ php4/ext/rtfm/rtfm.c
/*
+--+
| PHP version 4.0 |
+--+
| Copyright (c) 1997, 1998, 1999, 2000, 2001 The PHP Group |
+--+
| This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
| available at through the world-wide-web at |
| http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+----------+
| Authors: Hartmut Holzgraefe <[EMAIL PROTECTED]> |
| Peter Petermann<[EMAIL PROTECTED]> |
+--+
*/
#include "php.h"
#include "php_ini.h"
#include "php_rtfm.h"
ZEND_DECLARE_MODULE_GLOBALS(rtfm)
function_entry rtfm_functions[] = {
PHP_FE(rtfm,NULL)
{NULL, NULL, NULL} /* Must be the last line in rtfm_functions[] */
};
zend_module_entry rtfm_module_entry = {
"rtfm",
rtfm_functions,
PHP_MINIT(rtfm),
PHP_MSHUTDOWN(rtfm),
NULL,
NULL,
PHP_MINFO(rtfm),
STANDARD_MODULE_PROPERTIES
};
#ifdef COMPILE_DL_RTFM
ZEND_GET_MODULE(rtfm)
#endif
PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("rtfm.manual_url", "http://php.net/manual/";, PHP_INI_ALL,
OnUpdateString, manual_url, zend_rtfm_
[PHP-CVS] cvs: php4 /ext/rtfm CREDITS
hholzgraWed Apr 25 14:21:26 2001 EDT Added files: /php4/ext/rtfm CREDITS Log: initial checkin -- 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-CVS] cvs: php4 /ext/skeleton create_stubs
hholzgraWed Apr 25 14:26:05 2001 EDT Modified files: /php4/ext/skeleton create_stubs Log: a backslash was missing (+ whitespace) Index: php4/ext/skeleton/create_stubs diff -u php4/ext/skeleton/create_stubs:1.9 php4/ext/skeleton/create_stubs:1.10 --- php4/ext/skeleton/create_stubs:1.9 Tue Oct 31 03:30:11 2000 +++ php4/ext/skeleton/create_stubs Wed Apr 25 14:26:05 2001 @@ -86,10 +86,10 @@ xmlhead = " \n" \ " functions\n" \ " \n\n" \ - " \n" -" \n" \ -" \n\n"; + " \n" \ + " \n" \ + " \n\n"; xmlfoot = " \n\n" \ "
[PHP] Re: [PHP-DEV] what does is happening to the list
Eduardo Melo wrote: > What is happening to the list ... > > No body anwser ... > > I will be waiting for some contact. > we are finaly ignoring you as you are neither able to switch of HTML (as requested) as anybody else does nor understand the concept of which list is which (by crosposting to php-general *and* dev) -- Hartmut Holzgraefe [EMAIL PROTECTED] http://www.six.de/ +49-711-99091-77 -- PHP General Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP] Re: [PHP-DEV] SAP DB
alex black wrote: > hi all, > > One of the binarycloud developers just told me to have a look at the SAP OS > database, SAPDB. SAP DB is just another name for AdabasD from a programmers point of view- > I'm going to test it tomorrow to see if it actually does what it claims, but > this _looks_ like serious OS competition to Oracle, and if it is I would > very much like to use it for my next project. > > So, question: > > Has anyone used SAPDB with PHP? If so, experiences? And if not, are there > plans for drivers? I looked in the manual and I didn't see any mention of > SAPDB. http://www.php.net/manual/en/ref.odbc.php > Oh, and I just found a mention of PHP on the SAPDB site. Looks like the > connection is over ODBC, which I really _really_ dislike... are there plans > for anything native? like a sapdb_connect :)? from the link mentinoned above: " In addition to normal ODBC support, the Unified ODBC functions in PHP allow you to access several databases that have borrowed the semantics of the ODBC API to implement their own API. Instead of maintaining multiple database drivers that were all nearly identical, these drivers have been unified into a single set of ODBC functions." so the call interface to AdabasD/SapDB looks like ODBC, but you have direct access to the database using PHP, you don't have to deal with ODBC driver management and all the stuff if you don't want you > In any case I think this database has a _HUGE_ amount of potential and PHP > would benefit if access to SAPDB was possible. as said above: it is all there ... just the documentation could need a little update ... -- Hartmut Holzgraefe [EMAIL PROTECTED] http://www.six.de +49-711-99091-77 Wir stellen für Sie aus auf der CeBIT 2002 und freuen uns in Halle 6 auf Ihren Besuch am Stand H 18 -- PHP General Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: functable / update.all
hholzgraSun Apr 8 08:24:48 2001 EDT Modified files: /functable update.all Log: added creation of database dump file Index: functable/update.all diff -u functable/update.all:1.5 functable/update.all:1.6 --- functable/update.all:1.5Mon Mar 12 04:22:33 2001 +++ functable/update.allSun Apr 8 08:24:48 2001 @@ -136,6 +136,8 @@ ./dslgen > sources/phpdoc/version.dsl ./xslgen > sources/phpdoc/version.xml +mysqldump -u phpdoc -pphpdoc phpdoc > output/dbdump.sql + # prepare distribution package echo packing -- 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] Re: [PHP-DEV] Re: IMAP/POP3 Administration API?
Christopher Cheng wrote: > > Have looked through it already. > None of them allows me to add/delete users > then you might be looking for something like webmin (http://www.webmin.com/webmin/), as MTAs usually use the systems user database instead of making up their own ... -- Hartmut Holzgraefe [EMAIL PROTECTED] http://www.six.de +49-711-99091-77 -- PHP General 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-CVS] cvs: php4 /ext/gd gd.c
hholzgraFri Feb 9 13:04:46 2001 EDT
Modified files:
/php4/ext/gdgd.c
Log:
libjpeg-not-installed protection
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.112 php4/ext/gd/gd.c:1.113
--- php4/ext/gd/gd.c:1.112 Thu Feb 1 07:40:34 2001
+++ php4/ext/gd/gd.cFri Feb 9 13:04:45 2001
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.112 2001/02/01 15:40:34 stas Exp $ */
+/* $Id: gd.c,v 1.113 2001/02/09 21:04:45 hholzgra Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -2761,6 +2761,7 @@
}
+#ifdef HAVE_GD_JPG
/* _php_image_convert converts jpeg/png images to wbmp and resizes them as needed */
static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type ) {
zval **f_org, **f_dest, **height, **width, **threshold;
@@ -2938,6 +2939,8 @@
}
WRONG_PARAM_COUNT;
}
+#endif /* HAVE_GD_JPG */
+
#endif /* HAVE_GD_WBMP */
--
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-CVS] cvs: php4 /ext/gd gd.c
hholzgraFri Feb 9 13:14:30 2001 EDT
Modified files:
/php4/ext/gdgd.c
Log:
make _php_image_convert configuration-aware
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.113 php4/ext/gd/gd.c:1.114
--- php4/ext/gd/gd.c:1.113 Fri Feb 9 13:04:45 2001
+++ php4/ext/gd/gd.cFri Feb 9 13:14:30 2001
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.113 2001/02/09 21:04:45 hholzgra Exp $ */
+/* $Id: gd.c,v 1.114 2001/02/09 21:14:30 hholzgra Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -2761,7 +2761,6 @@
}
-#ifdef HAVE_GD_JPG
/* _php_image_convert converts jpeg/png images to wbmp and resizes them as needed */
static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type ) {
zval **f_org, **f_dest, **height, **width, **threshold;
@@ -2832,6 +2831,17 @@
}
switch (image_type) {
+#ifdef HAVE_GD_GIF
+ case PHP_GDIMG_TYPE_GIF:
+ im_org = gdImageCreateFromGif (org);
+ if (im_org == NULL) {
+ php_error (E_WARNING, "%s: unable to open '%s'
+Not a valid GIF file", get_active_function_name(), fn_dest);
+ RETURN_FALSE;
+ }
+ break;
+#endif /* HAVE_GD_GIF */
+
+#ifdef HAVE_GD_JPG
case PHP_GDIMG_TYPE_JPG:
im_org = gdImageCreateFromJpeg (org);
if (im_org == NULL) {
@@ -2839,6 +2849,10 @@
RETURN_FALSE;
}
break;
+#endif /* HAVE_GD_JPG */
+
+
+#ifdef HAVE_GD_PNG
case PHP_GDIMG_TYPE_PNG:
im_org = gdImageCreateFromPng(org);
if (im_org == NULL) {
@@ -2846,6 +2860,8 @@
RETURN_FALSE;
}
break;
+#endif /* HAVE_GD_PNG */
+
default:
php_error(E_WARNING, "%s: Format not supported",
get_active_function_name());
break;
@@ -2939,8 +2955,6 @@
}
WRONG_PARAM_COUNT;
}
-#endif /* HAVE_GD_JPG */
-
#endif /* HAVE_GD_WBMP */
--
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-CVS] cvs: functable / dslgen
hholzgraWed Feb 14 03:09:06 2001 EDT Modified files: /functable dslgen Log: add a hint about where version.dsl comes from Index: functable/dslgen diff -u functable/dslgen:1.1.1.1 functable/dslgen:1.2 --- functable/dslgen:1.1.1.1Tue Oct 10 10:34:32 2000 +++ functable/dslgenWed Feb 14 03:09:06 2001 @@ -41,9 +41,16 @@ mysql_free_result($result); -echo ";; DO NOT EDIT THIS FILE !!!\n"; -echo ";; as it is auto-generated from the same database\n"; -echo ";; as the functiontable at http://www.zend.com/phpfunc\n"; +echo ";; DO NOT EDIT THIS FILE !!!" +echo ";; as it is auto-generated from the same database" +echo ";; as the functiontable at " +echo ";; http://www.zugeschaut-und-mitgebaut.de/php" +echo ";; you can generate it yourself by unsing the code" +echo ";; to be found under the functable repository in CVS" +echo ";;" +echo ";; if you think this is out of date :" +echo ";; mailto:[EMAIL PROTECTED]" +echo ";;" echo "(define (index-char-val ch) (case ch ((#\\A #\\a) 65) -- 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-CVS] cvs: functable / dslgen
hholzgraWed Feb 14 03:32:30 2001 EDT Modified files: /functable dslgen Log: stupidity fix Index: functable/dslgen diff -u functable/dslgen:1.2 functable/dslgen:1.3 --- functable/dslgen:1.2Wed Feb 14 03:09:06 2001 +++ functable/dslgenWed Feb 14 03:32:30 2001 @@ -41,16 +41,16 @@ mysql_free_result($result); -echo ";; DO NOT EDIT THIS FILE !!!" -echo ";; as it is auto-generated from the same database" -echo ";; as the functiontable at " -echo ";; http://www.zugeschaut-und-mitgebaut.de/php" -echo ";; you can generate it yourself by unsing the code" -echo ";; to be found under the functable repository in CVS" -echo ";;" -echo ";; if you think this is out of date :" -echo ";; mailto:[EMAIL PROTECTED]" -echo ";;" +echo ";; DO NOT EDIT THIS FILE !!!"; +echo ";; as it is auto-generated from the same database"; +echo ";; as the functiontable at "; +echo ";; http://www.zugeschaut-und-mitgebaut.de/php"; +echo ";; you can generate it yourself by unsing the code"; +echo ";; to be found under the functable repository in CVS"; +echo ";;"; +echo ";; if you think this is out of date :"; +echo ";; mailto:[EMAIL PROTECTED]"; +echo ";;"; echo "(define (index-char-val ch) (case ch ((#\\A #\\a) 65) -- 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-CVS] cvs: php4 /ext/zziplib php_zziplib.h zziplib.c
hholzgraMon Feb 19 05:30:25 2001 EDT
Modified files:
/php4/ext/zziplib php_zziplib.h zziplib.c
Log:
# no dos line endings please
Index: php4/ext/zziplib/php_zziplib.h
diff -u php4/ext/zziplib/php_zziplib.h:1.2 php4/ext/zziplib/php_zziplib.h:1.3
--- php4/ext/zziplib/php_zziplib.h:1.2 Thu Jan 11 01:23:34 2001
+++ php4/ext/zziplib/php_zziplib.h Mon Feb 19 05:30:25 2001
@@ -19,8 +19,8 @@
#ifndef PHP_ZZIPLIB_H
#define PHP_ZZIPLIB_H
-#if HAVE_ZZIPLIB
-
+#if HAVE_ZZIPLIB
+
#include
extern zend_module_entry zziplib_module_entry;
@@ -33,23 +33,23 @@
#endif
PHP_MINIT_FUNCTION(zziplib);
-PHP_MINFO_FUNCTION(zziplib);
-
-PHP_FUNCTION(zzip_opendir);
-PHP_FUNCTION(zzip_readdir);
-PHP_FUNCTION(zzip_closedir);
-PHP_FUNCTION(zzip_entry_name);
-PHP_FUNCTION(zzip_entry_compressedsize);
-PHP_FUNCTION(zzip_entry_filesize);
-PHP_FUNCTION(zzip_entry_compressionmethod);
-PHP_FUNCTION(zzip_open);
-PHP_FUNCTION(zzip_read);
+PHP_MINFO_FUNCTION(zziplib);
+
+PHP_FUNCTION(zzip_opendir);
+PHP_FUNCTION(zzip_readdir);
+PHP_FUNCTION(zzip_closedir);
+PHP_FUNCTION(zzip_entry_name);
+PHP_FUNCTION(zzip_entry_compressedsize);
+PHP_FUNCTION(zzip_entry_filesize);
+PHP_FUNCTION(zzip_entry_compressionmethod);
+PHP_FUNCTION(zzip_open);
+PHP_FUNCTION(zzip_read);
PHP_FUNCTION(zzip_close);
-
-typedef struct {
- ZZIP_FILE *fp;
- ZZIP_DIRENT dirent;
-} php_zzip_dirent;
+
+typedef struct {
+ ZZIP_FILE *fp;
+ ZZIP_DIRENT dirent;
+} php_zzip_dirent;
#else
#define phpext_zziplib_ptr NULL
Index: php4/ext/zziplib/zziplib.c
diff -u php4/ext/zziplib/zziplib.c:1.2 php4/ext/zziplib/zziplib.c:1.3
--- php4/ext/zziplib/zziplib.c:1.2 Thu Jan 11 01:23:34 2001
+++ php4/ext/zziplib/zziplib.c Mon Feb 19 05:30:25 2001
@@ -21,26 +21,26 @@
#include "php_zziplib.h"
#if HAVE_ZZIPLIB
-
-#include
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-static int le_zzip_dir;
+#include
+
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
+static int le_zzip_dir;
static int le_zzip_entry;
-function_entry zziplib_functions[] = {
- PHP_FE(zzip_opendir, NULL)
- PHP_FE(zzip_readdir, NULL)
- PHP_FE(zzip_closedir,NULL)
- PHP_FE(zzip_entry_name, NULL)
- PHP_FE(zzip_entry_compressedsize,NULL)
- PHP_FE(zzip_entry_filesize, NULL)
- PHP_FE(zzip_entry_compressionmethod, NULL)
- PHP_FE(zzip_open,NULL)
- PHP_FE(zzip_read,NULL)
+function_entry zziplib_functions[] = {
+ PHP_FE(zzip_opendir, NULL)
+ PHP_FE(zzip_readdir, NULL)
+ PHP_FE(zzip_closedir,NULL)
+ PHP_FE(zzip_entry_name, NULL)
+ PHP_FE(zzip_entry_compressedsize,NULL)
+ PHP_FE(zzip_entry_filesize, NULL)
+ PHP_FE(zzip_entry_compressionmethod, NULL)
+ PHP_FE(zzip_open,NULL)
+ PHP_FE(zzip_read,NULL)
PHP_FE(zzip_close, NULL)
{NULL, NULL, NULL}
};
@@ -59,30 +59,30 @@
#ifdef COMPILE_DL_ZZIPLIB
ZEND_GET_MODULE(zziplib)
#endif
-
-static void php_zziplib_free_dir(zend_rsrc_list_entry *rsrc)
-{
- ZZIP_DIR *z_dir = (ZZIP_DIR *) rsrc->ptr;
- zzip_closedir(z_dir);
-}
-
-static void php_zziplib_free_entry(zend_rsrc_list_entry *rsrc)
-{
- php_zzip_dirent *entry = (php_zzip_dirent *) rsrc->ptr;
-
- if (entry->fp) {
- zzip_close(entry->fp);
- }
-
- efree(entry);
+
+static void php_zziplib_free_dir(zend_rsrc_list_entry *rsrc)
+{
+ ZZIP_DIR *z_dir = (ZZIP_DIR *) rsrc->ptr;
+ zzip_closedir(z_dir);
+}
+
+static void php_zziplib_free_entry(zend_rsrc_list_entry *rsrc)
+{
+ php_zzip_dirent *entry = (php_zzip_dirent *) rsrc->ptr;
+
+ if (entry->fp) {
+ zzip_close(entry->fp);
+ }
+
+ efree(entry);
}
PHP_MINIT_FUNCTION(zziplib)
-{
- le_zzip_dir = zend_register_list_destructors_ex(php_zziplib_free_dir, NULL,
"ZZIP Directory", module_number);
- le_zzip_entry = zend_register_list_destructors_ex(php_zziplib_free_entry,
NULL, "ZZIP Entry", module_number);
-
- return(SUCCESS);
+{
+ le_zzip_dir = zend_register_list_destructors_ex(php_zziplib_free_dir, NULL,
+"ZZIP Directory", module_number);
+ le_zzip_entry = zend_register_list_destructors_ex(php_zziplib_free_entry,
+NULL, "ZZIP Entry", module_number);
+
+ return(SUCCESS);
}
PHP_MINFO_FUNCTION(zziplib)
@@ -90,213 +90,213 @@
php_info_print_table_start();
php_info_print_table_header(2, "zziplib support", "enabled");
php_info_print_table_end();
+
+}
+
+/* {{{ proto resource zzip_opendir(string filename)
+ Open a new zzip archive for reading */
+PHP_FUNCTION(zzip_opendir)
+{
+ zval **filename;
+ ZZIP_DIR *archive_p = NULL;
+
+ if (ZEND_NUM_ARGS() != 1 ||
+
[PHP-CVS] cvs: php4 /main main.c php_ini.c
hholzgraTue Feb 20 17:43:15 2001 EDT
Modified files:
/php4/main main.c php_ini.c
Log:
will now initialize dynamic extensions *after* static ones
Index: php4/main/main.c
diff -u php4/main/main.c:1.349 php4/main/main.c:1.350
--- php4/main/main.c:1.349 Sat Jan 13 05:16:56 2001
+++ php4/main/main.cTue Feb 20 17:43:15 2001
@@ -19,7 +19,7 @@
*/
-/* $Id: main.c,v 1.349 2001/01/13 13:16:56 zeev Exp $ */
+/* $Id: main.c,v 1.350 2001/02/21 01:43:15 hholzgra Exp $ */
#include
@@ -818,17 +818,27 @@
le_index_ptr = zend_register_list_destructors_ex(NULL, NULL, "index pointer",
0);
+
+ /* this will read in php.ini, set up the configuration parameters,
+ load zend extensions and register php function extensions
+ to be loaded later */
if (php_init_config(sf->php_ini_path_override) == FAILURE) {
return FAILURE;
}
REGISTER_INI_ENTRIES();
+ /* initialize fopen wrappers registry
+ (this uses configuration parameters from php.ini)
+*/
if (php_init_fopen_wrappers() == FAILURE) {
php_printf("PHP: Unable to initialize fopen url wrappers.\n");
return FAILURE;
}
+ /* initialize registry for images to be used in phpinfo()
+ (this uses configuration parameters from php.ini)
+*/
if (php_init_info_logos() == FAILURE) {
php_printf("PHP: Unable to initialize info phpinfo logos.\n");
return FAILURE;
@@ -846,14 +856,34 @@
return FAILURE;
}
+ /* startup extensions staticly compiled in */
if (php_startup_internal_extensions() == FAILURE) {
php_printf("Unable to start builtin modules\n");
return FAILURE;
}
+
+ /* load and startup extensions compiled as shared objects (aka DLLs)
+ as requested by php.ini entries
+ theese are loaded after initialization of internal extensions
+ as extensions *might* rely on things from ext/standard
+ which is always an internal extension and to be initialized
+ ahead of all other internals
+*/
+ if (php_startup_loaded_extensions() == FAILURE) {
+ php_printf("Unable to start loaded modules\n");
+ return FAILURE;
+ }
+
+ /* disable certain functions as requested by php.ini */
php_disable_functions();
+
zend_startup_extensions();
+
+ /* */
module_initialized = 1;
sapi_deactivate(SLS_C);
+
+ /* we're done */
return SUCCESS;
}
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.49 php4/main/php_ini.c:1.50
--- php4/main/php_ini.c:1.49Mon Jan 15 02:52:02 2001
+++ php4/main/php_ini.c Tue Feb 20 17:43:15 2001
@@ -1,18 +1,18 @@
/*
+--+
- | PHP version 4.0
|
+ | PHP version 4.0 |
+--+
- | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group
|
+ | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group |
+--+
- | This source file is subject to version 2.02 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available at through the world-wide-web at
|
- | http://www.php.net/license/2_02.txt.
|
+ | This source file is subject to version 2.02 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is|
+ | available at through the world-wide-web at |
+ | http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | [EMAIL PROTECTED] so we can mail you a copy immediately. |
+ | obtain it through the world-wide-web, please send a note to |
+ | [EMAIL PROTECTED] so we can mail you a copy immediately. |
+--+
- | Author: Zeev Suraski <[EMAIL PROTECTED]>
|
+ | Author: Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
@@ -131,12 +131,8 @@
