[PHP] PHP Security Advisory: CGI vulnerability in PHP version 4.3.0
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 PHP Security Advisory: CGI vulnerability in PHP version 4.3.0 Issued on: February 17, 2003 Software: PHP/CGI version 4.3.0 Platforms: All The PHP Group has learned of a serious security vulnerability in the CGI SAPI of PHP version 4.3.0. Description PHP contains code for preventing direct access to the CGI binary with configure option "--enable-force-cgi-redirect" and php.ini option "cgi.force_redirect". In PHP 4.3.0 there is a bug which renders these options useless. NOTE: This bug does NOT affect any of the other SAPI modules. (such as the Apache or ISAPI modules, etc.) Impact Anyone with access to websites hosted on a web server which employs the CGI module may exploit this vulnerability to gain access to any file readable by the user under which the webserver runs. A remote attacker could also trick PHP into executing arbitrary PHP code if attacker is able to inject the code into files accessible by the CGI. This could be for example the web server access-logs. Solution The PHP Group has released a new PHP version, 4.3.1, which incorporates a fix for the vulnerability. All users of affected PHP versions are encouraged to upgrade to this latest version. The downloads web site at http://www.php.net/downloads.php has the new 4.3.1 source tarballs, Windows binaries and source patch from 4.3.0 available for download. You will only need to upgrade if you're using the CGI module of PHP 4.3.0. There are no other bugfixes contained in this release. Workaround None. Credits The PHP Group would like to thank Kosmas Skiadopoulos for discovering this vulnerability. Copyright (c) 2003 The PHP Group. -BEGIN PGP SIGNATURE- Version: GnuPG v1.0.6 (GNU/Linux) Comment: For info see http://www.gnupg.org iD8DBQE+USOr/HlsOzK2WlERAtLKAJ9GPbPt6Vg77zIcPTGKh78WofmmeACgneDV tUERfwp/RXtcH13vdv0CGGY= =rYm5 -END PGP SIGNATURE- -- PHP General Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP] PHP 4.3.2RC1 released.
This is the first release candidate of the upcoming maintenance release of PHP 4.3.2. Please download and test it as much as possible on real-life applications to uncover any remaining issues. Sources: http://www.php.net/~jani/RC/php-4.3.2RC1.tar.gz Windows binaries: http://www.php.net/~jani/RC/php-4.3.2RC1-Win32.zip List of additions/changes/fixes can be found here: http://cvs.php.net/diff.php/php4/NEWS?login=2&r1=1.1247.2.35.4.1&r2=1.1247.2.134&ty=h -- PHP General Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP] PHP 4.3.2 released
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 After a lengthy QA process, PHP 4.3.2 is finally out! This maintenance release solves a lot of bugs found in earlier PHP versions and is a *strongly* recommended upgrade for all PHP users. PHP 4.3.2 contains, among others, following important fixes, additions and improvements: * Fixes several potentially hazardous integer and buffer overflows. * Fixes for several 64-bit problems. * New Apache 2.0 SAPI module (sapi/apache2handler, enabled with --with-apxs2). * New session_regenerate_id() function. (Important feature against malicious session planting). * Improvements to dba extension. * Improvements to thttpd SAPI module. * Dropped support for GDLIB version 1.x.x (php_gd.dll) on Windows. * An unix man page for CLI version of PHP. * New "disable_classes" php.ini option to allow administrators to disable certain classes for security reasons. * ..and huge amount other bug fixes For a full list of changes in PHP 4.3.2, see the NEWS file. (http://www.php.net/ChangeLog-4.php). md5sums: 8aec1bb2dbcca1c92835c71e2e30d9c5 *php-4.3.2.tar.bz2 8433a1d0ce679780990d4813ae094590 *php-4.3.2.tar.gz e1afea6341d97e8160bd7d93712721ec *php-4.3.2-Win32.zip cb55d0d9df6a2bf4ba666c27886d12cb *php-4.3.2-installer.exe kippis, Jani Taskinen [EMAIL PROTECTED] -BEGIN PGP SIGNATURE- Version: GnuPG v1.0.6 (GNU/Linux) Comment: For info see http://www.gnupg.org iD8DBQE+1feO/HlsOzK2WlERAuExAKDYgdy/qCRur4YPdoPGrxfFqWxxmgCfdnal DtTNv9vmVAUDRh2LjM0lUH0= =GHti -END PGP SIGNATURE- -- PHP General Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP] PHP 4.3.3RC1 released.
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 This is the first release candidate of the upcoming maintenance release of PHP 4.3.3. Please download and test it as much as possible on real-life applications to uncover any remaining issues. Sources: http://downloads.php.net/jani/php-4.3.3RC1.tar.bz2 http://downloads.php.net/jani/php-4.3.3RC1.tar.gz Windows binaries: http://downloads.php.net/jani/php-4.3.3RC1-Win32.zip md5sums: 7ecf4532466f910234b635c7cdc50269 php-4.3.3RC1-Win32.zip 2b3b4866bedd073d505c554c551fef92 php-4.3.3RC1.tar.bz2 c4b3f7363bd4f73dd1193aa3c9c9c2d3 php-4.3.3RC1.tar.gz List of additions/changes/fixes can be found here: http://cvs.php.net/diff.php/php4/NEWS?r1=1.1247.2.215.2.1&r2=1.1247.2.261 - -- Did I help you? Wanna report bug but don't want it get bogused? Donate! :) https://www.paypal.com/xclick/[EMAIL PROTECTED]&no_note=1&tax=0¤cy_code=EUR -BEGIN PGP SIGNATURE- Version: GnuPG v1.0.6 (GNU/Linux) Comment: For info see http://www.gnupg.org iD8DBQE+8PI9/HlsOzK2WlERAooYAJ42HB8ZbbmDoB+tT45TP/cbCsl8xACeJezB o83ztHPQ0hMR/CT11fJhMD0= =HDZR -END PGP SIGNATURE- -- PHP General Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/wddx php_wddx.h
sniper Thu Jan 11 08:19:20 2001 EDT Modified files: /php4/ext/wddx php_wddx.h Log: If external expat is used, header file is expat.h Index: php4/ext/wddx/php_wddx.h diff -u php4/ext/wddx/php_wddx.h:1.5 php4/ext/wddx/php_wddx.h:1.6 --- php4/ext/wddx/php_wddx.h:1.5Wed Sep 13 13:58:19 2000 +++ php4/ext/wddx/php_wddx.hThu Jan 11 08:19:20 2001 @@ -27,14 +27,18 @@ +--+ */ -/* $Id: php_wddx.h,v 1.5 2000/09/13 20:58:19 andrei Exp $ */ +/* $Id: php_wddx.h,v 1.6 2001/01/11 16:19:20 sniper Exp $ */ #ifndef PHP_WDDX_H #define PHP_WDDX_H #if HAVE_WDDX +#ifdef HAVE_LIBEXPAT2 +#include +#else #include "xmlparse.h" +#endif extern zend_module_entry wddx_module_entry; #define wddx_module_ptr &wddx_module_entry -- 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/sablot config.m4
sniper Thu Jan 11 10:25:33 2001 EDT Modified files: /php4/ext/sablotconfig.m4 Log: Fix build. Index: php4/ext/sablot/config.m4 diff -u php4/ext/sablot/config.m4:1.11 php4/ext/sablot/config.m4:1.12 --- php4/ext/sablot/config.m4:1.11 Wed Jan 10 06:41:01 2001 +++ php4/ext/sablot/config.m4 Thu Jan 11 10:25:33 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.11 2001/01/10 14:41:01 hirokawa Exp $ +dnl $Id: config.m4,v 1.12 2001/01/11 18:25:33 sniper Exp $ dnl config.m4 for extension Sablot PHP_ARG_WITH(expat-dir, for Sablotron XSL support, @@ -39,6 +39,7 @@ if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.so; then AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) AC_ADD_LIBRARY_WITH_PATH(expat, $i/lib) + AC_ADD_INCLUDE($i/include) AC_CHECK_LIB(sablot, SablotSetEncoding, AC_DEFINE(HAVE_SABLOT_SET_ENCODING,1,[ ])) testval=yes fi -- 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] Compile Problem: Place for Help
On Wed, 10 Jan 2001, Mark Olbert wrote: >Can anyone recommend a place/forum for help in getting PHP to compile under >linux? > >I am running into a problem that I haven't gotten any feedback on from >php-dev, php-general or php-install. > >The specific problem is: > >/usr/bin/ld: .libs/libphp4.so: undefined versioned symbol name >__fp_query@@GLIBC_2.0 >/usr/bin/ld: failed to set dynamic section sizes: Bad value > >Looks like the linker can't find __fp_query(). Either your header files don't match the installed GLIBC version or libresolv.so.1 was compiled against a GLIBC version other than the installed one. --Jani -- 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/domxml php_domxml.c
sniper Fri Jan 12 08:49:07 2001 EDT Modified files: /php4/ext/domxmlphp_domxml.c Log: - Fixed a possible crash bug in xmltree(). # PR: #7052 Index: php4/ext/domxml/php_domxml.c diff -u php4/ext/domxml/php_domxml.c:1.24 php4/ext/domxml/php_domxml.c:1.25 --- php4/ext/domxml/php_domxml.c:1.24 Fri Jan 5 06:34:15 2001 +++ php4/ext/domxml/php_domxml.cFri Jan 12 08:49:06 2001 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_domxml.c,v 1.24 2001/01/05 14:34:15 andi Exp $ */ +/* $Id: php_domxml.c,v 1.25 2001/01/12 16:49:06 sniper Exp $ */ #include "php.h" @@ -1406,8 +1406,10 @@ zend_hash_next_index_insert((*children)->value.ht, &child, sizeof(zval *), NULL); /* Add name, content and type as properties */ - add_property_stringl(child, "name", (char *) last->name, strlen(last->name), 1); - add_property_long(child, "type", last->type); + if(last->name) + add_property_stringl(child, "name", (char *) last->name, +strlen(last->name), 1); + if(last->type) + add_property_long(child, "type", last->type); content = xmlNodeGetContent(last); if(content) add_property_stringl(child, "content", (char *) content, strlen(content), 1); -- 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] PDFLIB 3.0 PHP 4.04
On Mon, 15 Jan 2001, Cal Evans wrote: >But when I ./configure php, I use: > >./configure --with-pdflib=/usr/local/lib Leave the /lib part out..ie. use --with-pdflib=/usr/local instead. --Jani -- 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
sniper Tue Jan 16 14:34:19 2001 EDT
Modified files:
/php4/ext/gdgd.c
Log:
Fixed bug #8733
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.105 php4/ext/gd/gd.c:1.106
--- php4/ext/gd/gd.c:1.105 Wed Nov 29 07:25:42 2000
+++ php4/ext/gd/gd.cTue Jan 16 14:34:19 2001
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.105 2000/11/29 15:25:42 dbeu Exp $ */
+/* $Id: gd.c,v 1.106 2001/01/16 22:34:19 sniper Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -77,6 +77,7 @@
#endif
#ifndef USE_GD_IOCTX
+#define gdImageCreateFromGifCtx NULL
#define gdImageCreateFromJpegCtx NULL
#define gdImageCreateFromPngCtx NULL
#define gdImageCreateFromWBMPCtx NULL
@@ -700,7 +701,7 @@
PHP_FUNCTION(imagecreatefromgif)
{
#ifdef HAVE_GD_GIF
- _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF,
"GIF", gdImageCreateFromGif,NULL);
+ _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF,
+"GIF", gdImageCreateFromGif,gdImageCreateFromGifCtx);
#else /* HAVE_GD_GIF */
php_error(E_WARNING, "ImageCreateFromGif: No GIF support in this PHP build");
RETURN_FALSE;
--
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] effect of --enable-trans-sid
On Wed, 17 Jan 2001, Olivier Guieu wrote: >URLs are rewritten fine (they contain the PHPSESSID >value whenever necessary), however images are also >re-written!, i.e. get changed >to . >Could someone tell me whether this behaviour is >correct and if not, if it has been corrected in 4.0.4 Please check your php.ini (or php.ini-dist from the package) for this directive (this is from latest CVS's php.ini-dist): url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" With this directive you can control which tags get rewritten. This directive was added in PHP 4.0.4, so yes, this has been fixed. :) --Jani -- 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/sablot sablot.c
sniper Wed Jan 17 03:43:18 2001 EDT
Modified files:
/php4/ext/sablotsablot.c
Log:
Make sablot compile again. Typo?
Index: php4/ext/sablot/sablot.c
diff -u php4/ext/sablot/sablot.c:1.29 php4/ext/sablot/sablot.c:1.30
--- php4/ext/sablot/sablot.c:1.29 Tue Jan 16 04:02:47 2001
+++ php4/ext/sablot/sablot.cWed Jan 17 03:43:17 2001
@@ -886,7 +886,7 @@
SABLOTLS_FETCH();
if (argc < 2 || argc > 3 ||
- zend_get_parameters_ex(argc, &xh, &scheme, &base,) == FAILURE) {
+ zend_get_parameters_ex(argc, &xh, &scheme, &base) == FAILURE) {
WRONG_PARAM_COUNT;
}
--
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] Re: Problems compiling LDAP into php 4.0.2
On Wed, 17 Jan 2001 [EMAIL PROTECTED] wrote: > I switched from Netscape to Openldap and it now compiles fine. >Unfortunately Apache bombs when I try to start it with the following error: > >Syntax error on line 237 of /usr/local/apache/conf/httpd.conf: >Cannot load /usr/local/apache/libexec/libphp4.so into server: >/usr/local/apache/libexec/libphp4.so: undefined symbol: ldap_value_free You're probably using some 2.x.x version of OpenLDAP? You should then upgrade PHP to 4.0.4pl1. And then the Netscape LDAP SDK should work ok too. --Jani -- 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]
Re: [PHP] Strange pdf function error?
On Wed, 17 Jan 2001, Leonard T. Harris wrote: >I get this error: > > >Fatal error: Internal pdflib error: Wrong order of function calls >(PDF_open_mem) in /home/httpd/html/test/test.pdftest2.php on line >5 There was a bug in PDFLIB 3.03. You can find the patch for this from http://www.pdflib.com/ --Jani -- 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/sablot config.m4
sniper Thu Jan 18 07:09:35 2001 EDT Modified files: /php4/ext/sablotconfig.m4 Log: Fixed a typo. Index: php4/ext/sablot/config.m4 diff -u php4/ext/sablot/config.m4:1.12 php4/ext/sablot/config.m4:1.13 --- php4/ext/sablot/config.m4:1.12 Thu Jan 11 10:25:33 2001 +++ php4/ext/sablot/config.m4 Thu Jan 18 07:09:35 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.12 2001/01/11 18:25:33 sniper Exp $ +dnl $Id: config.m4,v 1.13 2001/01/18 15:09:35 sniper Exp $ dnl config.m4 for extension Sablot PHP_ARG_WITH(expat-dir, for Sablotron XSL support, @@ -45,7 +45,7 @@ fi done - if test "$testval" == "no"; then + if test "$testval" = "no"; then AC_ADD_LIBRARY(xmlparse) AC_ADD_LIBRARY(xmltok) fi -- 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/sablot php_sablot.h sablot.c
sniper Fri Jan 19 03:44:12 2001 EDT
Modified files:
/php4/ext/sablotphp_sablot.h sablot.c
Log:
@- Added xslt_set_scheme_handler() function ([EMAIL PROTECTED])
Index: php4/ext/sablot/php_sablot.h
diff -u php4/ext/sablot/php_sablot.h:1.12 php4/ext/sablot/php_sablot.h:1.13
--- php4/ext/sablot/php_sablot.h:1.12 Tue Jan 16 04:02:47 2001
+++ php4/ext/sablot/php_sablot.hFri Jan 19 03:44:12 2001
@@ -52,6 +52,7 @@
PHP_FUNCTION(xslt_create);
PHP_FUNCTION(xslt_run);
PHP_FUNCTION(xslt_set_sax_handler);
+PHP_FUNCTION(xslt_set_scheme_handler);
PHP_FUNCTION(xslt_set_error_handler);
#ifdef HAVE_SABLOT_SET_ENCODING
PHP_FUNCTION(xslt_set_encoding);
@@ -97,6 +98,9 @@
zval *charactersHandler;
zval *endDocHandler;
+/* Scheme Handling */
+ zval *getAllHandler;
+
/* Sablotron Related */
SablotHandle p;
Index: php4/ext/sablot/sablot.c
diff -u php4/ext/sablot/sablot.c:1.31 php4/ext/sablot/sablot.c:1.32
--- php4/ext/sablot/sablot.c:1.31 Wed Jan 17 06:14:22 2001
+++ php4/ext/sablot/sablot.cFri Jan 19 03:44:12 2001
@@ -54,6 +54,14 @@
static MH_ERROR _php_sablot_error(void *, SablotHandle, MH_ERROR, MH_LEVEL, char **);
static void _php_sablot_standard_error(php_sablot_error *, php_sablot_error, int,
int);
+/* Scheme Handling Functions */
+static int _php_sablot_sh_getAll(void *userData, SablotHandle p, const char *scheme,
+const char *rest, char **buffer, int *byteCount);
+static int _php_sablot_sh_freeMemory(void *userData, SablotHandle p, char *buffer);
+static int _php_sablot_sh_open(void *userData, SablotHandle p, const char *scheme,
+const char *rest, int *handle);
+static int _php_sablot_sh_get(void *userData, SablotHandle p, int handle, char
+*buffer, int *byteCount);
+static int _php_sablot_sh_put(void *userData, SablotHandle p, int handle, const char
+*buffer, int *byteCount);
+static int _php_sablot_sh_close(void *userData, SablotHandle p, int handle);
+
/* PHP Utility Functions */
static void _php_sablot_ht_char(HashTable *, char **);
static zval *_php_sablot_string_zval(const char *);
@@ -137,6 +145,19 @@
_php_sablot_error
};
+/**
+ * Scheme Handler structure for use when Sablotron
+ * call rhe document Xpath function.
+ */
+static SchemeHandler sh = {
+ _php_sablot_sh_getAll,
+ _php_sablot_sh_freeMemory,
+ _php_sablot_sh_open,
+ _php_sablot_sh_get,
+ _php_sablot_sh_put,
+ _php_sablot_sh_close
+};
+
#ifdef ZTS
int sablot_globals_id;
#else
@@ -158,6 +179,7 @@
PHP_FE(xslt_openlog, NULL)
PHP_FE(xslt_closelog, NULL)
PHP_FE(xslt_set_sax_handler, NULL)
+PHP_FE(xslt_set_scheme_handler, NULL)
PHP_FE(xslt_set_error_handler,NULL)
PHP_FE(xslt_set_base, NULL)
#ifdef HAVE_SABLOT_SET_ENCODING
@@ -571,6 +593,13 @@
RETURN_FALSE;
}
+ ret = SablotRegHandler(handle->p, HLR_SCHEME, (void *)&sh, (void *)handle);
+
+ if (ret) {
+ SABLOTG(last_errno) = ret;
+ RETURN_FALSE;
+ }
+
ZEND_REGISTER_RESOURCE(return_value, handle, le_sablot);
handle->index = Z_LVAL_P(return_value);
}
@@ -804,6 +833,11 @@
zend_get_parameters_ex(2, &xh, &handlers) == FAILURE) {
WRONG_PARAM_COUNT;
}
+
+if ((*handlers)->type != IS_ARRAY) {
+ php_error(E_ERROR, "The second parameter must be an array");
+ }
+
ZEND_FETCH_RESOURCE(handle, php_sablot *, xh, -1, "PHP-Sablotron Handle",
le_sablot);
handlers_list = HASH_OF(*handlers);
@@ -848,6 +882,54 @@
/* }}} */
+/* {{{ proto void xslt_set_scheme_handler(resource xh, array handlers)
+ Set SAX Handlers on the resource handle given by xh. */
+PHP_FUNCTION(xslt_set_scheme_handler)
+{
+zval **xh,
+ **handlers,
+ **indiv_handlers;
+php_sablot *handle;
+HashTable *handlers_list;
+char *string_key = NULL;
+ulong num_key;
+SABLOTLS_FETCH();
+
+if (ZEND_NUM_ARGS() != 2 ||
+zend_get_parameters_ex(2, &xh, &handlers) == FAILURE) {
+WRONG_PARAM_COUNT;
+}
+
+if ((*handlers)->type != IS_ARRAY) {
+ php_error(E_ERROR, "The second parameter must be an array");
+ }
+
+ZEND_FETCH_RESOURCE(handle, php_sablot *, xh, -1, "PHP-Sablotron Handle",
+le_sablot);
+
+handlers_list = HASH_OF(*handlers);
+
+for (zend_hash_internal_pointer_reset(handlers_list);
+ zend_hash_get_current_data(handlers_list, (void **)&indiv_handlers) ==
+SUCCESS;
+ zend_hash_move_forward(handlers_list)) {
+
+SEPARATE_ZVAL(indiv_handlers);
+
+if (zend_hash_get_current_key(handlers_list, &string_key, &num_key, 0) ==
+HASH_KEY_IS_LONG) {
+php_error(E_WARNING, "The Keys of the first dimension of your array must
+be strings");
+RETURN_FALSE;
+}
+
+if (!strcasecmp("getall", string_key)) {
+
[PHP-CVS] cvs: php4 / EXTENSIONS /ext/bz2 EXPERIMENTAL /ext/crack CREDITS EXPERIMENTAL /ext/domxml EXPERIMENTAL /ext/dotnet EXPERIMENTAL /ext/ingres_ii EXPERIMENTAL /ext/openssl EXPERIMENTAL /ext/qtdom EXPERIMENTAL /ext/sablot EXPERIMENTAL /ext/satellite EXPERIMENTAL /ext/sockets EXPERIMENTAL /ext/vpopmail EXPERIMENTAL
sniper Fri Jan 19 05:43:35 2001 EDT Added files: /php4/ext/bz2 EXPERIMENTAL /php4/ext/crack EXPERIMENTAL CREDITS /php4/ext/domxmlEXPERIMENTAL /php4/ext/dotnetEXPERIMENTAL /php4/ext/ingres_ii EXPERIMENTAL /php4/ext/openssl EXPERIMENTAL /php4/ext/qtdom EXPERIMENTAL /php4/ext/sablotEXPERIMENTAL /php4/ext/satellite EXPERIMENTAL /php4/ext/sockets EXPERIMENTAL /php4/ext/vpopmail EXPERIMENTAL Modified files: /php4 EXTENSIONS Log: Added some missing EXPERIMENTAL files plus some missing extensions into EXTENSIONS file. Index: php4/EXTENSIONS diff -u php4/EXTENSIONS:1.13 php4/EXTENSIONS:1.14 --- php4/EXTENSIONS:1.13Thu Jan 11 01:35:14 2001 +++ php4/EXTENSIONS Fri Jan 19 05:43:24 2001 @@ -175,6 +175,7 @@ PRIMARY MAINTAINER: Sterling Hughes <[EMAIL PROTECTED]> MAINTENANCE: Maintained STATUS: Experimental +SINCE: 4.0.3 --- EXTENSION: calendar MAINTENANCE: Unknown @@ -189,7 +190,12 @@ MAINTENANCE: Maintained STATUS: Working --- -EXTENSION: CURL +EXTENSION: crack +MAINTENANCE: Unknown +STATUS: Experimental +SINCE: 4.0.5 +--- +EXTENSION: curl PRIMARY MAINTAINER: Sterling Hughes <[EMAIL PROTECTED]> MAINTENANCE: Maintained STATUS: Working @@ -233,6 +239,11 @@ MAINTENANCE: Unknown STATUS: Working --- +EXTENSION: gmp +MAINTENANCE: Unknown +STATUS: Unknown +SINCE: 4.0.4 +--- EXTENSION: icap MAINTENANCE: Unknown STATUS: Obsolete @@ -271,6 +282,7 @@ PRIMARY MAINTAINER: Stig Venaas <[EMAIL PROTECTED]> MAINTENANCE: Maintained STATUS: Experimental +SINCE: 4.0.4 --- EXTENSION: pcre PRIMARY MAINTAINER: Andrei Zmievski <[EMAIL PROTECTED]> @@ -293,12 +305,23 @@ MAINTENANCE: Maintained STATUS: Working --- +EXTENSION: printer +MAINTENANCE: Unknown +STATUS: Experimental +SINCE: 4.0.4 +COMMENT: Only for Win32 +--- EXTENSION: pspell PRIMARY MAINTAINER: Vlad Krupin <[EMAIL PROTECTED]> MAINTENANCE: Unknown STATUS: Unknown SINCE: 4.0.2 --- +EXTENSION: qtdom +MAINTENANCE: Unknown +STATUS: Experimental +SINCE: 4.0.4 +--- EXTENSION: readline MAINTENANCE: Unknown STATUS: Unknown @@ -308,6 +331,12 @@ MAINTENANCE: Maintained STATUS: Working --- +EXTENSION: sablot +PRIMARY MAINTAINER: Sterling Hughes <[EMAIL PROTECTED]> +MAINTENANCE: Maintained +STATUS: Experimental +SINCE: 4.0.3 +--- EXTENSION: satellite PRIMARY MAINTAINER: David Eriksson <[EMAIL PROTECTED]> MAINTENANCE: Odd Fixes @@ -319,6 +348,12 @@ MAINTENANCE: Maintained STATUS: Working --- +EXTENSION: shmop +PRIMARY MAINTAINER: Unknown +MAINTENANCE: Unknown +STATUS: Experimental +SINCE: 4.0.3 +--- EXTENSION: snmp PRIMARY MAINTAINER: Rasmus Lerdorf <[EMAIL PROTECTED]> MAINTENANCE: Odd Fixes @@ -333,7 +368,8 @@ EXTENSION: swf PRIMARY MAINTAINER: Sterling Hughes <[EMAIL PROTECTED]> MAINTENANCE: Maintained -STATUS: Unix (won't change) +STATUS: Unknown +COMMENT: Only for Unix (won't change) --- EXTENSION: sysvsem MAINTENANCE: Unknown @@ -343,6 +379,11 @@ MAINTENANCE: Unknown STATUS: Working --
Re: [PHP-CVS] cvs: php4 / EXTENSIONS
On Fri, 19 Jan 2001, Sam Liddicott wrote: > --- >+EXTENSION: muscat >+PRIMARY MAINTAINER: Sam Liddicott <[EMAIL PROTECTED]> >+MAINTENANCE: Maintained >+STATUS: Working >+SINCE: 4.0.5 >+COMMENT: Not tested against windows, only core API completed, rest under >development >+--- As this is quite new extension, shouldn't it be Experimental? --Jani -- 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/standard image.c
sniper Fri Jan 19 08:52:41 2001 EDT
Modified files:
/php4/ext/standard image.c
Log:
@- Added URL support for getimagesize() function (Jani)
# tested with all imagetypes. Also the iptc works.
Index: php4/ext/standard/image.c
diff -u php4/ext/standard/image.c:1.24 php4/ext/standard/image.c:1.25
--- php4/ext/standard/image.c:1.24 Fri Aug 11 16:24:54 2000
+++ php4/ext/standard/image.c Fri Jan 19 08:52:40 2001
@@ -15,7 +15,7 @@
| Authors: Rasmus Lerdorf |
+--+
*/
-/* $Id: image.c,v 1.24 2000/08/11 23:24:54 derick Exp $ */
+/* $Id: image.c,v 1.25 2001/01/19 16:52:40 sniper Exp $ */
/*
* Based on Daniel Schmitt's imageinfo.c which carried the following
* Copyright notice.
@@ -42,22 +42,18 @@
#include
#endif
#include "fopen-wrappers.h"
+#include "ext/standard/fsock.h"
#if HAVE_UNISTD_H
#include
#endif
#include "php_image.h"
/* file type markers */
-const char php_sig_gif[3] =
-{'G', 'I', 'F'};
-const char php_sig_jpg[3] =
-{(char) 0xff, (char) 0xd8, (char) 0xff};
-const char php_sig_png[8] =
-{(char) 0x89, (char) 0x50, (char) 0x4e,
- (char) 0x47, (char) 0x0d, (char) 0x0a,
- (char) 0x1a, (char) 0x0a};
-const char php_sig_swf[3] =
-{'F', 'W', 'S'};
+const char php_sig_gif[3] = {'G', 'I', 'F'};
+const char php_sig_swf[3] = {'F', 'W', 'S'};
+const char php_sig_jpg[3] = {(char) 0xff, (char) 0xd8, (char) 0xff};
+const char php_sig_png[8] = {(char) 0x89, (char) 0x50, (char) 0x4e, (char) 0x47,
+(char) 0x0d, (char) 0x0a,
+(char) 0x1a, (char) 0x0a};
/* return info as a struct, to make expansion easier */
@@ -69,31 +65,26 @@
};
/* routine to handle GIF files. If only everything were that easy... ;} */
-static struct gfxinfo *php_handle_gif (FILE *fp)
+static struct gfxinfo *php_handle_gif (int socketd, FILE *fp, int issock)
{
struct gfxinfo *result = NULL;
unsigned char a[2];
+ char temp[3];
result = (struct gfxinfo *) ecalloc(1,sizeof(struct gfxinfo));
- fseek(fp, 6L, SEEK_SET);
- fread(a,sizeof(a),1,fp);
- result->width = (unsigned short)a[0] | (((unsigned short)a[1])<<8);
- fread(a,sizeof(a),1,fp);
- result->height = (unsigned short)a[0] | (((unsigned short)a[1])<<8);
- return result;
-}
-static unsigned long php_read4(FILE *fp)
-{
- unsigned char a[ 4 ];
+ FP_FREAD(temp, 3, socketd, fp, issock); /* fseek(fp, 6L, SEEK_SET); */
- /* just return 0 if we hit the end-of-file */
- if (fread(a,sizeof(a),1,fp) != 1) return 0;
+ FP_FREAD(a, sizeof(a), socketd, fp, issock); /* fread(a,sizeof(a),1,fp); */
+ result->width = (unsigned short)a[0] | (((unsigned short)a[1])<<8);
- return (((unsigned long) a[ 0 ]) << 24) + (((unsigned long) a[ 1 ]) << 16) +
(((unsigned long) a[ 2 ]) << 8) + ((unsigned long) a[ 3 ]);
+ FP_FREAD(a, sizeof(a), socketd, fp, issock); /* fread(a,sizeof(a),1,fp); */
+ result->height = (unsigned short)a[0] | (((unsigned short)a[1])<<8);
+ return result;
}
+/* routines to handle SWF files. */
static unsigned long int php_swf_get_bits (unsigned char* buffer, unsigned int pos,
unsigned int count)
{
unsigned int loop;
@@ -107,15 +98,17 @@
return result;
}
-static struct gfxinfo *php_handle_swf (FILE* fp)
+static struct gfxinfo *php_handle_swf (int socketd, FILE *fp, int issock)
{
struct gfxinfo *result = NULL;
long bits;
unsigned char a[32];
-
+ char temp[5];
+
result = (struct gfxinfo *) ecalloc (1, sizeof (struct gfxinfo));
- fseek(fp, 8, SEEK_SET);
- fread(a,sizeof(a),1,fp);
+ FP_FREAD(temp, 5, socketd, fp, issock); /* fseek(fp, 8L, SEEK_SET); */
+
+ FP_FREAD(a, sizeof(a), socketd, fp, issock); /* fread(a,sizeof(a),1,fp); */
bits = php_swf_get_bits (a, 0, 5);
result->width = (php_swf_get_bits (a, 5 + bits, bits) -
php_swf_get_bits (a, 5, bits)) / 20;
@@ -124,17 +117,27 @@
return result;
}
-/* routine to handle PNG files. - even easier */
-static struct gfxinfo *php_handle_png(FILE *fp)
+/* routine to handle PNG files */
+static struct gfxinfo *php_handle_png (int socketd, FILE *fp, int issock)
{
struct gfxinfo *result = NULL;
unsigned long in_width, in_height;
+ char temp[8];
+ unsigned char a[8];
result = (struct gfxinfo *) ecalloc(1,sizeof(struct gfxinfo));
- fseek(fp, 16L, SEEK_SET);
- in_width = php_read4(fp);
- in_height = php_read4(fp);
- result->width = (unsigned int) in_width;
+
+ FP_FREAD(temp, sizeof(temp), socketd, fp, issock); /* fseek(fp, 16L,
+SEEK_SET); */
+
+ if((FP_FREAD(a, sizeof(a), socketd, fp, issock)) <= 0) {
+ in_width = 0;
+ in_height = 0;
+
[PHP-CVS] cvs: php4 /ext/bz2 config.m4
sniper Fri Jan 19 21:09:01 2001 EDT Modified files: /php4/ext/bz2 config.m4 Log: Check that libbz2.(a|so) is >= 0.95 (has BZ2_bzerror) Index: php4/ext/bz2/config.m4 diff -u php4/ext/bz2/config.m4:1.1 php4/ext/bz2/config.m4:1.2 --- php4/ext/bz2/config.m4:1.1 Wed Oct 18 11:32:21 2000 +++ php4/ext/bz2/config.m4 Fri Jan 19 21:09:01 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 2000/10/18 18:32:21 sterling Exp $ +dnl $Id: config.m4,v 1.2 2001/01/20 05:09:01 sniper Exp $ dnl config.m4 for extension BZip2 PHP_ARG_WITH(bz2, for BZip2 support, @@ -26,6 +26,7 @@ PHP_SUBST(BZ2_SHARED_LIBADD) AC_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/lib, BZ2_SHARED_LIBADD) + AC_CHECK_LIB(bz2, BZ2_bzerror, [AC_MSG_RESULT(yes)],[AC_MSG_ERROR(bz2 module +requires libbz2 >= 1.0.0)],) AC_DEFINE(HAVE_BZ2,1,[ ]) -- 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/bz2 config.m4
sniper Sat Jan 20 20:00:32 2001 EDT Modified files: /php4/ext/bz2 config.m4 Log: Remove double 'yes' output. Index: php4/ext/bz2/config.m4 diff -u php4/ext/bz2/config.m4:1.2 php4/ext/bz2/config.m4:1.3 --- php4/ext/bz2/config.m4:1.2 Fri Jan 19 21:09:01 2001 +++ php4/ext/bz2/config.m4 Sat Jan 20 20:00:32 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 2001/01/20 05:09:01 sniper Exp $ +dnl $Id: config.m4,v 1.3 2001/01/21 04:00:32 sniper Exp $ dnl config.m4 for extension BZip2 PHP_ARG_WITH(bz2, for BZip2 support, @@ -26,9 +26,7 @@ PHP_SUBST(BZ2_SHARED_LIBADD) AC_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/lib, BZ2_SHARED_LIBADD) - AC_CHECK_LIB(bz2, BZ2_bzerror, [AC_MSG_RESULT(yes)],[AC_MSG_ERROR(bz2 module requires libbz2 >= 1.0.0)],) - - AC_DEFINE(HAVE_BZ2,1,[ ]) + AC_CHECK_LIB(bz2, BZ2_bzerror, [AC_DEFINE(HAVE_BZ2,1,[ ])], [AC_MSG_ERROR(bz2 +module requires libbz2 >= 1.0.0)],) PHP_EXTENSION(bz2, $ext_shared) fi -- 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] php.ini
On Wed, 24 Jan 2001, Rasmus Resen Amossen wrote: >Everybody talks about this nice configuration file, but where is it?! >I have compiled php4 with apache, but even a »find . -name "php.ini« >gives anything. >Do I really need to recompile php to change its configuration? No. Please read the INSTALL file. --Jani -- 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/standard html.c
sniper Thu Mar 1 16:15:49 2001 EDT
Modified files:
/php4/ext/standard html.c
Log:
ws fix
Index: php4/ext/standard/html.c
diff -u php4/ext/standard/html.c:1.23 php4/ext/standard/html.c:1.24
--- php4/ext/standard/html.c:1.23 Sun Feb 25 22:07:17 2001
+++ php4/ext/standard/html.cThu Mar 1 16:15:49 2001
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: html.c,v 1.23 2001/02/26 06:07:17 andi Exp $ */
+/* $Id: html.c,v 1.24 2001/03/02 00:15:49 sniper Exp $ */
#include "php.h"
#include "reg.h"
@@ -45,9 +45,9 @@
"uuml","yacute","thorn","yuml"
};
-#define ENT_COMPAT 1
-#define ENT_QUOTES 2
-#define ENT_NOQUOTES 4
+#define ENT_COMPAT1
+#define ENT_QUOTES2
+#define ENT_NOQUOTES 4
PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newlen,
int all, int quote_style)
{
@@ -89,7 +89,7 @@
}
old++;
}
-new [len] = '\0';
+ new [len] = '\0';
*newlen = len;
return new;
@@ -97,23 +97,23 @@
static void php_html_entities(INTERNAL_FUNCTION_PARAMETERS, int all)
{
-zval **arg, **quotes;
-int len, quote_style = ENT_COMPAT;
+ zval **arg, **quotes;
+ int len, quote_style = ENT_COMPAT;
int ac = ZEND_NUM_ARGS();
char *new;
if (ac < 1 || ac > 2 || zend_get_parameters_ex(ac, &arg, "es) == FAILURE) {
-WRONG_PARAM_COUNT;
-}
+ WRONG_PARAM_COUNT;
+ }
-convert_to_string_ex(arg);
+ convert_to_string_ex(arg);
if(ac==2) {
convert_to_long_ex(quotes);
quote_style = (*quotes)->value.lval;
}
new = php_escape_html_entities((*arg)->value.str.val, (*arg)->value.str.len,
&len, all, quote_style);
-RETVAL_STRINGL(new,len,0);
+ RETVAL_STRINGL(new,len,0);
}
#define HTML_SPECIALCHARS 0
@@ -155,8 +155,8 @@
char ind[ 2 ];
if (ac < 0 || ac > 2 || zend_get_parameters_ex(ac, &whichone, "es) ==
FAILURE) {
-WRONG_PARAM_COUNT;
-}
+ WRONG_PARAM_COUNT;
+ }
if (ac > 0) {
convert_to_long_ex(whichone);
@@ -184,9 +184,11 @@
case HTML_SPECIALCHARS:
ind[0]=38; add_assoc_string(return_value,ind,"&",1);
if(quote_style&ENT_QUOTES) {
- ind[0]=39;
add_assoc_string(return_value,ind,"'",1); }
+ ind[0]=39;
+add_assoc_string(return_value,ind,"'",1);
+ }
if(!(quote_style&ENT_NOQUOTES)) {
- ind[0]=34;
add_assoc_string(return_value,ind,""",1); }
+ ind[0]=34;
+add_assoc_string(return_value,ind,""",1);
+ }
ind[0]=60; add_assoc_string(return_value,ind,"<",1);
ind[0]=62; add_assoc_string(return_value,ind,">",1);
break;
--
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 /sapi/cgi cgi_main.c
sniper Sun Mar 4 17:26:36 2001 EDT
Modified files:
/php4/sapi/cgi cgi_main.c
Log:
Can't output any error messages if there isn't any function initialized
to do it..
# Bug report: #7650
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.96 php4/sapi/cgi/cgi_main.c:1.97
--- php4/sapi/cgi/cgi_main.c:1.96 Sat Mar 3 17:08:46 2001
+++ php4/sapi/cgi/cgi_main.cSun Mar 4 17:26:36 2001
@@ -416,6 +416,9 @@
setmode(_fileno(stderr), O_BINARY); /* make the stdio mode be
binary */
#endif
+ if (php_module_startup(&cgi_sapi_module)==FAILURE) {
+ return FAILURE;
+ }
/* Make sure we detect we are a cgi - a bit redundancy here,
but the default case is that we have to check only the first one. */
@@ -472,9 +475,6 @@
ap_php_optarg = orig_optarg;
}
- if (php_module_startup(&cgi_sapi_module)==FAILURE) {
- return FAILURE;
- }
#ifdef ZTS
compiler_globals = ts_resource(compiler_globals_id);
executor_globals = ts_resource(executor_globals_id);
--
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 /sapi/cgi cgi_main.c
sniper Mon Mar 5 07:08:36 2001 EDT
Modified files:
/php4/sapi/cgi cgi_main.c
Log:
Fix help text for -f
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.97 php4/sapi/cgi/cgi_main.c:1.98
--- php4/sapi/cgi/cgi_main.c:1.97 Sun Mar 4 17:26:36 2001
+++ php4/sapi/cgi/cgi_main.cMon Mar 5 07:08:36 2001
@@ -241,13 +241,10 @@
prog = "php";
}
- php_printf("Usage: %s [-q] [-h]"
- " [-s]"
- " [-v] [-i] [-f ] | "
- "{ [args...]}\n"
+ php_printf("Usage: %s [-q] [-h] [-s [-v] [-i] [-f ] | {
+[args...]}\n"
" -q Quiet-mode. Suppress HTTP Header
output.\n"
" -s Display colour syntax highlighted
source.\n"
- " -f Parse . Implies `-q'\n"
+ " -f Parse . Implies `-q'\n"
" -v Version number\n"
" -c Look for php.ini file in this
directory\n"
#if SUPPORT_INTERACTIVE
--
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 /sapi/cgi cgi_main.c
sniper Wed Mar 7 05:24:12 2001 EDT Modified files: /php4/sapi/cgi cgi_main.c Log: Fixed the help for other options too. Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.98 php4/sapi/cgi/cgi_main.c:1.99 --- php4/sapi/cgi/cgi_main.c:1.98 Mon Mar 5 07:08:36 2001 +++ php4/sapi/cgi/cgi_main.cWed Mar 7 05:24:12 2001 @@ -246,13 +246,13 @@ " -s Display colour syntax highlighted source.\n" " -f Parse . Implies `-q'\n" " -v Version number\n" - " -c Look for php.ini file in this directory\n" + " -c Look for php.ini file in this +directory\n" #if SUPPORT_INTERACTIVE " -a Run interactively\n" #endif " -d foo[=bar] Define INI entry foo with value 'bar'\n" " -e Generate extended information for debugger/profiler\n" - " -z Load Zend extension .\n" + " -z Load Zend extension .\n" " -l Syntax check only (lint)\n" " -m Show compiled in modules\n" " -i PHP information\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/mysql config.m4
sniper Sat Mar 10 09:33:34 2001 EDT Modified files: /php4/ext/mysql config.m4 Log: This should fix the problems with not including -lz. Index: php4/ext/mysql/config.m4 diff -u php4/ext/mysql/config.m4:1.27 php4/ext/mysql/config.m4:1.28 --- php4/ext/mysql/config.m4:1.27 Tue Nov 21 03:07:50 2000 +++ php4/ext/mysql/config.m4Sat Mar 10 09:33:33 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27 2000/11/21 11:07:50 sniper Exp $ +dnl $Id: config.m4,v 1.28 2001/03/10 17:33:33 sniper Exp $ sinclude(ext/mysql/libmysql/acinclude.m4) sinclude(ext/mysql/libmysql/mysql.m4) @@ -78,6 +78,11 @@ fi AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD) + + dnl Check if mysql_config is found. If yes, use the LIBS provided by it.. + if test -x "$MYSQL_DIR/bin/mysql_config"; then +PHP_EVAL_LIBLINE($MYSQL_DIR/bin/mysql_config --libs) + fi AC_ADD_INCLUDE($MYSQL_INC_DIR) else -- 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/curl config.m4
sniper Sat Mar 10 16:49:16 2001 EDT Modified files: /php4/ext/curl config.m4 Log: If AC_CHECK_LIB fails, assume that --with-openssl is needed Index: php4/ext/curl/config.m4 diff -u php4/ext/curl/config.m4:1.3 php4/ext/curl/config.m4:1.4 --- php4/ext/curl/config.m4:1.3 Mon Oct 2 10:35:57 2000 +++ php4/ext/curl/config.m4 Sat Mar 10 16:49:16 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 2000/10/02 17:35:57 rasmus Exp $ +dnl $Id: config.m4,v 1.4 2001/03/11 00:49:16 sniper Exp $ dnl config.m4 for extension CURL PHP_ARG_WITH(curl, for CURL support, @@ -28,7 +28,12 @@ PHP_SUBST(CURL_SHARED_LIBADD) AC_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/lib, CURL_SHARED_LIBADD) - AC_DEFINE(HAVE_CURL,1,[ ]) + AC_CHECK_LIB(curl,curl_easy_perform, + [ +AC_DEFINE(HAVE_CURL,1,[ ]) + ],[ +AC_MSG_ERROR(Try adding --with-openssl[=DIR] into your configure line.) + ]) PHP_EXTENSION(curl, $ext_shared) fi -- 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 / configure.in
sniper Sat Mar 10 19:46:25 2001 EDT Modified files: /php4 configure.in Log: Check for inet_aton only if libbind is not found (or inet_aton is not in libbind). Fixes bug: #8814 Index: php4/configure.in diff -u php4/configure.in:1.220 php4/configure.in:1.221 --- php4/configure.in:1.220 Tue Mar 6 08:51:53 2001 +++ php4/configure.in Sat Mar 10 19:46:24 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.220 2001/03/06 16:51:53 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.221 2001/03/11 03:46:24 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -251,9 +251,9 @@ AC_CHECK_LIB(bind, inet_aton, [ AC_ADD_LIBRARY(bind) - AC_DEFINE(HAVE_LIBBIND,1,[Whether you have bind]) ], []) - -AC_CHECK_LIB(resolv, inet_aton) + AC_DEFINE(HAVE_LIBBIND,1,[Whether you have bind]) ], [ +AC_CHECK_LIB(resolv, inet_aton) + ]) dnl The res_search may be in libsocket as well, and if it is dnl make sure to check for dn_skipname in libresolv, or if res_search -- 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/standard basic_functions.c dns.c dns.h /main config.w32.h
sniper Sat Mar 10 19:49:21 2001 EDT
Modified files:
/php4/ext/standard basic_functions.c dns.c dns.h
/php4/main config.w32.h
Log:
HAVE_BINDLIB --> HAVE_LIBBIND
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.313
php4/ext/standard/basic_functions.c:1.314
--- php4/ext/standard/basic_functions.c:1.313 Fri Mar 9 13:42:26 2001
+++ php4/ext/standard/basic_functions.c Sat Mar 10 19:49:21 2001
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.313 2001/03/09 21:42:26 andrei Exp $ */
+/* $Id: basic_functions.c,v 1.314 2001/03/11 03:49:21 sniper Exp $ */
#include "php.h"
#include "php_main.h"
@@ -247,7 +247,7 @@
PHP_FE(gethostbyaddr, NULL)
PHP_FE(gethostbyname, NULL)
PHP_FE(gethostbynamel, NULL)
-#if HAVE_BINDLIB && !(defined(__BEOS__)||defined(PHP_WIN32))
+#if HAVE_LIBBIND && !(defined(__BEOS__)||defined(PHP_WIN32))
PHP_FE(checkdnsrr,
NULL)
PHP_FE(getmxrr,
second_and_third_args_force_ref)
#else
Index: php4/ext/standard/dns.c
diff -u php4/ext/standard/dns.c:1.26 php4/ext/standard/dns.c:1.27
--- php4/ext/standard/dns.c:1.26Sun Feb 25 22:07:17 2001
+++ php4/ext/standard/dns.c Sat Mar 10 19:49:21 2001
@@ -16,14 +16,14 @@
+--+
*/
-/* $Id: dns.c,v 1.26 2001/02/26 06:07:17 andi Exp $ */
+/* $Id: dns.c,v 1.27 2001/03/11 03:49:21 sniper Exp $ */
#include "php.h"
#if HAVE_SYS_SOCKET_H
#include
#endif
#ifdef PHP_WIN32
-#if HAVE_BINDLIB
+#if HAVE_LIBBIND
#ifndef WINNT
#define WINNT 1
#endif
@@ -167,7 +167,7 @@
return estrdup(inet_ntoa(in));
}
-#if HAVE_BINDLIB && !(defined(__BEOS__)||defined(PHP_WIN32))
+#if HAVE_LIBBIND && !(defined(__BEOS__)||defined(PHP_WIN32))
/* {{{ proto int checkdnsrr(string host [, string type])
Check DNS records corresponding to a given Internet host name or IP address */
Index: php4/ext/standard/dns.h
diff -u php4/ext/standard/dns.h:1.7 php4/ext/standard/dns.h:1.8
--- php4/ext/standard/dns.h:1.7 Sun Feb 25 22:07:17 2001
+++ php4/ext/standard/dns.h Sat Mar 10 19:49:21 2001
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dns.h,v 1.7 2001/02/26 06:07:17 andi Exp $ */
+/* $Id: dns.h,v 1.8 2001/03/11 03:49:21 sniper Exp $ */
#ifndef DNS_H
#define DNS_H
@@ -25,7 +25,7 @@
PHP_FUNCTION(gethostbyaddr);
PHP_FUNCTION(gethostbyname);
PHP_FUNCTION(gethostbynamel);
-#if !defined(PHP_WIN32)||(HAVE_BINDLIB)
+#if !defined(PHP_WIN32)||(HAVE_LIBBIND)
PHP_FUNCTION(checkdnsrr);
PHP_FUNCTION(getmxrr);
#endif
Index: php4/main/config.w32.h
diff -u php4/main/config.w32.h:1.39 php4/main/config.w32.h:1.40
--- php4/main/config.w32.h:1.39 Sun Jan 14 08:36:30 2001
+++ php4/main/config.w32.h Sat Mar 10 19:49:21 2001
@@ -10,7 +10,7 @@
lib33bsd95.lib to the project settings, and add the path to the
bind include directory to the preprocessor settings. These libs
are availabe in the ntbind distribution */
-#define HAVE_BINDLIB 1
+#define HAVE_LIBBIND 1
/* set to enable bcmath */
#define WITH_BCMATH 1
@@ -231,7 +231,7 @@
#define HAVE_LOCALE_H 1
/* Define if you have the setvbuf function. */
-#ifndef HAVE_BINDLIB
+#ifndef HAVE_LIBBIND
#define HAVE_SETVBUF 1
#endif
--
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/sybase_ct php_sybase_ct.c
sniper Sat Mar 10 20:13:53 2001 EDT Modified files: /php4/ext/sybase_ct php_sybase_ct.c Log: Added missing alias. PR: #9550 Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.42 php4/ext/sybase_ct/php_sybase_ct.c:1.43 --- php4/ext/sybase_ct/php_sybase_ct.c:1.42 Sun Feb 25 22:07:24 2001 +++ php4/ext/sybase_ct/php_sybase_ct.c Sat Mar 10 20:13:53 2001 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_sybase_ct.c,v 1.42 2001/02/26 06:07:24 andi Exp $ */ +/* $Id: php_sybase_ct.c,v 1.43 2001/03/11 04:13:53 sniper Exp $ */ #include "php.h" @@ -67,6 +67,7 @@ PHP_FALIAS(mssql_fetch_object, sybase_fetch_object,NULL) PHP_FALIAS(mssql_data_seek, sybase_data_seek, NULL) PHP_FALIAS(mssql_fetch_field, sybase_fetch_field, NULL) + PHP_FALIAS(mssql_field_seek,sybase_field_seek, NULL) PHP_FALIAS(mssql_result,sybase_result, NULL) PHP_FALIAS(mssql_affected_rows, sybase_affected_rows, NULL) PHP_FALIAS(mssql_min_client_severity, sybase_min_client_severity, NULL) -- 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/muscat config.m4
sniper Sun Mar 11 16:46:15 2001 EDT Modified files: /php4/ext/muscatconfig.m4 Log: ws fix. Index: php4/ext/muscat/config.m4 diff -u php4/ext/muscat/config.m4:1.1 php4/ext/muscat/config.m4:1.2 --- php4/ext/muscat/config.m4:1.1 Thu Jan 18 05:21:33 2001 +++ php4/ext/muscat/config.m4 Sun Mar 11 16:46:15 2001 @@ -1,7 +1,7 @@ -dnl $Id: config.m4,v 1.1 2001/01/18 13:21:33 samjam Exp $ +dnl $Id: config.m4,v 1.2 2001/03/12 00:46:15 sniper Exp $ PHP_ARG_WITH(muscat, for Muscat support, -[ --with-muscat[=DIR] Include muscat support.]) +[ --with-muscat[=DIR] Include muscat support.]) if test "$PHP_MUSCAT" != "no"; then PHP_EXTENSION(muscat, $ext_shared) -- 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/pdf config.m4
sniper Sun Mar 11 17:20:14 2001 EDT Modified files: /php4/ext/pdf config.m4 Log: ws fixes. Plus removed unnecessary AC_MSG_ calls. Index: php4/ext/pdf/config.m4 diff -u php4/ext/pdf/config.m4:1.14 php4/ext/pdf/config.m4:1.15 --- php4/ext/pdf/config.m4:1.14 Mon Feb 12 09:50:38 2001 +++ php4/ext/pdf/config.m4 Sun Mar 11 17:20:13 2001 @@ -1,24 +1,22 @@ -dnl $Id: config.m4,v 1.14 2001/02/12 17:50:38 rjs Exp $ +dnl $Id: config.m4,v 1.15 2001/03/12 01:20:13 sniper Exp $ -AC_MSG_CHECKING(whether to include Pdflib 3.x support) - -PHP_ARG_WITH(pdflib,whether to include pdflib support, +PHP_ARG_WITH(pdflib,whether to include PDFlib support, [ --with-pdflib[=DIR] Include pdflib 3.x support. DIR is the pdflib - base install directory, defaults to /usr/local - Set DIR to "shared" to build as dl, or "shared,DIR" + base install directory, defaults to /usr/local + Set DIR to "shared" to build as dl, or "shared,DIR" to build as dl and still specify DIR.]) case "$PHP_PDFLIB" in -no) - AC_MSG_RESULT(no) ;; yes) - AC_MSG_RESULT(yes) PHP_EXTENSION(pdf, $ext_shared) old_LDFLAGS=$LDFLAGS - old_LIBS=$LIBS - LIBS="$LIBS -ltiff -ljpeg -lpng -lz" - AC_CHECK_LIB(pdf, PDF_show_boxed, [AC_DEFINE(HAVE_PDFLIB,1,[ ])], -[AC_MSG_ERROR(pdflib extension requires at least pdflib 3.x. You may also need libtiff and libjpeg. If so, use the options --with-tiff-dir= and --with-jpeg-dir=)]) + old_LIBS=$LIBS + LIBS="$LIBS -ltiff -ljpeg -lpng -lz" + AC_CHECK_LIB(pdf, PDF_show_boxed, [ +AC_DEFINE(HAVE_PDFLIB,1,[ ]) + ],[ +AC_MSG_ERROR(pdflib extension requires at least pdflib 3.x. You may also need +libtiff and libjpeg. If so, use the options --with-tiff-dir= and +--with-jpeg-dir=) + ]) LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS PHP_SUBST(PDFLIB_SHARED_LIBADD) @@ -31,7 +29,6 @@ *) test -f $withval/include/pdflib.h && PDFLIB_INCLUDE="$withval/include" if test -n "$PDFLIB_INCLUDE" ; then -AC_MSG_RESULT(yes) PHP_EXTENSION(pdf, $ext_shared) old_withval=$withval @@ -112,13 +109,15 @@ old_LIBS=$LIBS LIBS="$LIBS -L$withval/lib" -AC_CHECK_LIB(pdf, PDF_show_boxed, [AC_DEFINE(HAVE_PDFLIB,1,[ ]) PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpdf"], - [AC_MSG_ERROR(pdflib extension requires pdflib 3.x.)]) +AC_CHECK_LIB(pdf, PDF_show_boxed, [ + AC_DEFINE(HAVE_PDFLIB,1,[ ]) + PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpdf" +],[ + AC_MSG_ERROR(pdflib extension requires pdflib 3.x.) +]) LIBS=$old_LIBS - PHP_SUBST(PDFLIB_SHARED_LIBADD) +PHP_SUBST(PDFLIB_SHARED_LIBADD) AC_ADD_LIBRARY_WITH_PATH(pdf, $withval/lib, PDFLIB_SHARED_LIBADD) AC_ADD_INCLUDE($PDFLIB_INCLUDE) - else -AC_MSG_RESULT(no) fi ;; esac -- 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/ldap config.m4
sniper Sun Mar 11 18:06:07 2001 EDT Modified files: /php4/ext/ldap config.m4 Log: Cleaning this a little bit. Index: php4/ext/ldap/config.m4 diff -u php4/ext/ldap/config.m4:1.13 php4/ext/ldap/config.m4:1.14 --- php4/ext/ldap/config.m4:1.13Sun Oct 15 15:53:43 2000 +++ php4/ext/ldap/config.m4 Sun Mar 11 18:06:06 2001 @@ -1,81 +1,86 @@ -dnl $Id: config.m4,v 1.13 2000/10/15 22:53:43 sniper Exp $ +dnl $Id: config.m4,v 1.14 2001/03/12 02:06:06 sniper Exp $ +AC_DEFUN(PHP_LDAP_CHECKS, [ + if test -f $1/include/ldap.h; then +LDAP_DIR=$1 +LDAP_INCDIR=$1/include +LDAP_LIBDIR=$1/lib + elif test -f $1/include/umich-ldap/ldap.h; then +LDAP_DIR=$i +LDAP_INCDIR=$1/include/umich-ldap +LDAP_LIBDIR=$1/lib + elif test -f $1/ldap/public/ldap.h; then +LDAP_DIR=$i +LDAP_INCDIR=$1/ldap/public +LDAP_LIBDIR=$1/lib + fi +]) + PHP_ARG_WITH(ldap,whether to include LDAP support, -[ --with-ldap[=DIR] Include LDAP support. DIR is the LDAP base - install directory.]) +[ --with-ldap[=DIR] Include LDAP support. DIR is the LDAP base install +directory.]) if test "$PHP_LDAP" != "no"; then - PHP_EXTENSION(ldap,$ext_shared) - for i in /usr/local /usr $PHP_LDAP; do - if test -f $i/include/ldap.h; then - LDAP_DIR=$i - LDAP_INCDIR=$i/include - LDAP_LIBDIR=$i/lib - elif test -f $i/include/umich-ldap/ldap.h; then - LDAP_DIR=$i - LDAP_INCDIR=$i/include/umich-ldap - LDAP_LIBDIR=$i/lib - elif test -f $i/ldap/public/ldap.h; then - LDAP_DIR=$i - LDAP_INCDIR=$i/ldap/public - LDAP_LIBDIR=$i/lib - fi - done - - if test -z "$LDAP_DIR"; then - AC_MSG_ERROR(Cannot find ldap.h) - fi - - dnl The Linux version of the SDK need -lpthread - dnl I have tested Solaris, and it doesn't, but others may. Add - dnl these here if necessary. -RL - - dnl Is this really necessary? -Troels Arvin - - if test `uname` = "Linux"; then - LDAP_PTHREAD="pthread" - else - LDAP_PTHREAD= - fi - - PHP_SUBST(LDAP_SHARED_LIBADD) - - if test -f $LDAP_LIBDIR/liblber.a -o -f $LDAP_LIBDIR/liblber.so ; then - AC_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) - elif test -f $LDAP_LIBDIR/libldapssl41.so; then - if test -n "$LDAP_PTHREAD"; then - AC_ADD_LIBRARY($LDAP_PTHREAD) - fi - AC_ADD_LIBRARY_WITH_PATH(ldapssl41, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) - AC_DEFINE(HAVE_NSLDAP,1,[ ]) - elif test -f $LDAP_LIBDIR/libldapssl30.so; then - if test -n "$LDAP_PTHREAD"; then - AC_ADD_LIBRARY($LDAP_PTHREAD) - fi - AC_ADD_LIBRARY_WITH_PATH(ldapssl30, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) - AC_DEFINE(HAVE_NSLDAP,1,[ ]) - elif test -f $LDAP_LIBDIR/libldapssl30.sl; then - AC_ADD_LIBRARY_WITH_PATH(ldapssl30, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) - AC_DEFINE(HAVE_NSLDAP,1,[ ]) - elif test -f $LDAP_LIBDIR/libldap30.so; then - if test -n "$LDAP_PTHREAD"; then - AC_ADD_LIBRARY($LDAP_PTHREAD) - fi - AC_ADD_LIBRARY_WITH_PATH(ldap30, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) - AC_DEFINE(HAVE_NSLDAP,1,[ ]) - elif test -f $LDAP_LIBDIR/libldap30.sl; then - AC_ADD_LIBRARY_WITH_PATH(ldap30, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) - AC_DEFINE(HAVE_NSLDAP,1,[ ]) - elif test -f $LDAP_LIBDIR/libumich_ldap.so; then - AC_ADD_LIBRARY_WITH_PATH(umich_lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(umich_ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) - elif test -f $LDAP_LIBDIR/libclntsh.so; then - AC_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) - AC_DEFINE(HAVE_ORALDAP,1,[ ]) - fi - AC_ADD_INCLUDE($LDAP_INCDIR) - AC_DEFINE(HAVE_LDAP,1,[ ]) + PHP_EXTENSION(ldap,$ext_shared) -fi + if test "$PHP_LDAP" = "yes"; then +for i in /usr/local /usr; do + PHP_LDAP_CHECKS($i) +done + else +PHP_LDAP_CHECKS($PHP_LDAP) + fi + + if test -z "$LDAP_DIR"; then +AC_MSG_ERROR(Cannot find ldap.h) + fi + + dnl The Linux version of the SDK need -lpthread + dnl I have tested Solaris, and it doesn't, but others may. Add + dnl these here if necessary. -RL + dnl Is this really necessary? -Troels Arvin + + if test `uname` = "Linux"; then +LDAP_PTHREAD="pthrea
[PHP-CVS] cvs: php4 /ext/fbsql config.m4
sniper Tue Mar 13 14:33:53 2001 EDT Modified files: /php4/ext/fbsql config.m4 Log: Extension was enabled by default.. Index: php4/ext/fbsql/config.m4 diff -u php4/ext/fbsql/config.m4:1.1 php4/ext/fbsql/config.m4:1.2 --- php4/ext/fbsql/config.m4:1.1Tue Mar 13 12:58:47 2001 +++ php4/ext/fbsql/config.m4Tue Mar 13 14:33:53 2001 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.1 2001/03/13 20:58:47 fmk Exp $ +dnl $Id: config.m4,v 1.2 2001/03/13 22:33:53 sniper Exp $ PHP_ARG_WITH(fbsql, for FrontBase SQL92 (fbsql) support, [ --with-fbsql[=DIR] Include FrontBase support. DIR is the FrontBase base - directory. .], yes) + directory. .]) if test "$PHP_FBSQL" != "no"; then AC_DEFINE(HAVE_FBSQL, 1, [Whether you have FrontBase]) -- 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/fbsql config.m4
sniper Tue Mar 13 14:50:02 2001 EDT Modified files: /php4/ext/fbsql config.m4 Log: cleanup. Index: php4/ext/fbsql/config.m4 diff -u php4/ext/fbsql/config.m4:1.3 php4/ext/fbsql/config.m4:1.4 --- php4/ext/fbsql/config.m4:1.3Tue Mar 13 14:44:49 2001 +++ php4/ext/fbsql/config.m4Tue Mar 13 14:50:02 2001 @@ -1,41 +1,41 @@ -dnl $Id: config.m4,v 1.3 2001/03/13 22:44:49 jason Exp $ +dnl $Id: config.m4,v 1.4 2001/03/13 22:50:02 sniper Exp $ PHP_ARG_WITH(fbsql, for FrontBase SQL92 (fbsql) support, [ --with-fbsql[=DIR] Include FrontBase support. DIR is the FrontBase base - directory. .]) + directory.]) if test "$PHP_FBSQL" != "no"; then + AC_DEFINE(HAVE_FBSQL, 1, [Whether you have FrontBase]) PHP_EXTENSION(fbsql,$ext_shared) - FBSQL_INSTALLATION_DIR="" if test "$PHP_FBSQL" = "yes"; then -for i in /Local/Library /usr /usr/local /opt /Library -do - if test -f $i/FrontBase/include/FBCAccess/FBCAccess.h - then - FBSQL_INSTALLATION_DIR=$i/FrontBase - break - fi + +for i in /Local/Library /usr /usr/local /opt /Library; do + if test -f $i/FrontBase/include/FBCAccess/FBCAccess.h; then +FBSQL_INSTALLATION_DIR="$i/FrontBase" +break + fi done -if test -z "$FBSQL_INSTALLATION_DIR" -then - AC_MSG_ERROR(Cannot find FrontBase in well know installation directories) + +if test -z "$FBSQL_INSTALLATION_DIR"; then + AC_MSG_ERROR(Cannot find FrontBase in well know installation directories) fi - elif test "$PHP_FBSQL" != "no"; then -if test -f $PHP_FBSQL/include/FBCAccess/FBCAccess.h -then - FBSQL_INSTALLATION_DIR=$PHP_FBSQL + + elif test "$PHP_FBSQL" != "no"; then + +if test -f $PHP_FBSQL/include/FBCAccess/FBCAccess.h; then + FBSQL_INSTALLATION_DIR=$PHP_FBSQL else - AC_MSG_ERROR(Directory $PHP_FBSQL is not a FrontBase installation directory) + AC_MSG_ERROR(Directory $PHP_FBSQL is not a FrontBase installation directory) fi fi - if test ! -f "$FBSQL_INSTALLATION_DIR/lib/libFBCAccess.a" - then + if test -z "$FBSQL_INSTALLATION_DIR/lib/libFBCAccess.a"; then AC_MSG_ERROR(Could not find $FBSQL_INSTALLATION_DIR/lib/libFBCAccess.a) fi + AC_ADD_LIBRARY_WITH_PATH(FBCAccess, $FBSQL_INSTALLATION_DIR/lib, $FBSQL_INSTALLATION_DIR/lib) AC_ADD_INCLUDE($FBSQL_INSTALLATION_DIR/include) fi -- 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 zziplib.c
sniper Tue Mar 13 15:41:26 2001 EDT
Modified files:
/php4/ext/zziplib zziplib.c
Log:
Make phpinfo() output prettier + kill some compile warnings.
Index: php4/ext/zziplib/zziplib.c
diff -u php4/ext/zziplib/zziplib.c:1.4 php4/ext/zziplib/zziplib.c:1.5
--- php4/ext/zziplib/zziplib.c:1.4 Sun Feb 25 22:07:30 2001
+++ php4/ext/zziplib/zziplib.c Tue Mar 13 15:41:25 2001
@@ -22,6 +22,7 @@
#if HAVE_ZZIPLIB
+#include "ext/standard/info.h"
#include
#ifndef O_BINARY
@@ -88,7 +89,7 @@
PHP_MINFO_FUNCTION(zziplib)
{
php_info_print_table_start();
- php_info_print_table_header(2, "zziplib support", "enabled");
+ php_info_print_table_row(2, "zziplib support", "enabled");
php_info_print_table_end();
}
--
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/fbsql EXPERIMENTAL
sniper Wed Mar 14 05:42:33 2001 EDT Added files: /php4/ext/fbsql EXPERIMENTAL Log: Missing. -- 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/fbsql CREDITS
sniper Wed Mar 14 05:43:58 2001 EDT Added files: /php4/ext/fbsql CREDITS Log: Forgot this one.. -- 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/ming config.m4
sniper Thu Mar 15 16:36:30 2001 EDT Modified files: /php4/ext/ming config.m4 Log: Beutify + fix some errors in finding libs and header files. Index: php4/ext/ming/config.m4 diff -u php4/ext/ming/config.m4:1.2 php4/ext/ming/config.m4:1.3 --- php4/ext/ming/config.m4:1.2 Sat Jan 27 02:05:29 2001 +++ php4/ext/ming/config.m4 Thu Mar 15 16:36:30 2001 @@ -1,15 +1,12 @@ -dnl $Id: config.m4,v 1.2 2001/01/27 10:05:29 sas Exp $ +dnl $Id: config.m4,v 1.3 2001/03/16 00:36:30 sniper Exp $ dnl config.m4 for extension libming -dnl don't forget to call PHP_EXTENSION(ming) -dnl This file is a modified version of config.m4 -dnl in php4/ext/mcrypt -PHP_ARG_WITH(ming, for ming support, +PHP_ARG_WITH(ming, whether to include ming support, [ --with-ming[=DIR]Include ming support]) if test "$PHP_MING" != "no"; then - for i in /usr/lib /usr/local /usr $PHP_MING; do -if test -r $i/libming.so; then + for i in $PHP_MING /usr/local /usr; do +if test -r $i/lib/libming.so; then MING_DIR=$i fi done @@ -18,10 +15,10 @@ AC_MSG_ERROR(Please reinstall libming.so - I cannot find libming.so) fi - AC_ADD_INCLUDE($MING_DIR) + AC_ADD_INCLUDE($MING_DIR/include) PHP_SUBST(MING_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR, MING_SHARED_LIBADD) + AC_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD) AC_DEFINE(HAVE_MING,1,[ ]) PHP_EXTENSION(ming, $ext_shared) -- 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/ming .cvsignore CREDITS
sniper Thu Mar 15 16:36:47 2001 EDT Added files: /php4/ext/ming CREDITS .cvsignore Log: Missing files. Index: php4/ext/ming/.cvsignore +++ php4/ext/ming/.cvsignore Makefile *.lo *.la libs deps libs.mk -- 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/ming ming.c
sniper Thu Mar 15 16:37:34 2001 EDT
Modified files:
/php4/ext/ming ming.c
Log:
Killed a compile warning + made ming extension compile with the older ming libs.
Index: php4/ext/ming/ming.c
diff -u php4/ext/ming/ming.c:1.3 php4/ext/ming/ming.c:1.4
--- php4/ext/ming/ming.c:1.3Mon Mar 12 17:57:38 2001
+++ php4/ext/ming/ming.cThu Mar 15 16:37:34 2001
@@ -23,6 +23,7 @@
#if HAVE_MING
#include "ext/standard/info.h"
+#include "ext/standard/file.h"
#include "php_ming.h"
static zend_function_entry ming_functions[] = {
@@ -2955,7 +2956,9 @@
CONSTANT("SWFTEXTFIELD_WORDWRAP", SWFTEXTFIELD_WORDWRAP);
CONSTANT("SWFTEXTFIELD_DRAWBOX",SWFTEXTFIELD_DRAWBOX);
CONSTANT("SWFTEXTFIELD_NOSELECT", SWFTEXTFIELD_NOSELECT);
+#ifdef SWFTEXTFIELD_HTML
CONSTANT("SWFTEXTFIELD_HTML", SWFTEXTFIELD_HTML);
+#endif
/* flags for SWFTextField_align */
CONSTANT("SWFTEXTFIELD_ALIGN_LEFT", SWFTEXTFIELD_ALIGN_LEFT);
--
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/bz2 bz2.c
sniper Thu Mar 15 17:21:24 2001 EDT
Modified files:
/php4/ext/bz2 bz2.c
Log:
Make this extension compile again..
Index: php4/ext/bz2/bz2.c
diff -u php4/ext/bz2/bz2.c:1.10 php4/ext/bz2/bz2.c:1.11
--- php4/ext/bz2/bz2.c:1.10 Wed Mar 14 23:03:28 2001
+++ php4/ext/bz2/bz2.c Thu Mar 15 17:21:24 2001
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bz2.c,v 1.10 2001/03/15 07:03:28 sterling Exp $ */
+/* $Id: bz2.c,v 1.11 2001/03/16 01:21:24 sniper Exp $ */
#include "php.h"
@@ -216,16 +216,15 @@
Close a BZip2 stream */
PHP_FUNCTION(bzclose)
{
- zval **bzp; /* BZip2 Resource Pointer */
- BZFILE*bz; /* BZip2 File pointer */
+ zval **bzp=NULL; /* BZip2 Resource Pointer */
+ BZFILE*bz;/* BZip2 File pointer */
if (ZEND_NUM_ARGS() != 1 ||
zend_get_parameters_ex(1, &bzp) == FAILURE) {
WRONG_PARAM_COUNT;
}
ZEND_FETCH_RESOURCE(bz, BZFILE *, bzp, -1, "BZip2 File Handle", le_bz2);
-
- zend_list_delete(Z_LVAL_PP(Bz));
+ zend_list_delete(Z_RESVAL_PP(bzp));
}
/* }}} */
@@ -328,7 +327,7 @@
{
zval**source, /* Source data to
decompress */
**zsmall; /* (Optional) user
specified small */
- char *dest = emalloc(PHP_BZ_DECOMPRESS_SIZE), /* Destination buffer,
initially allocated */
+ char *dest = emalloc(PHP_BZ_DECOMPRESS_SIZE); /* Destination buffer,
+initially allocated */
int error, /* Error container */
iter = 1, /* Iteration count for
the compression loop */
size, /* Current size
to realloc the dest buffer to */
--
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/ming config.m4
sniper Thu Mar 15 18:06:33 2001 EDT Modified files: /php4/ext/ming config.m4 Log: Added a check for the one function missing in <= 0.1.0 versions of ming lib. Index: php4/ext/ming/config.m4 diff -u php4/ext/ming/config.m4:1.3 php4/ext/ming/config.m4:1.4 --- php4/ext/ming/config.m4:1.3 Thu Mar 15 16:36:30 2001 +++ php4/ext/ming/config.m4 Thu Mar 15 18:06:33 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 2001/03/16 00:36:30 sniper Exp $ +dnl $Id: config.m4,v 1.4 2001/03/16 02:06:33 sniper Exp $ dnl config.m4 for extension libming PHP_ARG_WITH(ming, whether to include ming support, @@ -19,7 +19,12 @@ PHP_SUBST(MING_SHARED_LIBADD) AC_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD) - AC_DEFINE(HAVE_MING,1,[ ]) + + AC_CHECK_LIB(ming, Ming_setScale, [ +AC_DEFINE(HAVE_MING,1,[ ]) + ],[ +AC_MSG_ERROR(Ming library 0.1.0 or greater required.) + ]) PHP_EXTENSION(ming, $ext_shared) fi -- 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 / configure.in /ext/standard dns.c
sniper Thu Mar 15 23:13:06 2001 EDT
Modified files:
/php4/ext/standard dns.c
/php4 configure.in
Log:
This should fix problems in systems without libbind.
Index: php4/ext/standard/dns.c
diff -u php4/ext/standard/dns.c:1.27 php4/ext/standard/dns.c:1.28
--- php4/ext/standard/dns.c:1.27Sat Mar 10 19:49:21 2001
+++ php4/ext/standard/dns.c Thu Mar 15 23:13:06 2001
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dns.c,v 1.27 2001/03/11 03:49:21 sniper Exp $ */
+/* $Id: dns.c,v 1.28 2001/03/16 07:13:06 sniper Exp $ */
#include "php.h"
#if HAVE_SYS_SOCKET_H
@@ -167,7 +167,7 @@
return estrdup(inet_ntoa(in));
}
-#if HAVE_LIBBIND && !(defined(__BEOS__)||defined(PHP_WIN32))
+#if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32))
/* {{{ proto int checkdnsrr(string host [, string type])
Check DNS records corresponding to a given Internet host name or IP address */
Index: php4/configure.in
diff -u php4/configure.in:1.221 php4/configure.in:1.222
--- php4/configure.in:1.221 Sat Mar 10 19:46:24 2001
+++ php4/configure.in Thu Mar 15 23:13:06 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.221 2001/03/11 03:46:24 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.222 2001/03/16 07:13:06 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -389,6 +389,7 @@
random \
rand_r \
regcomp \
+res_search \
setitimer \
setlocale \
localeconv \
--
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/imap php_imap.c
sniper Fri Mar 16 05:17:55 2001 EDT
Modified files:
/php4/ext/imap php_imap.c
Log:
Make compile again when ZTS is enabled and imap-2000 is used. Bug #9762
Index: php4/ext/imap/php_imap.c
diff -u php4/ext/imap/php_imap.c:1.62 php4/ext/imap/php_imap.c:1.63
--- php4/ext/imap/php_imap.c:1.62 Wed Feb 28 23:06:54 2001
+++ php4/ext/imap/php_imap.cFri Mar 16 05:17:54 2001
@@ -25,7 +25,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_imap.c,v 1.62 2001/03/01 07:06:54 chagenbu Exp $ */
+/* $Id: php_imap.c,v 1.63 2001/03/16 13:17:54 sniper Exp $ */
#define IMAP41
@@ -366,6 +366,8 @@
*/
void mail_getquota(MAILSTREAM *stream, char *qroot,QUOTALIST *qlist)
{
+ IMAPLS_FETCH();
+
/* this should only be run through once */
for (; qlist; qlist = qlist->next)
{
@@ -1018,9 +1020,9 @@
PHP_FUNCTION(imap_get_quota)
{
zval **streamind, **qroot;
-
int ind, ind_type;
pils *imap_le_struct;
+ IMAPLS_FETCH();
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &qroot) ==
FAILURE) {
ZEND_WRONG_PARAM_COUNT();
--
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/standard dns.h
sniper Fri Mar 16 06:45:46 2001 EDT Modified files: /php4/ext/standard dns.h Log: Missed this one. Index: php4/ext/standard/dns.h diff -u php4/ext/standard/dns.h:1.8 php4/ext/standard/dns.h:1.9 --- php4/ext/standard/dns.h:1.8 Sat Mar 10 19:49:21 2001 +++ php4/ext/standard/dns.h Fri Mar 16 06:45:46 2001 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: dns.h,v 1.8 2001/03/11 03:49:21 sniper Exp $ */ +/* $Id: dns.h,v 1.9 2001/03/16 14:45:46 sniper Exp $ */ #ifndef DNS_H #define DNS_H @@ -25,7 +25,8 @@ PHP_FUNCTION(gethostbyaddr); PHP_FUNCTION(gethostbyname); PHP_FUNCTION(gethostbynamel); -#if !defined(PHP_WIN32)||(HAVE_LIBBIND) + +#if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32)) PHP_FUNCTION(checkdnsrr); PHP_FUNCTION(getmxrr); #endif -- 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 .cvsignore
sniper Fri Mar 16 09:10:46 2001 EDT Modified files: /php4/tests .cvsignore Log: .php files should not be ignored. Typo? Index: php4/tests/.cvsignore diff -u php4/tests/.cvsignore:1.1 php4/tests/.cvsignore:1.2 --- php4/tests/.cvsignore:1.1 Tue Nov 21 00:00:13 2000 +++ php4/tests/.cvsignore Fri Mar 16 09:10:46 2001 @@ -1,4 +1,3 @@ *.exp *.out -*.php phpt.* -- 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/standard basic_functions.c
sniper Fri Mar 16 10:18:02 2001 EDT Modified files: /php4/ext/standard basic_functions.c Log: This has got to be the last one.. Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.315 php4/ext/standard/basic_functions.c:1.316 --- php4/ext/standard/basic_functions.c:1.315 Sun Mar 11 19:06:53 2001 +++ php4/ext/standard/basic_functions.c Fri Mar 16 10:18:01 2001 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.315 2001/03/12 03:06:53 andrei Exp $ */ +/* $Id: basic_functions.c,v 1.316 2001/03/16 18:18:01 sniper Exp $ */ #include "php.h" #include "php_main.h" @@ -247,7 +247,7 @@ PHP_FE(gethostbyaddr, NULL) PHP_FE(gethostbyname, NULL) PHP_FE(gethostbynamel, NULL) -#if HAVE_LIBBIND && !(defined(__BEOS__)||defined(PHP_WIN32)) +#if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32)) PHP_FE(checkdnsrr, NULL) PHP_FE(getmxrr, second_and_third_args_force_ref) #else -- 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/fdf fdf.c
sniper Sat Mar 17 21:52:41 2001 EDT
Modified files:
/php4/ext/fdf fdf.c
Log:
Fix the fix. Plus killed some compile warnings.
Index: php4/ext/fdf/fdf.c
diff -u php4/ext/fdf/fdf.c:1.40 php4/ext/fdf/fdf.c:1.41
--- php4/ext/fdf/fdf.c:1.40 Sat Mar 17 18:35:10 2001
+++ php4/ext/fdf/fdf.c Sat Mar 17 21:52:40 2001
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fdf.c,v 1.40 2001/03/18 02:35:10 zeev Exp $ */
+/* $Id: fdf.c,v 1.41 2001/03/18 05:52:40 sniper Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -108,20 +108,13 @@
(void)FDFClose(fdf);
}
-static sapi_post_entry supported_post_entries[] = {
-#if HAVE_FDFLIB
- { "application/vnd.fdf",sizeof("application/vnd.fdf")-1,
php_default_post_reader, fdf_post_handler},
-#endif
- { NULL, 0, NULL }
-};
-
#define FDF_POST_CONTENT_TYPE "application/vnd.fdf"
static sapi_post_entry php_fdf_post_entry ={
FDF_POST_CONTENT_TYPE,
sizeof(FDF_POST_CONTENT_TYPE)-1,
sapi_read_standard_form_data,
- php_std_post_handler
+ fdf_post_handler
};
@@ -185,7 +178,7 @@
FDFErc err;
/* remove handler for Acrobat FDF form post requests */
- sapi_remove_post_entry("application/vnd.fdf");
+ sapi_unregister_post_entry(&php_fdf_post_entry);
#ifdef PHP_WIN32
return SUCCESS;
@@ -778,10 +771,9 @@
char *name=NULL,*value=NULL,*p;
int name_len=0,value_len=0;
char *lastfieldname =NULL;
- char *strtok_buf = NULL;
char *filename = NULL;
FDFErc err;
- ASInt32 nBytes, datalen;
+ ASInt32 nBytes;
zval *array_ptr = (zval *) arg;
ELS_FETCH();
PLS_FETCH();
--
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 SAPI.c
sniper Sun Mar 18 00:00:10 2001 EDT
Modified files:
/php4/main SAPI.c
Log:
Fix possible crash if content-type is not set.
Index: php4/main/SAPI.c
diff -u php4/main/SAPI.c:1.101 php4/main/SAPI.c:1.102
--- php4/main/SAPI.c:1.101 Sat Mar 17 18:32:04 2001
+++ php4/main/SAPI.cSun Mar 18 00:00:10 2001
@@ -97,7 +97,7 @@
SAPI_API void sapi_handle_post(void *arg SLS_DC)
{
- if (SG(request_info).post_entry) {
+ if (SG(request_info).post_entry && SG(request_info).content_type_dup) {
SG(request_info).post_entry->post_handler(SG(request_info).content_type_dup, arg
SLS_CC);
if (SG(request_info).post_data) {
efree(SG(request_info).post_data);
--
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/fdf fdf.c
sniper Sun Mar 18 01:25:40 2001 EDT
Modified files:
/php4/ext/fdf fdf.c
Log:
Prevent mem leak
Index: php4/ext/fdf/fdf.c
diff -u php4/ext/fdf/fdf.c:1.41 php4/ext/fdf/fdf.c:1.42
--- php4/ext/fdf/fdf.c:1.41 Sat Mar 17 21:52:40 2001
+++ php4/ext/fdf/fdf.c Sun Mar 18 01:25:40 2001
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fdf.c,v 1.41 2001/03/18 05:52:40 sniper Exp $ */
+/* $Id: fdf.c,v 1.42 2001/03/18 09:25:40 sniper Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -812,6 +812,7 @@
err =
FDFGetValue(theFDF,name,value,value_len-1,&nBytes);
if(err == FDFErcOK && nBytes != 0) {
for(p=value;*p;p++) if(*p=='\r') *p='\n';
+ if(lastfieldname) efree(lastfieldname);
lastfieldname = estrdup(name);
php_register_variable(name, value, array_ptr
ELS_CC PLS_CC);
}
--
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/midgard config.m4
sniper Mon Mar 19 10:38:09 2001 EDT Modified files: /php4/ext/midgard config.m4 Log: Fix the build. Again. # Read README.CVS-RULES # And TEST before commit. Index: php4/ext/midgard/config.m4 diff -u php4/ext/midgard/config.m4:1.18 php4/ext/midgard/config.m4:1.19 --- php4/ext/midgard/config.m4:1.18 Mon Mar 19 04:52:00 2001 +++ php4/ext/midgard/config.m4 Mon Mar 19 10:38:09 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.18 2001/03/19 12:52:00 ab Exp $ +dnl $Id: config.m4,v 1.19 2001/03/19 18:38:09 sniper Exp $ dnl Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]> dnl Copyright (C) 2000 The Midgard Project ry @@ -71,8 +71,7 @@ MIDCONFIG_FILE="php_config.h" fi PHP_SUBST(MIDCONFIG_FILE) - AC_SUBST(MIDCONFIG_FILE) - AC_OUTPUT(php_midgard.h, [], []) + PHP_OUTPUT(php_midgard.h, [], []) AC_DEFINE(HAVE_MIDGARD, 1, [ ]) PHP_EXTENSION(midgard, $ext_shared) fi -- 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 /ext/midgard config.m4
On Mon, 19 Mar 2001, Alexander Bokovoy wrote: >On Mon, Mar 19, 2001 at 01:19:06PM -0600, Andrei Zmievski wrote: >> On Mon, 19 Mar 2001, Alexander Bokovoy wrote: >> > This fix does not work because @MIDCONFIG_FILE@ in php_midgard.h does >> > not substituted by PHP_OUTPUT using template file php_midgard.h.in. >> > Either fix building environment in PHP4 which does not allow output >> > variable's value through template header file for extensions or revert >> > change back. That change was tested before commit. >> >> Well, it wasn't tested well enough. I am against reverting it, because >> it completely breaks the build. >Andrei, problem is that build environment needs to be fixed, not module alone. >This is really serious problem because it prevents people from using Midgard >extension with, say, PHP 4.0.4pl1 (latest stable PHP4 version) though >they could do it (there are no dependencies on PHP 4.0.5 in Midgard extension). > Uh. This comes back to the fact that this extension shouldn't even be in PHP CVS. Where's that PEAR thing? :) Still, you should not break the whole build by just getting ONE extension to work. I don't think midgard is that important. As I stated in my commit comment, read the README.CVS-RULES. They are to be followed. ie. ASK before commit..TEST before commit. If unsure -> DO NOT commit. --Jani -- 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 /ext/midgard config.m4
On Mon, 19 Mar 2001, Alexander Bokovoy wrote: >>fi >>PHP_SUBST(MIDCONFIG_FILE) >> - AC_SUBST(MIDCONFIG_FILE) >> - AC_OUTPUT(php_midgard.h, [], []) >> + PHP_OUTPUT(php_midgard.h, [], []) >>AC_DEFINE(HAVE_MIDGARD, 1, [ ]) >>PHP_EXTENSION(midgard, $ext_shared) >> fi >This fix does not work because @MIDCONFIG_FILE@ in php_midgard.h does >not substituted by PHP_OUTPUT using template file php_midgard.h.in. >Either fix building environment in PHP4 which does not allow output >variable's value through template header file for extensions or revert >change back. That change was tested before commit. Eh? Did you test WITHOUT having --with-midgard in your configure line? I bet you didn't. --Jani -- 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 /ext/midgard config.m4
On Tue, 20 Mar 2001, Zeev Suraski wrote: >> > Not a problem for me. But how is PEAR being made available, then? >> >>We still don't have a good framework for having PEAR extensions that >>contain PHP extensions written in C in them. That was always the goal, it >>just hasn't been done yet. And yes, I concur with most others here, when >>that gets finished, the midgard stuff belongs there. > >It probably won't get finished until people start using it. The midgard >people may be the right people for the job :) One question about this: Could we setup a separate module for Pear in the CVS? As now it's also 'bundled' with php. --Jani -- 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/cybermut libs.mk
sniper Mon Mar 19 17:06:25 2001 EDT Removed files: /php4/ext/cybermut libs.mk Log: Removed unnessary file. -- 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/xml/tests 004.phpt 006.phpt skipif.php
sniper Mon Mar 19 17:22:07 2001 EDT
Removed files:
/php4/ext/xml/tests skipif.php
Modified files:
/php4/ext/xml/tests 004.phpt 006.phpt
Log:
Removed skipif.php + Fixed tests to use skipif.inc instead.
Index: php4/ext/xml/tests/004.phpt
diff -u php4/ext/xml/tests/004.phpt:1.1 php4/ext/xml/tests/004.phpt:1.2
--- php4/ext/xml/tests/004.phpt:1.1 Tue Aug 29 18:58:58 2000
+++ php4/ext/xml/tests/004.phpt Mon Mar 19 17:22:07 2001
@@ -1,7 +1,7 @@
--TEST--
XML parser case folding test
--SKIPIF--
-
+
--FILE--
ISO Latin 1 encoding/decoding test
--SKIPIF--
-
+
--FILE--
%s\n", urlencode("æ"), urlencode(utf8_encode("æ")));
--
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(PHP_4_0_5) /ext/fdf fdf.c
sniper Mon Mar 19 17:32:28 2001 EDT
Modified files: (Branch: PHP_4_0_5)
/php4/ext/fdf fdf.c
Log:
MFH
Index: php4/ext/fdf/fdf.c
diff -u php4/ext/fdf/fdf.c:1.39 php4/ext/fdf/fdf.c:1.39.2.1
--- php4/ext/fdf/fdf.c:1.39 Sun Feb 25 22:06:54 2001
+++ php4/ext/fdf/fdf.c Mon Mar 19 17:32:28 2001
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fdf.c,v 1.39 2001/02/26 06:06:54 andi Exp $ */
+/* $Id: fdf.c,v 1.39.2.1 2001/03/20 01:32:28 sniper Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -108,11 +108,13 @@
(void)FDFClose(fdf);
}
-static sapi_post_entry supported_post_entries[] = {
-#if HAVE_FDFLIB
- { "application/vnd.fdf",sizeof("application/vnd.fdf")-1,
php_default_post_reader, fdf_post_handler},
-#endif
- { NULL, 0, NULL }
+#define FDF_POST_CONTENT_TYPE "application/vnd.fdf"
+
+static sapi_post_entry php_fdf_post_entry ={
+ FDF_POST_CONTENT_TYPE,
+ sizeof(FDF_POST_CONTENT_TYPE)-1,
+ sapi_read_standard_form_data,
+ fdf_post_handler
};
@@ -123,9 +125,9 @@
FDF_GLOBAL(le_fdf) = zend_register_list_destructors_ex(phpi_FDFClose, NULL,
"fdf", module_number);
/* add handler for Acrobat FDF form post requests */
- sapi_add_post_entry("application/vnd.fdf", php_default_post_reader,
fdf_post_handler);
+ sapi_register_post_entry(&php_fdf_post_entry);
- /* Constants used by fdf_set_opt() */
+ /* Constants used by fdf_set_opt() */
REGISTER_LONG_CONSTANT("FDFValue", FDFValue, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FDFStatus", FDFStatus, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FDFFile", FDFFile, CONST_CS | CONST_PERSISTENT);
@@ -176,7 +178,7 @@
FDFErc err;
/* remove handler for Acrobat FDF form post requests */
- sapi_remove_post_entry("application/vnd.fdf");
+ sapi_unregister_post_entry(&php_fdf_post_entry);
#ifdef PHP_WIN32
return SUCCESS;
@@ -769,10 +771,9 @@
char *name=NULL,*value=NULL,*p;
int name_len=0,value_len=0;
char *lastfieldname =NULL;
- char *strtok_buf = NULL;
char *filename = NULL;
FDFErc err;
- ASInt32 nBytes, datalen;
+ ASInt32 nBytes;
zval *array_ptr = (zval *) arg;
ELS_FETCH();
PLS_FETCH();
@@ -811,6 +812,7 @@
err =
FDFGetValue(theFDF,name,value,value_len-1,&nBytes);
if(err == FDFErcOK && nBytes != 0) {
for(p=value;*p;p++) if(*p=='\r') *p='\n';
+ if(lastfieldname) efree(lastfieldname);
lastfieldname = estrdup(name);
php_register_variable(name, value, array_ptr
ELS_CC PLS_CC);
}
--
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(PHP_4_0_5) / configure.in
sniper Mon Mar 19 17:38:28 2001 EDT Modified files: (Branch: PHP_4_0_5) /php4 configure.in Log: MFH Index: php4/configure.in diff -u php4/configure.in:1.221.4.1 php4/configure.in:1.221.4.2 --- php4/configure.in:1.221.4.1 Tue Mar 13 08:23:52 2001 +++ php4/configure.in Mon Mar 19 17:38:28 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.221.4.1 2001/03/13 16:23:52 zeev Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.221.4.2 2001/03/20 01:38:28 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -389,6 +389,7 @@ random \ rand_r \ regcomp \ +res_search \ setitimer \ setlocale \ localeconv \ -- 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(PHP_4_0_5) /main SAPI.c
sniper Mon Mar 19 17:42:40 2001 EDT
Modified files: (Branch: PHP_4_0_5)
/php4/main SAPI.c
Log:
MFH
Index: php4/main/SAPI.c
diff -u php4/main/SAPI.c:1.100.2.1 php4/main/SAPI.c:1.100.2.2
--- php4/main/SAPI.c:1.100.2.1 Sat Mar 17 18:36:27 2001
+++ php4/main/SAPI.cMon Mar 19 17:42:40 2001
@@ -97,7 +97,7 @@
SAPI_API void sapi_handle_post(void *arg SLS_DC)
{
- if (SG(request_info).post_entry) {
+ if (SG(request_info).post_entry && SG(request_info).content_type_dup) {
SG(request_info).post_entry->post_handler(SG(request_info).content_type_dup, arg
SLS_CC);
if (SG(request_info).post_data) {
efree(SG(request_info).post_data);
--
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(PHP_4_0_5) /ext/standard basic_functions.c dns.c dns.h
sniper Mon Mar 19 17:49:56 2001 EDT
Modified files: (Branch: PHP_4_0_5)
/php4/ext/standard basic_functions.c dns.c dns.h
Log:
MFH
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.315
php4/ext/standard/basic_functions.c:1.315.2.1
--- php4/ext/standard/basic_functions.c:1.315 Sun Mar 11 19:06:53 2001
+++ php4/ext/standard/basic_functions.c Mon Mar 19 17:49:56 2001
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.315 2001/03/12 03:06:53 andrei Exp $ */
+/* $Id: basic_functions.c,v 1.315.2.1 2001/03/20 01:49:56 sniper Exp $ */
#include "php.h"
#include "php_main.h"
@@ -247,7 +247,7 @@
PHP_FE(gethostbyaddr, NULL)
PHP_FE(gethostbyname, NULL)
PHP_FE(gethostbynamel, NULL)
-#if HAVE_LIBBIND && !(defined(__BEOS__)||defined(PHP_WIN32))
+#if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32))
PHP_FE(checkdnsrr,
NULL)
PHP_FE(getmxrr,
second_and_third_args_force_ref)
#else
Index: php4/ext/standard/dns.c
diff -u php4/ext/standard/dns.c:1.27 php4/ext/standard/dns.c:1.27.2.1
--- php4/ext/standard/dns.c:1.27Sat Mar 10 19:49:21 2001
+++ php4/ext/standard/dns.c Mon Mar 19 17:49:56 2001
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dns.c,v 1.27 2001/03/11 03:49:21 sniper Exp $ */
+/* $Id: dns.c,v 1.27.2.1 2001/03/20 01:49:56 sniper Exp $ */
#include "php.h"
#if HAVE_SYS_SOCKET_H
@@ -167,7 +167,7 @@
return estrdup(inet_ntoa(in));
}
-#if HAVE_LIBBIND && !(defined(__BEOS__)||defined(PHP_WIN32))
+#if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32))
/* {{{ proto int checkdnsrr(string host [, string type])
Check DNS records corresponding to a given Internet host name or IP address */
Index: php4/ext/standard/dns.h
diff -u php4/ext/standard/dns.h:1.8 php4/ext/standard/dns.h:1.8.2.1
--- php4/ext/standard/dns.h:1.8 Sat Mar 10 19:49:21 2001
+++ php4/ext/standard/dns.h Mon Mar 19 17:49:56 2001
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dns.h,v 1.8 2001/03/11 03:49:21 sniper Exp $ */
+/* $Id: dns.h,v 1.8.2.1 2001/03/20 01:49:56 sniper Exp $ */
#ifndef DNS_H
#define DNS_H
@@ -25,7 +25,8 @@
PHP_FUNCTION(gethostbyaddr);
PHP_FUNCTION(gethostbyname);
PHP_FUNCTION(gethostbynamel);
-#if !defined(PHP_WIN32)||(HAVE_LIBBIND)
+
+#if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32))
PHP_FUNCTION(checkdnsrr);
PHP_FUNCTION(getmxrr);
#endif
--
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(PHP_4_0_5) /sapi/fastcgi CREDITS Makefile.inREADME.FastCGI config.m4 fastcgi.c php.sym php_fastcgi.h
On Tue, 20 Mar 2001, Andi Gutmans wrote: >andi Tue Mar 20 10:13:21 2001 EDT > > Added files: (Branch: PHP_4_0_5) >/php4/sapi/fastcgi CREDITS Makefile.in README.FastCGI config.m4 > fastcgi.c php.sym php_fastcgi.h > Log: > - MFH > Are you sure you want to include this in 4.0.5? It was just added into the repository. --Jani -- 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 /ext/odbc php_odbc.c
On Mon, 16 Apr 2001, Sterling Hughes wrote:
>>
>> -#ifndef HAVE_DBMAKER
>> -if ((*pv_onoff)) {
>> -#else
>> if (pv_onoff && (*pv_onoff)) {
>> -#endif
>> convert_to_long_ex(pv_onoff);
>> rc = SQLSetConnectOption(conn->hdbc, SQL_AUTOCOMMIT,
>>
>((*pv_onoff)->value.lval) ?
>>
>
>This should be breaking something, no?
>
>Either way an "if" statement is started therefore it needs to be finished.
>
Maybe you should get thicker glasses? :)
#ifndef <-- see this ? :-p
--Jani
--
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(PHP_4_0_5) / configure.in
sniper Sun Apr 22 23:36:51 2001 EDT Modified files: (Branch: PHP_4_0_5) /php4 configure.in Log: MFH Index: php4/configure.in diff -u php4/configure.in:1.221.4.9 php4/configure.in:1.221.4.10 --- php4/configure.in:1.221.4.9 Mon Apr 2 14:09:21 2001 +++ php4/configure.in Sun Apr 22 23:36:51 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.221.4.9 2001/04/02 21:09:21 andi Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.221.4.10 2001/04/23 06:36:51 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -252,7 +252,7 @@ dnl Only include libbind if inet_aton is not found in dnl libresolv. -AC_CHECK_LIB(resolv, inet_aton. [], [ +AC_CHECK_LIB(resolv, inet_aton, [], [ AC_CHECK_LIB(bind, inet_aton, [], [ AC_CHECK_LIB(bind, __inet_aton) ]) -- 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 / configure.in
sniper Mon Apr 23 00:32:36 2001 EDT Modified files: /php4 configure.in Log: Fixed bugs: #10194, #9177. Index: php4/configure.in diff -u php4/configure.in:1.237 php4/configure.in:1.238 --- php4/configure.in:1.237 Sun Apr 22 23:00:43 2001 +++ php4/configure.in Mon Apr 23 00:32:35 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.237 2001/04/23 06:00:43 rasmus Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.238 2001/04/23 07:32:35 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -240,10 +240,6 @@ fi -AC_CHECK_LIB(crypt, crypt, [ - PHP_ADD_LIBRARY(crypt) - AC_DEFINE(HAVE_LIBCRYPT,1,[ ]) ], []) - AC_CHECK_LIB(dl, dlopen,[PHP_ADD_LIBRARY(dl)]) dnl The sin may be in a library which need not be specifed @@ -600,6 +596,12 @@ if test "$PHP_PHP_STREAMS" = "yes"; then AC_DEFINE(HAVE_PHP_STREAM, 1, [Whether to use php streams]) fi + +AC_CHECK_LIB(crypt, crypt, [ + PHP_ADD_LIBRARY(crypt) + AC_DEFINE(HAVE_LIBCRYPT,1,[ ]) + AC_DEFINE(HAVE_CRYPT,1,[ ]) +], []) divert(5) -- 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] Question: Should exit() print out the integer exit-status?
background information: http://bugs.php.net/bug.php?edit=1&id=11008 http://bugs.php.net/bug.php?edit=1&id=14574 exit() function is broken. Fixing the broken behaviour is the only real solution, IMO. One solution: - When passed argument is string: print out this string - When passed argument is integer: Don't print it, use it as exit-status This is what is the expected behaviour is and I really can't think of any good examples where this would fail. Nobody ever gave any. And to get the REAL users (not only Zeev's opinion) I'm sending this also to php-general. >From manual: "The exit() function terminates execution of the script. It prints status just before exiting. If status is an integer, that value will be used as exit-status." This can be understood in many ways. If the status is integer, it is used as exit-status..but it's not clear that it's ALSO printed out which is simply buggy behaviour. Now, if general concencus amongs the users of PHP is that it should also print out the exit-status when it's an integer then 'shell_exit()' function should be added. --Jani -- 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]
Re: [PHP-CVS] cvs: php4 /ext/domxml php_domxml.c
When I still remember..I'm getting a lot of error messages into
my error_log, e.g.:
Unknown(0) : Warning - Constant xpath_boolean already defined
And I think you have PHP_MINIT and PHP_RINIT mixed..
ie.
Index: php_domxml.c
===
RCS file: /repository/php4/ext/domxml/php_domxml.c,v
retrieving revision 1.33
diff -u -r1.33 php_domxml.c
--- php_domxml.c2001/03/22 06:58:13 1.33
+++ php_domxml.c2001/03/22 12:13:37
@@ -667,12 +667,12 @@
return(wrapper);
}
-PHP_MINIT_FUNCTION(domxml)
+PHP_RINIT_FUNCTION(domxml)
{
return SUCCESS;
}
-PHP_RINIT_FUNCTION(domxml)
+PHP_MINIT_FUNCTION(domxml)
{
zend_class_entry ce;
le_domxmldocp =
zend_register_list_destructors_ex(php_free_xml_doc, NULL, "domdocument",
module_number);
--
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/sockets sockets.c
sniper Thu Mar 22 05:16:58 2001 EDT
Modified files:
/php4/ext/sockets sockets.c
Log:
Fix bugs: #9920, #9190
Index: php4/ext/sockets/sockets.c
diff -u php4/ext/sockets/sockets.c:1.32 php4/ext/sockets/sockets.c:1.33
--- php4/ext/sockets/sockets.c:1.32 Sun Feb 25 22:07:16 2001
+++ php4/ext/sockets/sockets.c Thu Mar 22 05:16:58 2001
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: sockets.c,v 1.32 2001/02/26 06:07:16 andi Exp $ */
+/* $Id: sockets.c,v 1.33 2001/03/22 13:16:58 sniper Exp $ */
#include "php.h"
@@ -1130,6 +1130,7 @@
if (sock_type->sa_family == AF_UNIX) {
struct sockaddr_un *sa = (struct sockaddr_un *) sock_type;
memset(sa, 0, sizeof(sa_storage)); /* This is safe -> sock_type =
&sa_storage -> sa = sock_type */
+ sa->sun_family = AF_UNIX;
snprintf(sa->sun_path, 108, "%s", Z_STRVAL_PP(arg1));
ret = bind(Z_LVAL_PP(arg0), (struct sockaddr *) sa, SUN_LEN(sa));
} else if (sock_type->sa_family == AF_INET) {
--
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(PHP_4_0_5) /ext/sockets sockets.c
sniper Thu Mar 22 05:20:35 2001 EDT
Modified files: (Branch: PHP_4_0_5)
/php4/ext/sockets sockets.c
Log:
MFH
Index: php4/ext/sockets/sockets.c
diff -u php4/ext/sockets/sockets.c:1.32 php4/ext/sockets/sockets.c:1.32.2.1
--- php4/ext/sockets/sockets.c:1.32 Sun Feb 25 22:07:16 2001
+++ php4/ext/sockets/sockets.c Thu Mar 22 05:20:35 2001
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: sockets.c,v 1.32 2001/02/26 06:07:16 andi Exp $ */
+/* $Id: sockets.c,v 1.32.2.1 2001/03/22 13:20:35 sniper Exp $ */
#include "php.h"
@@ -1130,6 +1130,7 @@
if (sock_type->sa_family == AF_UNIX) {
struct sockaddr_un *sa = (struct sockaddr_un *) sock_type;
memset(sa, 0, sizeof(sa_storage)); /* This is safe -> sock_type =
&sa_storage -> sa = sock_type */
+ sa->sun_family = AF_UNIX;
snprintf(sa->sun_path, 108, "%s", Z_STRVAL_PP(arg1));
ret = bind(Z_LVAL_PP(arg0), (struct sockaddr *) sa, SUN_LEN(sa));
} else if (sock_type->sa_family == AF_INET) {
--
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/ldap config.m4
sniper Mon Mar 26 02:30:48 2001 EDT Modified files: /php4/ext/ldap config.m4 Log: Support Solaris 8 ldap. Index: php4/ext/ldap/config.m4 diff -u php4/ext/ldap/config.m4:1.14 php4/ext/ldap/config.m4:1.15 --- php4/ext/ldap/config.m4:1.14Sun Mar 11 18:06:06 2001 +++ php4/ext/ldap/config.m4 Mon Mar 26 02:30:48 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.14 2001/03/12 02:06:06 sniper Exp $ +dnl $Id: config.m4,v 1.15 2001/03/26 10:30:48 sniper Exp $ AC_DEFUN(PHP_LDAP_CHECKS, [ if test -f $1/include/ldap.h; then @@ -48,6 +48,9 @@ if test -f $LDAP_LIBDIR/liblber.a -o -f $LDAP_LIBDIR/liblber.so -o -f $LDAP_LIBDIR/liblber.sl; then AC_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) +AC_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + + elif test -f $LDAP_LIBDIR/libldap.so.3; then AC_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) elif test -f $LDAP_LIBDIR/libldapssl41.so -o -f $LDAP_LIBDIR/libldapssl41.sl; then -- 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 / configure.in
sniper Mon Mar 26 13:34:59 2001 EDT Modified files: /php4 configure.in Log: Fixed the problem with libbind (again). Index: php4/configure.in diff -u php4/configure.in:1.224 php4/configure.in:1.225 --- php4/configure.in:1.224 Thu Mar 22 20:56:51 2001 +++ php4/configure.in Mon Mar 26 13:34:59 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.224 2001/03/23 04:56:51 svanegmond Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.225 2001/03/26 21:34:59 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -253,9 +253,10 @@ AC_CHECK_LIB(bind, inet_aton, [ AC_ADD_LIBRARY(bind) AC_DEFINE(HAVE_LIBBIND,1,[Whether you have bind]) ], [ -AC_CHECK_LIB(resolv, inet_aton) +AC_CHECK_LIB(bind, __inet_aton, [], [ + AC_CHECK_LIB(resolv, inet_aton) +]) ]) -AC_CHECK_LIB(bind, __inet_aton) dnl The res_search may be in libsocket as well, and if it is -- 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/domxml php_domxml.c
sniper Mon Mar 26 13:42:02 2001 EDT
Modified files:
/php4/ext/domxmlphp_domxml.c
Log:
Fixed a typo.
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.33 php4/ext/domxml/php_domxml.c:1.34
--- php4/ext/domxml/php_domxml.c:1.33 Wed Mar 21 22:58:13 2001
+++ php4/ext/domxml/php_domxml.cMon Mar 26 13:42:01 2001
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_domxml.c,v 1.33 2001/03/22 06:58:13 steinm Exp $ */
+/* $Id: php_domxml.c,v 1.34 2001/03/26 21:42:01 sniper Exp $ */
#include "php.h"
@@ -667,12 +667,12 @@
return(wrapper);
}
-PHP_MINIT_FUNCTION(domxml)
+PHP_RINIT_FUNCTION(domxml)
{
return SUCCESS;
}
-PHP_RINIT_FUNCTION(domxml)
+PHP_MINIT_FUNCTION(domxml)
{
zend_class_entry ce;
le_domxmldocp = zend_register_list_destructors_ex(php_free_xml_doc, NULL,
"domdocument", module_number);
--
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_variables.c
sniper Tue Mar 27 03:34:51 2001 EDT
Modified files:
/php4/main php_variables.c
Log:
Fix the arg_separator behaviour. Only & or ; is allowed as separators so no need to
use the ini setting here.
Index: php4/main/php_variables.c
diff -u php4/main/php_variables.c:1.21 php4/main/php_variables.c:1.22
--- php4/main/php_variables.c:1.21 Sun Feb 25 22:07:31 2001
+++ php4/main/php_variables.c Tue Mar 27 03:34:51 2001
@@ -277,13 +277,7 @@
return;
}
- if (arg == PARSE_COOKIE) {
- var = php_strtok_r(res, ";", &strtok_buf);
- } else if (arg == PARSE_POST) {
- var = php_strtok_r(res, "&", &strtok_buf);
- } else {
- var = php_strtok_r(res, PG(arg_separator), &strtok_buf);
- }
+ var = php_strtok_r(res, ";&", &strtok_buf);
while (var) {
val = strchr(var, '=');
@@ -294,18 +288,13 @@
php_url_decode(var, strlen(var));
val_len = php_url_decode(val, strlen(val));
php_register_variable_safe(var, val, val_len, array_ptr ELS_CC
PLS_CC);
- }
- if (arg == PARSE_COOKIE) {
- var = php_strtok_r(NULL, ";", &strtok_buf);
- } else {
- var = php_strtok_r(NULL, PG(arg_separator), &strtok_buf);
}
+ var = php_strtok_r(NULL, ";&", &strtok_buf);
}
if (free_buffer) {
efree(res);
}
}
-
void php_import_environment_variables(zval *array_ptr ELS_DC PLS_DC)
--
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(PHP_4_0_5) /main php_variables.c
sniper Tue Mar 27 06:03:03 2001 EDT
Modified files: (Branch: PHP_4_0_5)
/php4/main php_variables.c
Log:
MFH
Index: php4/main/php_variables.c
diff -u php4/main/php_variables.c:1.21 php4/main/php_variables.c:1.21.2.1
--- php4/main/php_variables.c:1.21 Sun Feb 25 22:07:31 2001
+++ php4/main/php_variables.c Tue Mar 27 06:03:03 2001
@@ -277,13 +277,7 @@
return;
}
- if (arg == PARSE_COOKIE) {
- var = php_strtok_r(res, ";", &strtok_buf);
- } else if (arg == PARSE_POST) {
- var = php_strtok_r(res, "&", &strtok_buf);
- } else {
- var = php_strtok_r(res, PG(arg_separator), &strtok_buf);
- }
+ var = php_strtok_r(res, ";&", &strtok_buf);
while (var) {
val = strchr(var, '=');
@@ -294,18 +288,13 @@
php_url_decode(var, strlen(var));
val_len = php_url_decode(val, strlen(val));
php_register_variable_safe(var, val, val_len, array_ptr ELS_CC
PLS_CC);
- }
- if (arg == PARSE_COOKIE) {
- var = php_strtok_r(NULL, ";", &strtok_buf);
- } else {
- var = php_strtok_r(NULL, PG(arg_separator), &strtok_buf);
}
+ var = php_strtok_r(NULL, ";&", &strtok_buf);
}
if (free_buffer) {
efree(res);
}
}
-
void php_import_environment_variables(zval *array_ptr ELS_DC PLS_DC)
--
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 / acinclude.m4 configure.in /ext/aspell config.m4 /ext/bz2 config.m4 /ext/ccvs config.m4 /ext/cpdf config.m4 /ext/crack config.m4 /ext/curl config.m4 /ext/cybercash config.m4 /ext/cybermut config.m4 /ext/dba config.m4 /ext/domxml config.m4 /ext/fbsql config.m4 /ext/fdf config.m4 /ext/fribidi config.m4 /ext/gd config.m4 /ext/gettext config.m4 /ext/gmp config.m4 /ext/icap config.m4 /ext/iconv config.m4 /ext/imap config.m4 /ext/informix config.m4 /ext/ingres_ii config.m4 /ext/interbase config.m4 /ext/ircg config.m4 /ext/java config.m4 /ext/ldap config.m4 /ext/mcal config.m4 /ext/mcrypt config.m4 /ext/mhash config.m4 /ext/midgard config.m4 config.m4.session /ext/ming config.m4 /ext/mnogosearch config.m4 /ext/msql config.m4 /ext/muscat config.m4 /ext/mysql config.m4 /ext/oci8 config.m4 /ext/odbc config.m4 /ext/oracle config.m4 /ext/ovrimos config.m4 /ext/pcre config.m4 /ext/pdf config.m4 /ext/pfpro config.m4 /ext/pgsql config.m4 /ext/pspell config.m4 /ext/qtdom config.m4 /ext/readline config.m4 /ext/recode config.m4 /ext/sablot config.m4 /ext/session config.m4 /ext/snmp config.m4 /ext/swf config.m4 /ext/sybase config.m4 /ext/sybase_ct config.m4 /ext/vpopmail config.m4 /ext/xml config.m4 /ext/zlib config.m4 /ext/zziplib config.m4 /sapi/aolserver config.m4 /sapi/apache config.m4 /sapi/apache2filter config.m4 /sapi/caudium config.m4 /sapi/fastcgi config.m4 /sapi/isapi config.m4 /sapi/nsapi config.m4 /sapi/phttpd config.m4 /sapi/pi3web config.m4 /sapi/roxen config.m4 /sapi/thttpd config.m4
sniper Tue Mar 27 12:34:51 2001 EDT Modified files: /php4 acinclude.m4 configure.in /php4/ext/aspellconfig.m4 /php4/ext/bz2 config.m4 /php4/ext/ccvs config.m4 /php4/ext/cpdf config.m4 /php4/ext/crack config.m4 /php4/ext/curl config.m4 /php4/ext/cybercash config.m4 /php4/ext/cybermut config.m4 /php4/ext/dba config.m4 /php4/ext/domxmlconfig.m4 /php4/ext/fbsql config.m4 /php4/ext/fdf config.m4 /php4/ext/fribidi config.m4 /php4/ext/gdconfig.m4 /php4/ext/gettext config.m4 /php4/ext/gmp config.m4 /php4/ext/icap config.m4 /php4/ext/iconv config.m4 /php4/ext/imap config.m4 /php4/ext/informix config.m4 /php4/ext/ingres_ii config.m4 /php4/ext/interbase config.m4 /php4/ext/ircg config.m4 /php4/ext/java config.m4 /php4/ext/ldap config.m4 /php4/ext/mcal config.m4 /php4/ext/mcryptconfig.m4 /php4/ext/mhash config.m4 /php4/ext/midgard config.m4 config.m4.session /php4/ext/ming config.m4 /php4/ext/mnogosearch config.m4 /php4/ext/msql config.m4 /php4/ext/muscatconfig.m4 /php4/ext/mysql config.m4 /php4/ext/oci8 config.m4 /php4/ext/odbc config.m4 /php4/ext/oracleconfig.m4 /php4/ext/ovrimos config.m4 /php4/ext/pcre config.m4 /php4/ext/pdf config.m4 /php4/ext/pfpro config.m4 /php4/ext/pgsql config.m4 /php4/ext/pspellconfig.m4 /php4/ext/qtdom config.m4 /php4/ext/readline config.m4 /php4/ext/recodeconfig.m4 /php4/ext/sablotconfig.m4 /php4/ext/session config.m4 /php4/ext/snmp config.m4 /php4/ext/swf config.m4 /php4/ext/sybaseconfig.m4 /php4/ext/sybase_ct config.m4 /php4/ext/vpopmail config.m4 /php4/ext/xml config.m4 /php4/ext/zlib config.m4 /php4/ext/zziplib config.m4 /php4/sapi/aolserverconfig.m4 /php4/sapi/apache config.m4 /php4/sapi/apache2filterconfig.m4 /php4/sapi/caudium config.m4 /php4/sapi/fastcgi config.m4 /php4/sapi/isapiconfig.m4 /php4/sapi/nsapiconfig.m4 /php4/sapi/phttpd config.m4 /php4/sapi/pi3web config.m4 /php4/sapi/roxenconfig.m4 /php4/sapi/thttpd config.m4 Log: Renamed the AC_ prefixed macros defined in acinclude.m4 to PHP_* prefixes. # Heads up people! I tested this before committing but you never know.. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.121 php4/acinclude.m4:1.122 --- php4/acinclude.m4:1.121 Tue Feb 20 23:39:13 2001 +++ php4/acinclude.m4 Tue Mar 27 12:34:20 2001 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.121 2001/02/21 07:39:13 sas Exp $ +dnl $Id: acinclude.m4,v 1.122 2001/03/27 20:34:20 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -35,20 +35,20 @@ ]) CPPFLAGS=$old_CPPFLAGS - AC_ADD_LIBPATH($OPENSSL_DIR/lib) + PHP_ADD_LIBPATH($OPENSSL_DIR/lib) AC_CHECK_LIB(crypto, CRYPTO_free, [ -AC_ADD_LIBRARY(crypto) +PHP_ADD_LIBRARY(crypto) ],[ AC_MSG_ERROR(libcrypto not found!) ]) AC_CHECK_LIB(ssl, SSL_CTX_set_ssl_version, [ -AC_ADD_LIBRARY(ssl) +PHP_ADD_LIBRARY(ssl) ],[ AC_MSG_ERROR(libssl not found!) ]) - AC_ADD_INCLUDE($OPENSSL_INC) + PHP_ADD_INCLUDE($OPENSSL_INC) ]) dnl PHP_EVAL_LIBLINE(LINE, SHARED-LIBADD) @@ -62,11 +62,11 @@ case "$ac_i" in -l*) ac_ii=`echo $ac_i|cut -c 3-` - AC_ADD_LIBRARY($ac_ii,,$2) + PHP_ADD_LIBRARY($ac_ii,,$2) ;; -L*) ac_ii=`echo $ac_i|cut -c 3-` - AC_ADD_LIBPATH($ac_ii,$2) + PHP_ADD_LIBPATH($ac_ii,$2) ;; esac done @@ -82,7 +82,7 @@ case "$ac_i" in -I*) ac_ii=`echo $ac_i|cut -c 3-` - AC_ADD_INCLUDE($ac_ii) + PHP_ADD_INCLUDE($ac_ii) ;; esac done @@ -522,11 +522,11 @@ ]) dnl -dnl AC_EXPAND_PATH(path, variable) +dnl PHP_EXPAND_PATH(path, variable) dnl dnl expands path to an absolute path and assigns it to variable dnl -AC_DEFUN(AC_EXPAND_PATH,[ +AC_DEFUN(PHP_EXPAND_PATH,[ if test -z "$1" || echo "$1" | grep '^/' >/dev/null ; then $2="$1" else @@ -539,13 +539,13 @@ ]) dnl -dnl AC_ADD_LIBPATH(path[, shared-libadd]) +dnl PHP_ADD_LIBPATH(path[, shared-libadd]) dnl dnl add a library to linkpath/runpath dnl -AC_DEFUN(AC_ADD_LIBPATH,[ +AC_DEFUN(PHP_ADD_LIBPATH,[ if test "$1" != "/usr/lib"; then -AC_EXPAND_PATH($1, ai_p) +PHP_EXPAND_PATH($1, ai_p) if test "$ext_shared" = "yes" && test -n "$2"; then $2="-R$1 -L$1 [$]$2" else @@ -559,11 +559,11 @@ ]) dnl -dnl AC_BUILD_RPATH() +dnl PHP_BUILD_RPATH() dnl dnl builds RPATH from PHP_RPATHS dnl -AC_DEFUN(AC_BUILD_RPATH,[ +AC_DEFUN(PHP_BUILD_RPATH,[ if test
[PHP-CVS] cvs: php4 / configure.in
sniper Wed Mar 28 14:30:22 2001 EDT Modified files: /php4 configure.in Log: Make file() work again. # For some reason if libbind is linked with PHP the file() function # won't work with URLs. Do we even need libbind? Index: php4/configure.in diff -u php4/configure.in:1.226 php4/configure.in:1.227 --- php4/configure.in:1.226 Tue Mar 27 12:34:22 2001 +++ php4/configure.in Wed Mar 28 14:30:21 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.226 2001/03/27 20:34:22 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.227 2001/03/28 22:30:21 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -250,14 +250,13 @@ dnl as well as res_search resides in libsocket AC_CHECK_LIB(m, sin) -AC_CHECK_LIB(bind, inet_aton, [ - PHP_ADD_LIBRARY(bind) - AC_DEFINE(HAVE_LIBBIND,1,[Whether you have bind]) ], [ -AC_CHECK_LIB(bind, __inet_aton, [], [ - AC_CHECK_LIB(resolv, inet_aton) -]) +dnl Only include libbind if inet_aton is not found in +dnl libresolv. +AC_CHECK_LIB(resolv, inet_aton. [], [ + AC_CHECK_LIB(bind, inet_aton, [], [ +AC_CHECK_LIB(bind, __inet_aton) ]) - +]) dnl The res_search may be in libsocket as well, and if it is dnl make sure to check for dn_skipname in libresolv, or if res_search -- 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(PHP_4_0_5) / configure.in /ext/ming config.m4 ming.c
sniper Wed Mar 28 15:19:45 2001 EDT
Modified files: (Branch: PHP_4_0_5)
/php4 configure.in
/php4/ext/ming ming.c config.m4
Log:
MFH
Index: php4/configure.in
diff -u php4/configure.in:1.221.4.5 php4/configure.in:1.221.4.6
--- php4/configure.in:1.221.4.5 Wed Mar 28 05:36:51 2001
+++ php4/configure.in Wed Mar 28 15:19:44 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.221.4.5 2001/03/28 13:36:51 zeev Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.221.4.6 2001/03/28 23:19:44 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -107,7 +107,8 @@
*bsdi*)
BSD_MAKEFILE=yes;;
*beos*)
- LIBS="$LIBS -lbe -lroot"
+ beos_threads=1
+ LIBS="$LIBS -lbe -lroot";;
esac
AM_PROG_CC_STDC
@@ -249,11 +250,13 @@
dnl as well as res_search resides in libsocket
AC_CHECK_LIB(m, sin)
-AC_CHECK_LIB(bind, inet_aton, [
- AC_ADD_LIBRARY(bind)
- AC_DEFINE(HAVE_LIBBIND,1,[Whether you have bind]) ], [
-AC_CHECK_LIB(resolv, inet_aton)
- ])
+dnl Only include libbind if inet_aton is not found in
+dnl libresolv.
+AC_CHECK_LIB(resolv, inet_aton. [], [
+ AC_CHECK_LIB(bind, inet_aton, [], [
+AC_CHECK_LIB(bind, __inet_aton)
+ ])
+])
dnl The res_search may be in libsocket as well, and if it is
dnl make sure to check for dn_skipname in libresolv, or if res_search
Index: php4/ext/ming/ming.c
diff -u php4/ext/ming/ming.c:1.3 php4/ext/ming/ming.c:1.3.2.1
--- php4/ext/ming/ming.c:1.3Mon Mar 12 17:57:38 2001
+++ php4/ext/ming/ming.cWed Mar 28 15:19:44 2001
@@ -23,6 +23,7 @@
#if HAVE_MING
#include "ext/standard/info.h"
+#include "ext/standard/file.h"
#include "php_ming.h"
static zend_function_entry ming_functions[] = {
@@ -2955,7 +2956,9 @@
CONSTANT("SWFTEXTFIELD_WORDWRAP", SWFTEXTFIELD_WORDWRAP);
CONSTANT("SWFTEXTFIELD_DRAWBOX",SWFTEXTFIELD_DRAWBOX);
CONSTANT("SWFTEXTFIELD_NOSELECT", SWFTEXTFIELD_NOSELECT);
+#ifdef SWFTEXTFIELD_HTML
CONSTANT("SWFTEXTFIELD_HTML", SWFTEXTFIELD_HTML);
+#endif
/* flags for SWFTextField_align */
CONSTANT("SWFTEXTFIELD_ALIGN_LEFT", SWFTEXTFIELD_ALIGN_LEFT);
Index: php4/ext/ming/config.m4
diff -u php4/ext/ming/config.m4:1.2 php4/ext/ming/config.m4:1.2.2.1
--- php4/ext/ming/config.m4:1.2 Sat Jan 27 02:05:29 2001
+++ php4/ext/ming/config.m4 Wed Mar 28 15:19:44 2001
@@ -1,15 +1,12 @@
-dnl $Id: config.m4,v 1.2 2001/01/27 10:05:29 sas Exp $
+dnl $Id: config.m4,v 1.2.2.1 2001/03/28 23:19:44 sniper Exp $
dnl config.m4 for extension libming
-dnl don't forget to call PHP_EXTENSION(ming)
-dnl This file is a modified version of config.m4
-dnl in php4/ext/mcrypt
-PHP_ARG_WITH(ming, for ming support,
+PHP_ARG_WITH(ming, whether to include ming support,
[ --with-ming[=DIR]Include ming support])
if test "$PHP_MING" != "no"; then
- for i in /usr/lib /usr/local /usr $PHP_MING; do
-if test -r $i/libming.so; then
+ for i in $PHP_MING /usr/local /usr; do
+if test -r $i/lib/libming.so; then
MING_DIR=$i
fi
done
@@ -18,11 +15,16 @@
AC_MSG_ERROR(Please reinstall libming.so - I cannot find libming.so)
fi
- AC_ADD_INCLUDE($MING_DIR)
+ AC_ADD_INCLUDE($MING_DIR/include)
PHP_SUBST(MING_SHARED_LIBADD)
- AC_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR, MING_SHARED_LIBADD)
- AC_DEFINE(HAVE_MING,1,[ ])
+ AC_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD)
+
+ AC_CHECK_LIB(ming, Ming_setScale, [
+AC_DEFINE(HAVE_MING,1,[ ])
+ ],[
+AC_MSG_ERROR(Ming library 0.1.0 or greater required.)
+ ])
PHP_EXTENSION(ming, $ext_shared)
fi
--
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/domxml php_domxml.c
sniper Wed Mar 28 16:22:45 2001 EDT
Modified files:
/php4/ext/domxmlphp_domxml.c
Log:
Fixed bug: #10040.
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.34 php4/ext/domxml/php_domxml.c:1.35
--- php4/ext/domxml/php_domxml.c:1.34 Mon Mar 26 13:42:01 2001
+++ php4/ext/domxml/php_domxml.cWed Mar 28 16:22:45 2001
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_domxml.c,v 1.34 2001/03/26 21:42:01 sniper Exp $ */
+/* $Id: php_domxml.c,v 1.35 2001/03/29 00:22:45 sniper Exp $ */
#include "php.h"
@@ -110,7 +110,7 @@
static function_entry php_domxmldoc_class_functions[] = {
-// PHP_FALIAS(domdocument, xmldoc, NULL)
+/* PHP_FALIAS(domdocument, xmldoc, NULL) */
{"domdocument", PHP_FN(xmldoc), NULL},
PHP_FALIAS(doctype, domxml_doc_doctype, NULL)
PHP_FALIAS(implementation, domxml_doc_implementation, NULL)
@@ -493,8 +493,8 @@
php_error(E_ERROR, "Underlying object missing");
}
obj = zend_list_find(Z_LVAL_PP(handle), &type);
-// The following test should be replaced with search in all parents
- if (!obj) { // || ((type != rsrc_type1) && (type != rsrc_type2))) {
+/* The following test should be replaced with search in all parents */
+ if (!obj) { /* || ((type != rsrc_type1) && (type != rsrc_type2))) { */
php_error(E_ERROR, "Underlying object missing or of invalid type");
}
@@ -1737,9 +1737,10 @@
RETURN_FALSE;
}
-// rv = php_domobject_new(node, &ret);
-// SEPARATE_ZVAL(&rv);
-// *return_value = *rv;
+/* rv = php_domobject_new(node, &ret);
+ SEPARATE_ZVAL(&rv);
+ *return_value = *rv;
+*/
}
/* }}} */
@@ -2101,7 +2102,7 @@
}
/* }}} */
-/* {{{ proto object domxml_add_root([int doc_handle,] string name)
+/* {{{ proto object domxml_add_root(string name)
Adds root node to document */
PHP_FUNCTION(domxml_add_root)
{
@@ -2110,19 +2111,20 @@
xmlNode *nodep;
int ret;
- if (ZEND_NUM_ARGS() == 1 || getParameters(ht, 1, &name)) {
- id = getThis();
- docp = php_dom_get_object(id, le_domxmldocp, 0);
- } else {
+ if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &name)==FAILURE) {
WRONG_PARAM_COUNT;
}
+
+ id = getThis();
+ docp = php_dom_get_object(id, le_domxmldocp, 0);
convert_to_string(name);
-
+
nodep = xmlNewDocNode(docp, NULL, name->value.str.val, NULL);
if (!nodep) {
RETURN_FALSE;
}
-// xmlDocSetRootElement(docp, nodep);
+
+ xmlDocSetRootElement(docp, nodep);
rv = php_domobject_new(nodep, &ret);
SEPARATE_ZVAL(&rv);
*return_value = *rv;
@@ -2177,13 +2179,13 @@
pattr = php_domobject_new((xmlNodePtr) ns, &ret);
SEPARATE_ZVAL(&pattr);
-// if(!ret) {
+/* if(!ret) { */
if(ns->href)
add_property_stringl(pattr, "href", (char *) ns->href,
strlen(ns->href), 1);
if(ns->prefix)
add_property_stringl(pattr, "prefix", (char *)
ns->prefix, strlen(ns->prefix), 1);
add_property_long(pattr, "type", ns->type);
-// }
+/* } */
zend_hash_next_index_insert((*attributes)->value.ht, &pattr,
sizeof(zval *), NULL);
ns = ns->next;
}
@@ -2205,7 +2207,7 @@
if (!attr) {
return -1;
}
-// MAKE_STD_ZVAL(*attributes); /* could be a problem when node_attribute() is
called from domxml_attributes */
+/* MAKE_STD_ZVAL(*attributes); */ /* could be a problem when node_attribute() is
+called from domxml_attributes */
/* create an php array for the children */
/* MAKE_STD_ZVAL(*attributes); *//* Don't do this if *attributes are the
return_value */
@@ -2218,10 +2220,10 @@
int ret;
pattr = php_domobject_new((xmlNodePtr) attr, &ret);
-// if(0 <= (n = node_children(&children, attr->children))) {
-// zend_hash_update(pattr->value.obj.properties, "children",
sizeof("children"), (void *) &children, sizeof(zval *), NULL);
-// }
- add_property_string(pattr, "name", (char *) (attr->name), 1);
+/* if(0 <= (n = node_children(&children, attr->children))) {
+ zend_hash_update(pattr->value.obj.properties, "children",
+sizeof("children"), (void *) &children, sizeof(zval *), NULL);
+ }
+*/ add_property_string(pattr, "name", (char *) (attr->name), 1);
add_property_string(pattr, "value", xmlNodeGetContent((xmlNodePtr)
attr), 1);
zend_hash_next_index_insert((*attributes)->valu
[PHP-CVS] cvs: php4 /ext/gd gd.c gd_ctx.c php_gd.h
sniper Sat Mar 31 21:42:07 2001 EDT
Modified files:
/php4/ext/gdgd.c gd_ctx.c php_gd.h
Log:
Fixed bug #8137 and killed some compile warnings.
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.118 php4/ext/gd/gd.c:1.119
--- php4/ext/gd/gd.c:1.118 Mon Mar 12 05:57:53 2001
+++ php4/ext/gd/gd.cSat Mar 31 21:42:07 2001
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.118 2001/03/12 13:57:53 sasha Exp $ */
+/* $Id: gd.c,v 1.119 2001/04/01 05:42:07 sniper Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -92,7 +92,7 @@
#define CTX_PUTC(c,fp) fputc(c, fp)
#endif
-static void _php_image_output_wbmp(gdImagePtr im, gdIOCtx *fp);
+static void _php_image_bw_convert(gdImagePtr im_org, gdIOCtx *out, int threshold);
#ifdef THREAD_SAFE
DWORD GDlibTls;
@@ -644,6 +644,7 @@
}
/* }}} */
+size_t php_fread_all(char **buf, int socket, FILE *fp, int issock);
static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char
*tn, gdImagePtr (*func_p)(), gdImagePtr (*ioctx_func_p)())
{
zval **file;
@@ -685,7 +686,7 @@
if(issock && socketd) {
#ifdef USE_GD_IOCTX
gdIOCtx* io_ctx;
- int buff_size;
+ size_t buff_size;
char *buff,*buff_em;
buff_size = php_fread_all(&buff_em, socketd, fp, issock);
@@ -811,11 +812,11 @@
char *fn = NULL;
FILE *fp;
int argc = ZEND_NUM_ARGS();
- int output = 1, q = -1;
+ int q = -1, i;
GDLS_FETCH();
- /* The quality parameter for Wbmp stands for the threshold
- So the q variable */
+ /* The quality parameter for Wbmp stands for the threshold when called from
+image2wbmp() */
+ /* When called from imagewbmp() the quality parameter stands for the
+foreground color. Default: black. */
if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &imgind, &file,
&quality) == FAILURE)
{
@@ -846,14 +847,18 @@
}
switch(image_type) {
+ case PHP_GDIMG_CONVERT_WBM:
+ if(q<0||q>255) {
+ php_error(E_WARNING, "%s: invalid threshold
+value '%d'. It must be between 0 and 255",get_active_function_name(), q);
+ }
case PHP_GDIMG_TYPE_JPG:
(*func_p)(im, fp, q);
break;
case PHP_GDIMG_TYPE_WBM:
- if(q<0||q>255) {
- php_error(E_WARNING, "%s: invalid threshold
value '%d'. It must be between 0 and 255",get_active_function_name(), q);
+ for(i=0; i < im->colorsTotal; i++) {
+ if(im->red[i] == 0) break;
}
- (*func_p)(im, q, fp);
+ (*func_p)(im, i, fp);
break;
default:
(*func_p)(im, fp);
@@ -873,12 +878,16 @@
}
switch(image_type) {
+ case PHP_GDIMG_CONVERT_WBM:
+ if(q<0||q>255) {
+ php_error(E_WARNING, "%s: invalid threshold
+value '%d'. It must be between 0 and 255",get_active_function_name(), q);
+ }
case PHP_GDIMG_TYPE_JPG:
(*func_p)(im, tmp, q);
break;
case PHP_GDIMG_TYPE_WBM:
- if(q<0||q>255) {
- php_error(E_WARNING, "%s: invalid threshold
value '%d'. It must be between 0 and 255",get_active_function_name(), q);
+ for(i=0; i < im->colorsTotal; i++) {
+ if(im->red[i] == 0) break;
}
(*func_p)(im, q, tmp);
break;
@@ -958,54 +967,20 @@
}
/* }}} */
-/* {{{ proto int imagewbmp(int im [, string filename])
+/* {{{ proto int imagewbmp(int im [, string filename, [, int foreground]])
Output WBMP image to browser or file */
PHP_FUNCTION(imagewbmp)
{
+#ifdef HAVE_GD_WBMP
#ifdef USE_GD_IOCTX
- _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WBM,
"WBMP", _php_image_output_wbmp);
+ _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WBM,
+"WBMP", gdImageWBMPCtx);
#else
- _php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WBM,
"WBMP", _php_image_output_wbmp);
+ _php_i
[PHP-CVS] cvs: php4 /ext/informix ifx.ec
sniper Sat Mar 31 21:55:22 2001 EDT
Modified files:
/php4/ext/informix ifx.ec
Log:
Fixed bug #10095.
Index: php4/ext/informix/ifx.ec
diff -u php4/ext/informix/ifx.ec:1.52 php4/ext/informix/ifx.ec:1.53
--- php4/ext/informix/ifx.ec:1.52 Sun Feb 25 22:06:58 2001
+++ php4/ext/informix/ifx.ecSat Mar 31 21:55:20 2001
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: ifx.ec,v 1.52 2001/02/26 06:06:58 andi Exp $ */
+/* $Id: ifx.ec,v 1.53 2001/04/01 05:55:20 sniper Exp $ */
/* ---
* if you want a function reference : "grep '^\*\*' ifx.ec" will give
@@ -472,17 +472,18 @@
maxl[15]=0;
}
-DISPLAY_INI_ENTRIES();
-
-php_printf("\n");
-php_info_print_table_header(2, "Key", "Value");
+php_info_print_table_start();
+php_info_print_table_header(2, "Informix support", "enabled");
sprintf(buf, "%ld", IFXG(num_persistent));
-php_info_print_table_row(2, "Persistent links : ", buf);
+php_info_print_table_row(2, "Persistent links", buf);
sprintf(buf, "%ld", IFXG(num_links));
-php_info_print_table_row(2, "Total links : ", buf);
+php_info_print_table_row(2, "Total links", buf);
sprintf(buf, "%02.2f", (double)(IFX_VERSION/100.0));
-php_info_print_table_row(2, "ESQL/C Version: ", buf);
-php_printf("\n");
+php_info_print_table_row(2, "ESQL/C Version", buf);
+php_info_print_table_end();
+
+DISPLAY_INI_ENTRIES();
+
}
static void php3_ifx_set_default_link(int id)
--
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 gd_ctx.c
sniper Sat Mar 31 22:20:45 2001 EDT
Modified files:
/php4/ext/gdgd.c gd_ctx.c
Log:
According to GD documentation the macros should be used instead..
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.119 php4/ext/gd/gd.c:1.120
--- php4/ext/gd/gd.c:1.119 Sat Mar 31 21:42:07 2001
+++ php4/ext/gd/gd.cSat Mar 31 22:20:45 2001
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.119 2001/04/01 05:42:07 sniper Exp $ */
+/* $Id: gd.c,v 1.120 2001/04/01 06:20:45 sniper Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -855,8 +855,8 @@
(*func_p)(im, fp, q);
break;
case PHP_GDIMG_TYPE_WBM:
- for(i=0; i < im->colorsTotal; i++) {
- if(im->red[i] == 0) break;
+ for(i=0; i < gdImageColorsTotal(im); i++) {
+ if(gdImageRed(im, i) == 0) break;
}
(*func_p)(im, i, fp);
break;
@@ -886,8 +886,8 @@
(*func_p)(im, tmp, q);
break;
case PHP_GDIMG_TYPE_WBM:
- for(i=0; i < im->colorsTotal; i++) {
- if(im->red[i] == 0) break;
+ for(i=0; i < gdImageColorsTotal(im); i++) {
+ if(gdImageRed(im, i) == 0) break;
}
(*func_p)(im, q, tmp);
break;
Index: php4/ext/gd/gd_ctx.c
diff -u php4/ext/gd/gd_ctx.c:1.3 php4/ext/gd/gd_ctx.c:1.4
--- php4/ext/gd/gd_ctx.c:1.3Sat Mar 31 21:42:07 2001
+++ php4/ext/gd/gd_ctx.cSat Mar 31 22:20:45 2001
@@ -82,8 +82,8 @@
(*func_p)(im, ctx, q);
break;
case PHP_GDIMG_TYPE_WBM:
- for(i=0; i < im->colorsTotal; i++) {
- if(im->red[i] == 0) break;
+ for(i=0; i < gdImageColorsTotal(im); i++) {
+ if(gdImageRed(im, i) == 0) break;
}
(*func_p)(im, i, ctx);
break;
--
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/aspell config.m4
sniper Mon Apr 2 02:06:33 2001 EDT Modified files: /php4/ext/aspellconfig.m4 Log: Fixed a typo. Bug: #10103 Index: php4/ext/aspell/config.m4 diff -u php4/ext/aspell/config.m4:1.4 php4/ext/aspell/config.m4:1.5 --- php4/ext/aspell/config.m4:1.4 Tue Mar 27 12:34:22 2001 +++ php4/ext/aspell/config.m4 Mon Apr 2 02:06:33 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 2001/03/27 20:34:22 sniper Exp $ +dnl $Id: config.m4,v 1.5 2001/04/02 09:06:33 sniper Exp $ AC_MSG_CHECKING(for ASPELL support) AC_ARG_WITH(aspell, @@ -19,9 +19,9 @@ fi AC_DEFINE(HAVE_ASPELL,1,[Whether you have aspell]) AC_MSG_RESULT(yes) - PHP_EXTENSION(aspell) +PHP_EXTENSION(aspell) else -AC_MSG_ERROR(no) +AC_MSG_RESULT(no) fi ],[ AC_MSG_RESULT(no) -- 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(PHP_4_0_5) /ext/aspell config.m4
sniper Mon Apr 2 02:07:22 2001 EDT Modified files: (Branch: PHP_4_0_5) /php4/ext/aspellconfig.m4 Log: MFH Index: php4/ext/aspell/config.m4 diff -u php4/ext/aspell/config.m4:1.3 php4/ext/aspell/config.m4:1.3.4.1 --- php4/ext/aspell/config.m4:1.3 Wed Dec 29 20:07:17 1999 +++ php4/ext/aspell/config.m4 Mon Apr 2 02:07:22 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 1999/12/30 04:07:17 sas Exp $ +dnl $Id: config.m4,v 1.3.4.1 2001/04/02 09:07:22 sniper Exp $ AC_MSG_CHECKING(for ASPELL support) AC_ARG_WITH(aspell, @@ -19,9 +19,9 @@ fi AC_DEFINE(HAVE_ASPELL,1,[Whether you have aspell]) AC_MSG_RESULT(yes) - PHP_EXTENSION(aspell) +PHP_EXTENSION(aspell) else -AC_MSG_ERROR(no) +AC_MSG_RESULT(no) fi ],[ AC_MSG_RESULT(no) -- 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/standard filestat.c
sniper Tue Apr 3 03:51:16 2001 EDT
Modified files:
/php4/ext/standard filestat.c
Log:
SCO (and maybe others) do not have this defined.
Index: php4/ext/standard/filestat.c
diff -u php4/ext/standard/filestat.c:1.56 php4/ext/standard/filestat.c:1.57
--- php4/ext/standard/filestat.c:1.56 Sun Feb 25 22:07:17 2001
+++ php4/ext/standard/filestat.cTue Apr 3 03:51:16 2001
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.56 2001/02/26 06:07:17 andi Exp $ */
+/* $Id: filestat.c,v 1.57 2001/04/03 10:51:16 sniper Exp $ */
#include "php.h"
#include "safe_mode.h"
@@ -551,7 +551,7 @@
case S_IFDIR: RETURN_STRING("dir",1);
case S_IFBLK: RETURN_STRING("block",1);
case S_IFREG: RETURN_STRING("file",1);
-#if !defined(ZEND_WIN32)&&!defined(__BEOS__)
+#if defined(S_IFSOCK) && !defined(ZEND_WIN32)&&!defined(__BEOS__)
case S_IFSOCK: RETURN_STRING("socket",1);
#endif
}
--
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/sockets config.m4
sniper Tue Apr 3 17:06:49 2001 EDT Modified files: /php4/ext/sockets config.m4 Log: Cleaned up a bit. Removed some checks for header files that are already checked in configure.in Index: php4/ext/sockets/config.m4 diff -u php4/ext/sockets/config.m4:1.4 php4/ext/sockets/config.m4:1.5 --- php4/ext/sockets/config.m4:1.4 Sat Oct 21 23:45:03 2000 +++ php4/ext/sockets/config.m4 Tue Apr 3 17:06:49 2001 @@ -1,37 +1,13 @@ -dnl $Id: config.m4,v 1.4 2000/10/22 06:45:03 chrisv Exp $ +dnl $Id: config.m4,v 1.5 2001/04/04 00:06:49 sniper Exp $ dnl config.m4 for extension sockets -dnl don't forget to call PHP_EXTENSION(sockets) -dnl Comments in this file start with the string 'dnl'. -dnl Remove where necessary. This file will not work -dnl without editing. - -dnl If your extension references something external, use with: - -dnl PHP_ARG_WITH(sockets, for sockets support, -dnl Make sure that the comment is aligned: -dnl [ --with-sockets Include sockets support]) - -dnl Otherwise use enable: - PHP_ARG_ENABLE(sockets, whether to enable sockets support, -dnl Make sure that the comment is aligned: [ --enable-socketsEnable sockets support]) if test "$PHP_SOCKETS" != "no"; then - dnl If you will not be testing anything external, like existence of - dnl headers, libraries or functions in them, just uncomment the - dnl following line and you are ready to go. - - dnl - - dnl Headers - dnl - - AC_HEADER_STDC - AC_CHECK_HEADERS(unistd.h) - AC_CHECK_HEADERS(sys/types.h sys/socket.h netdb.h netinet/in.h netinet/tcp.h sys/un.h arpa/inet.h) - AC_CHECK_HEADERS(sys/time.h errno.h fcntl.h) + AC_CHECK_HEADERS(netdb.h netinet/tcp.h sys/un.h errno.h) AC_DEFINE(HAVE_SOCKETS, 1, [ ]) - dnl Write more examples of tests here... + PHP_EXTENSION(sockets, $ext_shared) fi -- 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_variables.c
sniper Tue Apr 3 17:37:06 2001 EDT
Modified files:
/php4/main php_variables.c
Log:
Cookies use ; as argument separator.
# And also the first step for the possible configure option
Index: php4/main/php_variables.c
diff -u php4/main/php_variables.c:1.22 php4/main/php_variables.c:1.23
--- php4/main/php_variables.c:1.22 Tue Mar 27 03:34:51 2001
+++ php4/main/php_variables.c Tue Apr 3 17:37:06 2001
@@ -217,7 +217,7 @@
void php_treat_data(int arg, char *str, zval* destArray ELS_DC PLS_DC SLS_DC)
{
- char *res = NULL, *var, *val;
+ char *res = NULL, *var, *val, *separator = ";&";
const char *c_var;
pval *array_ptr;
int free_buffer=0;
@@ -238,6 +238,7 @@
PG(http_globals)[TRACK_VARS_GET] = array_ptr;
break;
case PARSE_COOKIE:
+ separator=";";
PG(http_globals)[TRACK_VARS_COOKIE] =
array_ptr;
break;
}
@@ -277,8 +278,8 @@
return;
}
- var = php_strtok_r(res, ";&", &strtok_buf);
-
+ var = php_strtok_r(res, separator, &strtok_buf);
+
while (var) {
val = strchr(var, '=');
if (val) { /* have a value */
@@ -289,7 +290,7 @@
val_len = php_url_decode(val, strlen(val));
php_register_variable_safe(var, val, val_len, array_ptr ELS_CC
PLS_CC);
}
- var = php_strtok_r(NULL, ";&", &strtok_buf);
+ var = php_strtok_r(NULL, separator, &strtok_buf);
}
if (free_buffer) {
efree(res);
--
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/crack crack.c
sniper Wed Apr 4 10:13:41 2001 EDT
Modified files:
/php4/ext/crack crack.c
Log:
Killed 2 compile warnings.
Index: php4/ext/crack/crack.c
diff -u php4/ext/crack/crack.c:1.1 php4/ext/crack/crack.c:1.2
--- php4/ext/crack/crack.c:1.1 Sat Dec 2 03:59:20 2000
+++ php4/ext/crack/crack.c Wed Apr 4 10:13:40 2001
@@ -1,5 +1,6 @@
#include "php.h"
#include "php_ini.h"
+#include "ext/standard/info.h"
#include "php_crack.h"
#if HAVE_CRACK
@@ -103,6 +104,8 @@
if (NULL != CRACKG(last_message)) {
efree(CRACKG(last_message));
}
+
+ return SUCCESS;
}
PHP_MINFO_FUNCTION(crack)
--
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 / NEWS php.ini-dist php.ini-optimized /ext/standard url_scanner.c url_scanner_ex.c url_scanner_ex.re /main main.c php_globals.h php_variables.c
sniper Wed Apr 4 13:46:27 2001 EDT
Modified files:
/php4 php.ini-dist php.ini-optimized NEWS
/php4/ext/standard url_scanner.c url_scanner_ex.re url_scanner_ex.c
/php4/main main.c php_globals.h php_variables.c
Log:
Added new configuration directives:
arg_separator.input and arg_separator.output
Index: php4/php.ini-dist
diff -u php4/php.ini-dist:1.75 php4/php.ini-dist:1.76
--- php4/php.ini-dist:1.75 Sat Mar 24 13:38:58 2001
+++ php4/php.ini-dist Wed Apr 4 13:46:25 2001
@@ -1,5 +1,5 @@
[PHP]
-; $Id: php.ini-dist,v 1.75 2001/03/24 21:38:58 sbergmann Exp $
+; $Id: php.ini-dist,v 1.76 2001/04/04 20:46:25 sniper Exp $
;;;
; About this file ;
@@ -243,7 +243,12 @@
; The separator used in PHP generated URLs to separate arguments.
; Default is "&".
-;arg_separator = "&"
+;arg_separator.output = "&"
+
+; List of separator(s) used by PHP to parse input URLs into variables.
+; Default is "&".
+; NOTE: Every character in this directive is considered as separator!
+;arg_separator.input = ";&"
; This directive describes the order in which PHP registers GET, POST, Cookie,
; Environment and Built-in variables (G, P, C, E & S respectively, often
Index: php4/php.ini-optimized
diff -u php4/php.ini-optimized:1.34 php4/php.ini-optimized:1.35
--- php4/php.ini-optimized:1.34 Tue Mar 20 14:45:10 2001
+++ php4/php.ini-optimized Wed Apr 4 13:46:25 2001
@@ -182,8 +182,14 @@
;
; Data Handling ;
;
-;arg_separator = "&" ; The separator used in PHP generated URLs to
separate arguments.
-; Default is "&".
+
+;arg_separator.output = "&"; The separator used in PHP generated URLs to
+separate arguments.
+ ; Default is "&".
+
+;arg_separator.input = ";&"; List of separator(s) used by PHP to parse
+input URLs into variables.
+ ; Default is "&".
+ ; NOTE: Every
+character in this directive is considered as separator!
+
variables_order= "GPCS" ; This directive describes the order
in which PHP registers
; GET, POST, Cookie,
Environment and Built-in variables (G, P,
; C, E & S
respectively, often referred to as EGPCS or GPC).
Index: php4/NEWS
diff -u php4/NEWS:1.626 php4/NEWS:1.627
--- php4/NEWS:1.626 Mon Apr 2 08:18:46 2001
+++ php4/NEWS Wed Apr 4 13:46:25 2001
@@ -30,7 +30,10 @@
(Zeev)
?? ??? 200?, Version 4.0.5
-- New FastCGI server module. (Ben Mansell)
+- Added new php.ini directive: arg_separator.input which is used to tell
+ PHP which characters are considered as argument separators in URLs.
+ Renamed php.ini directive: arg_separator -> arg_separator.output (Jani)
+- Added FastCGI SAPI module. (Ben Mansell)
- Added array_reduce(), which allows iterative reduction of an array
to a single value via a callback function. (Andrei)
- The imageloadfont function of the gd extension should be not platform
Index: php4/ext/standard/url_scanner.c
diff -u php4/ext/standard/url_scanner.c:1.29 php4/ext/standard/url_scanner.c:1.30
--- php4/ext/standard/url_scanner.c:1.29Sun Feb 25 22:07:23 2001
+++ php4/ext/standard/url_scanner.c Wed Apr 4 13:46:26 2001
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: url_scanner.c,v 1.29 2001/02/26 06:07:23 andi Exp $ */
+/* $Id: url_scanner.c,v 1.30 2001/04/04 20:46:26 sniper Exp $ */
#include "php.h"
@@ -67,12 +67,12 @@
if(flag) {
if(!strstr(val,buf)&&!strchr(val,':'))
{
- char *result = (char
*)emalloc(strlen(buf)+strlen(PG(arg_separator))+1);
+ char *result = (char
+*)emalloc(strlen(buf)+strlen(PG(arg_separator).output)+1);
int n;
if(strchr(val,'?')) {
- strcpy(result,PG(arg_separator));
- n=strlen(PG(arg_separator));
+ strcpy(result,PG(arg_separator).output);
+ n=strlen(PG(arg_separator).output);
} else {
*result='?';
n=1;
Index: php4/ext/standard/url_scanner_ex.re
diff -u php4/ext/standard/url_scanner_ex.re:1.30
php4/ext/standard/url_scanner_ex.re:1.31
--- php4/ext/standard/url_scanner_ex.re:1.30Sun Feb 25 22:07:23 2001
+++ php4/ext/st
[PHP-CVS] cvs: php4 / configure.in /main php_version.h
sniper Wed Apr 4 13:52:44 2001 EDT Modified files: /php4 configure.in /php4/main php_version.h Log: This branch is 4.0.6-dev.. Index: php4/configure.in diff -u php4/configure.in:1.228 php4/configure.in:1.229 --- php4/configure.in:1.228 Tue Apr 3 13:59:44 2001 +++ php4/configure.in Wed Apr 4 13:52:43 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.228 2001/04/03 20:59:44 wsanchez Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.229 2001/04/04 20:52:43 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -51,7 +51,7 @@ dnl ## Diversion 5 is the last one. Here we generate files and clean up. dnl ## This is where the version number is changed from now on! -AM_INIT_AUTOMAKE(php, 4.0.5-dev, nodefine) +AM_INIT_AUTOMAKE(php, 4.0.6-dev, nodefine) PHP_VERSION=$VERSION echo "/* automatically generated by configure */" > php_version.h.new Index: php4/main/php_version.h diff -u php4/main/php_version.h:1.44 php4/main/php_version.h:1.45 --- php4/main/php_version.h:1.44Sat Dec 2 00:21:10 2000 +++ php4/main/php_version.h Wed Apr 4 13:52:44 2001 @@ -1,3 +1,3 @@ /* automatically generated by configure */ /* edit configure.in to change version number */ -#define PHP_VERSION "4.0.5-dev" +#define PHP_VERSION "4.0.6-dev" -- 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/fdf fdf.c
sniper Wed Apr 4 22:38:19 2001 EDT
Modified files:
/php4/ext/fdf fdf.c
Log:
Fix bugs: #10157, #7549
Index: php4/ext/fdf/fdf.c
diff -u php4/ext/fdf/fdf.c:1.42 php4/ext/fdf/fdf.c:1.43
--- php4/ext/fdf/fdf.c:1.42 Sun Mar 18 01:25:40 2001
+++ php4/ext/fdf/fdf.c Wed Apr 4 22:38:18 2001
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fdf.c,v 1.42 2001/03/18 09:25:40 sniper Exp $ */
+/* $Id: fdf.c,v 1.43 2001/04/05 05:38:18 sniper Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -337,49 +337,46 @@
/* {{{ proto string fdf_next_field_name(int fdfdoc [, string fieldname])
Gets the name of the next field name or the first field name */
-PHP_FUNCTION(fdf_next_field_name) {
- pval **argv[2];
- int id, type, argc;
- ASInt32 nr;
- char *buffer, *fieldname;
+PHP_FUNCTION(fdf_next_field_name)
+{
+ zval **fdfdoc, **field;
+ int id, type, argc=ZEND_NUM_ARGS();
+ ASInt32 length=256, nr;
+ char *buffer=NULL, *fieldname=NULL;
FDFDoc fdf;
FDFErc err;
FDF_TLS_VARS;
- argc = ZEND_NUM_ARGS();
- if((argc > 2) || (argc < 1))
+ if (argc > 2 || argc < 1 || zend_get_parameters_ex(argc, &fdfdoc, &field) ==
+FAILURE) {
WRONG_PARAM_COUNT;
-
- if (zend_get_parameters_array_ex(argc, argv) == FAILURE) {
- WRONG_PARAM_COUNT;
}
- convert_to_long_ex(argv[0]);
- if(argc == 2) {
- convert_to_string_ex(argv[1]);
- fieldname = (*argv[1])->value.str.val;
- } else {
- fieldname = NULL;
- }
- id=(*argv[0])->value.lval;
+ convert_to_long_ex(fdfdoc);
+ id=Z_LVAL_PP(fdfdoc);
fdf = zend_list_find(id,&type);
if(!fdf || type!=FDF_GLOBAL(le_fdf)) {
php_error(E_WARNING,"Unable to find file identifier %d",id);
RETURN_FALSE;
}
- err = FDFNextFieldName(fdf, fieldname, NULL, 0, &nr);
- if(err != FDFErcOK)
- printf("Aiii, error\n");
- if(nr == 0)
- RETURN_STRING(empty_string, 1);
-
- buffer = emalloc(nr);
- err = FDFNextFieldName(fdf, fieldname, buffer, nr, &nr);
- if(err != FDFErcOK)
- printf("Aiii, error\n");
+ if(argc == 2) {
+ convert_to_string_ex(field);
+ fieldname = Z_STRVAL_PP(field);
+ }
- RETURN_STRING(buffer, 0);
+ buffer = emalloc(length);
+ err = FDFNextFieldName(fdf, fieldname, buffer, length-1, &nr);
+ if(err == FDFErcBufTooShort && nr > 0 ) {
+ buffer = erealloc(buffer,nr+1);
+ err = FDFNextFieldName(fdf, fieldname, buffer, length-1,&nr);
+ }
+ if(err != FDFErcOK) {
+ efree(buffer);
+ php_error(E_WARNING,"Unable to get next fieldname");
+ RETURN_FALSE;
+ }
+ RETVAL_STRING(buffer, 1);
+ efree(buffer);
}
/* }}} */
@@ -768,7 +765,7 @@
{
FILE *fp;
FDFDoc theFDF;
- char *name=NULL,*value=NULL,*p;
+ char *name=NULL,*value=NULL,*p, *data;
int name_len=0,value_len=0;
char *lastfieldname =NULL;
char *filename = NULL;
@@ -785,6 +782,10 @@
}
fwrite(SG(request_info).post_data,SG(request_info).post_data_length,1,fp);
fclose(fp);
+
+ /* Set HTTP_FDF_DATA variable */
+ data = estrndup(SG(request_info).post_data,SG(request_info).post_data_length);
+ SET_VAR_STRINGL("HTTP_FDF_DATA", data, SG(request_info).post_data_length);
err = FDFOpen(filename,0,&theFDF);
--
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/standard crypt.c
sniper Thu Apr 5 11:48:04 2001 EDT
Modified files:
/php4/ext/standard crypt.c
Log:
spaces to tabs
Index: php4/ext/standard/crypt.c
diff -u php4/ext/standard/crypt.c:1.38 php4/ext/standard/crypt.c:1.39
--- php4/ext/standard/crypt.c:1.38 Sun Feb 25 22:07:17 2001
+++ php4/ext/standard/crypt.c Thu Apr 5 11:48:03 2001
@@ -17,7 +17,7 @@
| Rasmus Lerdorf <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: crypt.c,v 1.38 2001/02/26 06:07:17 andi Exp $ */
+/* $Id: crypt.c,v 1.39 2001/04/05 18:48:03 sniper Exp $ */
#include
#include "php.h"
@@ -93,18 +93,18 @@
PHP_MINIT_FUNCTION(crypt)
{
#if PHP_STD_DES_CRYPT
-REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", 2, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", 2, CONST_CS | CONST_PERSISTENT);
#elif PHP_MD5_CRYPT
-REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", 12, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", 12, CONST_CS | CONST_PERSISTENT);
#endif
-REGISTER_LONG_CONSTANT("CRYPT_STD_DES", PHP_STD_DES_CRYPT, CONST_CS |
CONST_PERSISTENT);
-REGISTER_LONG_CONSTANT("CRYPT_EXT_DES", PHP_EXT_DES_CRYPT, CONST_CS |
CONST_PERSISTENT);
-REGISTER_LONG_CONSTANT("CRYPT_MD5", PHP_MD5_CRYPT, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CRYPT_STD_DES", PHP_STD_DES_CRYPT, CONST_CS |
+CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CRYPT_EXT_DES", PHP_EXT_DES_CRYPT, CONST_CS |
+CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CRYPT_MD5", PHP_MD5_CRYPT, CONST_CS |
+CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("CRYPT_BLOWFISH", PHP_BLOWFISH_CRYPT, CONST_CS |
CONST_PERSISTENT);
php_srand(time(0) * getpid() * (php_combined_lcg() * 1.0));
-return SUCCESS;
+ return SUCCESS;
}
static unsigned char itoa64[] =
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
--
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_variables.c
sniper Thu Apr 5 18:50:41 2001 EDT Modified files: /php4/main php_variables.c Log: fixed typo in CVS id Index: php4/main/php_variables.c diff -u php4/main/php_variables.c:1.24 php4/main/php_variables.c:1.25 --- php4/main/php_variables.c:1.24 Wed Apr 4 13:46:26 2001 +++ php4/main/php_variables.c Thu Apr 5 18:50:40 2001 @@ -16,7 +16,7 @@ | Zeev Suraski <[EMAIL PROTECTED]>| +--+ */ -/* $Id: */ +/* $Id: php_variables.c,v 1.25 2001/04/06 01:50:40 sniper Exp $ */ #include #include "php.h" -- 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(PHP_4_0_5) / NEWS php.ini-dist php.ini-optimized /ext/standard url_scanner.c url_scanner_ex.c url_scanner_ex.re /main main.c php_globals.h php_variables.c
sniper Thu Apr 5 19:09:44 2001 EDT
Modified files: (Branch: PHP_4_0_5)
/php4 NEWS php.ini-dist php.ini-optimized
/php4/ext/standard url_scanner.c url_scanner_ex.c url_scanner_ex.re
/php4/main main.c php_globals.h php_variables.c
Log:
MFH
Index: php4/NEWS
diff -u php4/NEWS:1.611.2.2 php4/NEWS:1.611.2.3
--- php4/NEWS:1.611.2.2 Sun Apr 1 07:33:29 2001
+++ php4/NEWS Thu Apr 5 19:09:43 2001
@@ -2,7 +2,10 @@
|||
?? ??? 200?, Version 4.0.5
-- New FastCGI server module. (Ben Mansell)
+- Added new php.ini directive: arg_separator.input which is used to tell
+ PHP which characters are considered as argument separators in URLs.
+ Renamed php.ini directive: arg_separator -> arg_separator.output (Jani)
+- Added FastCGI SAPI module. (Ben Mansell)
- Added array_reduce(), which allows iterative reduction of an array
to a single value via a callback function. (Andrei)
- The imageloadfont function of the gd extension should be not platform
Index: php4/php.ini-dist
diff -u php4/php.ini-dist:1.73 php4/php.ini-dist:1.73.2.1
--- php4/php.ini-dist:1.73 Wed Mar 7 02:08:19 2001
+++ php4/php.ini-dist Thu Apr 5 19:09:43 2001
@@ -1,5 +1,5 @@
[PHP]
-; $Id: php.ini-dist,v 1.73 2001/03/07 10:08:19 zeev Exp $
+; $Id: php.ini-dist,v 1.73.2.1 2001/04/06 02:09:43 sniper Exp $
;;;
; About this file ;
@@ -243,7 +243,12 @@
; The separator used in PHP generated URLs to separate arguments.
; Default is "&".
-;arg_separator = "&"
+;arg_separator.output = "&"
+
+; List of separator(s) used by PHP to parse input URLs into variables.
+; Default is "&".
+; NOTE: Every character in this directive is considered as separator!
+;arg_separator.input = ";&"
; This directive describes the order in which PHP registers GET, POST, Cookie,
; Environment and Built-in variables (G, P, C, E & S respectively, often
Index: php4/php.ini-optimized
diff -u php4/php.ini-optimized:1.33 php4/php.ini-optimized:1.33.2.1
--- php4/php.ini-optimized:1.33 Wed Mar 7 02:08:19 2001
+++ php4/php.ini-optimized Thu Apr 5 19:09:43 2001
@@ -182,8 +182,14 @@
;
; Data Handling ;
;
-;arg_separator = "&" ; The separator used in PHP generated URLs to
separate arguments.
-; Default is "&".
+
+;arg_separator.output = "&"; The separator used in PHP generated URLs to
+separate arguments.
+ ; Default is "&".
+
+;arg_separator.input = ";&"; List of separator(s) used by PHP to parse
+input URLs into variables.
+ ; Default is "&".
+ ; NOTE: Every
+character in this directive is considered as separator!
+
variables_order= "GPCS" ; This directive describes the order
in which PHP registers
; GET, POST, Cookie,
Environment and Built-in variables (G, P,
; C, E & S
respectively, often referred to as EGPCS or GPC).
Index: php4/ext/standard/url_scanner.c
diff -u php4/ext/standard/url_scanner.c:1.29 php4/ext/standard/url_scanner.c:1.29.2.1
--- php4/ext/standard/url_scanner.c:1.29Sun Feb 25 22:07:23 2001
+++ php4/ext/standard/url_scanner.c Thu Apr 5 19:09:43 2001
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: url_scanner.c,v 1.29 2001/02/26 06:07:23 andi Exp $ */
+/* $Id: url_scanner.c,v 1.29.2.1 2001/04/06 02:09:43 sniper Exp $ */
#include "php.h"
@@ -67,12 +67,12 @@
if(flag) {
if(!strstr(val,buf)&&!strchr(val,':'))
{
- char *result = (char
*)emalloc(strlen(buf)+strlen(PG(arg_separator))+1);
+ char *result = (char
+*)emalloc(strlen(buf)+strlen(PG(arg_separator).output)+1);
int n;
if(strchr(val,'?')) {
- strcpy(result,PG(arg_separator));
- n=strlen(PG(arg_separator));
+ strcpy(result,PG(arg_separator).output);
+ n=strlen(PG(arg_separator).output);
} else {
*result='?';
n=1;
Index: php4/ext/standard/url_scanner_ex.c
diff -u php4/ext/standard/url_scanner_ex.c:1.29
php4/ext/standard/url_scanner_ex.c:1.29.2.1
--- php4/ext/standard/url_scanner_ex.c:1.29 Sun Feb 25
[PHP-CVS] cvs: php4(PHP_4_0_5) /main main.c
sniper Fri Apr 6 08:18:52 2001 EDT
Modified files: (Branch: PHP_4_0_5)
/php4/main main.c
Log:
Support also old arg_separator directive.
Index: php4/main/main.c
diff -u php4/main/main.c:1.356.2.2 php4/main/main.c:1.356.2.3
--- php4/main/main.c:1.356.2.2 Thu Apr 5 19:09:43 2001
+++ php4/main/main.cFri Apr 6 08:18:52 2001
@@ -19,7 +19,7 @@
*/
-/* $Id: main.c,v 1.356.2.2 2001/04/06 02:09:43 sniper Exp $ */
+/* $Id: main.c,v 1.356.2.3 2001/04/06 15:18:52 sniper Exp $ */
#include
@@ -139,6 +139,18 @@
}
+static PHP_INI_MH(OnUpdateDeprecated)
+{
+ PLS_FETCH();
+
+ PG(arg_separator.output) = new_value;
+
+ if (stage==PHP_INI_STAGE_RUNTIME) {
+ php_error(E_WARNING, "The arg_separator directive is deprecated. Use
+arg_separator.output instead");
+ }
+ return SUCCESS;
+}
+
static PHP_INI_MH(OnUpdateTimeout)
{
ELS_FETCH();
@@ -211,6 +223,7 @@
STD_PHP_INI_ENTRY("arg_separator.output", "&",PHP_INI_ALL,
OnUpdateStringUnempty, arg_separator.output, php_core_globals,
core_globals)
STD_PHP_INI_ENTRY("arg_separator.input","&",
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateStringUnempty, arg_separator.input,
php_core_globals, core_globals)
+ PHP_INI_ENTRY("arg_separator", "&",
+PHP_INI_ALL,OnUpdateDeprecated)
STD_PHP_INI_ENTRY("auto_append_file", NULL, PHP_INI_ALL,
OnUpdateString, auto_append_file,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY("auto_prepend_file", NULL, PHP_INI_ALL,
OnUpdateString, auto_prepend_file,
php_core_globals, core_globals)
--
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 php_gd.h
sniper Fri Apr 6 11:01:52 2001 EDT Modified files: /php4/ext/gdgd.c php_gd.h Log: Killed some compile warnings. Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.120 php4/ext/gd/gd.c:1.121 --- php4/ext/gd/gd.c:1.120 Sat Mar 31 22:20:45 2001 +++ php4/ext/gd/gd.cFri Apr 6 11:01:52 2001 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.120 2001/04/01 06:20:45 sniper Exp $ */ +/* $Id: gd.c,v 1.121 2001/04/06 18:01:52 sniper Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -92,6 +92,11 @@ #define CTX_PUTC(c,fp) fputc(c, fp) #endif +gdImagePtr _php_image_create_from_string ( zval **Data, char *tn, gdImagePtr +(*ioctx_func_p)() ); +static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char +*tn, gdImagePtr (*func_p)(), gdImagePtr (*ioctx_func_p)()); +static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, +void (*func_p)()); +static int _php_image_type ( char data[8] ); +static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type); static void _php_image_bw_convert(gdImagePtr im_org, gdIOCtx *out, int threshold); #ifdef THREAD_SAFE Index: php4/ext/gd/php_gd.h diff -u php4/ext/gd/php_gd.h:1.25 php4/ext/gd/php_gd.h:1.26 --- php4/ext/gd/php_gd.h:1.25 Sat Mar 31 21:42:07 2001 +++ php4/ext/gd/php_gd.hFri Apr 6 11:01:52 2001 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_gd.h,v 1.25 2001/04/01 05:42:07 sniper Exp $ */ +/* $Id: php_gd.h,v 1.26 2001/04/06 18:01:52 sniper Exp $ */ #ifndef PHP_GD_H #define PHP_GD_H @@ -142,13 +142,6 @@ PHP_FUNCTION(jpeg2wbmp); PHP_FUNCTION(png2wbmp); PHP_FUNCTION(image2wbmp); - - -gdImagePtr _php_image_create_from_string ( zval **Data, char *tn, gdImagePtr (*ioctx_func_p)() ); -static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, gdImagePtr (*func_p)(), gdImagePtr (*ioctx_func_p)()); -static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, void (*func_p)()); -static int _php_image_type ( char data[8] ); -static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type); PHPAPI int phpi_get_le_gd(void); -- 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/fdf fdf.c php_fdf.h
sniper Fri Apr 6 16:17:32 2001 EDT
Modified files:
/php4/ext/fdf fdf.c php_fdf.h
Log:
Fixed some bugs.
Index: php4/ext/fdf/fdf.c
diff -u php4/ext/fdf/fdf.c:1.43 php4/ext/fdf/fdf.c:1.44
--- php4/ext/fdf/fdf.c:1.43 Wed Apr 4 22:38:18 2001
+++ php4/ext/fdf/fdf.c Fri Apr 6 16:17:31 2001
@@ -17,58 +17,24 @@
+--+
*/
-/* $Id: fdf.c,v 1.43 2001/04/05 05:38:18 sniper Exp $ */
+/* $Id: fdf.c,v 1.44 2001/04/06 23:17:31 sniper Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
/* Note that there is no code from the FdfTk lib in this file */
-#if !PHP_31 && defined(THREAD_SAFE)
-#undef THREAD_SAFE
-#endif
-
#include "php.h"
-#include "SAPI.h"
-#include "ext/standard/head.h"
-#include "php_open_temporary_file.h"
-#include "php_variables.h"
-
-#include
-#include "php_fdf.h"
-
-#if HAVE_SYS_WAIT_H
-# include
-#endif
-#if HAVE_UNISTD_H
-# include
-#endif
-#ifdef PHP_WIN32
-# include
-# include
-#endif
#if HAVE_FDFLIB
+#include "SAPI.h"
#include "ext/standard/info.h"
+#include "php_open_temporary_file.h"
+#include "php_variables.h"
+#include "php_fdf.h"
-#ifdef THREAD_SAFE
-DWORD FDFlibTls;
-static int numthreads=0;
-
-typedef struct fdflib_global_struct{
- int le_fdf;
-} fdflib_global_struct;
-
-# define FDF_GLOBAL(a) fdflib_globals->a
-# define FDF_TLS_VARS fdflib_global_struct *fdflib_globals=TlsGetValue(FDFlibTls)
-
-#else
-# define FDF_GLOBAL(a) a
-# define FDF_TLS_VARS
-int le_fdf_info;
-int le_fdf;
-#endif
+static int le_fdf;
SAPI_POST_HANDLER_FUNC(fdf_post_handler);
@@ -85,7 +51,7 @@
PHP_FE(fdf_get_status, NULL)
PHP_FE(fdf_set_file,NULL)
PHP_FE(fdf_get_file,NULL)
- PHP_FE(fdf_add_template,
NULL)
+ PHP_FE(fdf_add_template,NULL)
PHP_FE(fdf_set_flags, NULL)
PHP_FE(fdf_set_opt,
NULL)
PHP_FE(fdf_set_submit_form_action, NULL)
@@ -94,20 +60,28 @@
};
zend_module_entry fdf_module_entry = {
- "fdf", fdf_functions, PHP_MINIT(fdf), PHP_MSHUTDOWN(fdf), NULL, NULL,
- PHP_MINFO(fdf), STANDARD_MODULE_PROPERTIES
+ "fdf",
+ fdf_functions,
+ PHP_MINIT(fdf),
+ PHP_MSHUTDOWN(fdf),
+ NULL,
+ NULL,
+ PHP_MINFO(fdf),
+ STANDARD_MODULE_PROPERTIES
};
#ifdef COMPILE_DL_FDF
ZEND_GET_MODULE(fdf)
#endif
+
static void phpi_FDFClose(zend_rsrc_list_entry *rsrc)
{
FDFDoc fdf = (FDFDoc)rsrc->ptr;
- (void)FDFClose(fdf);
+ (void) FDFClose(fdf);
}
+
#define FDF_POST_CONTENT_TYPE "application/vnd.fdf"
static sapi_post_entry php_fdf_post_entry ={
@@ -118,15 +92,16 @@
};
-
PHP_MINIT_FUNCTION(fdf)
{
FDFErc err;
- FDF_GLOBAL(le_fdf) = zend_register_list_destructors_ex(phpi_FDFClose, NULL,
"fdf", module_number);
+
+ le_fdf = zend_register_list_destructors_ex(phpi_FDFClose, NULL, "fdf",
+module_number);
/* add handler for Acrobat FDF form post requests */
sapi_register_post_entry(&php_fdf_post_entry);
+
/* Constants used by fdf_set_opt() */
REGISTER_LONG_CONSTANT("FDFValue", FDFValue, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FDFStatus", FDFStatus, CONST_CS | CONST_PERSISTENT);
@@ -158,9 +133,7 @@
#ifdef PHP_WIN32
return SUCCESS;
#endif
- err = FDFInitialize();
- if(err == FDFErcOK)
- return SUCCESS;
+ if((err = FDFInitialize()) == FDFErcOK) return SUCCESS;
return FAILURE;
}
@@ -183,181 +156,154 @@
#ifdef PHP_WIN32
return SUCCESS;
#endif
- err = FDFFinalize();
- if(err == FDFErcOK)
- return SUCCESS;
+ if((err = FDFFinalize()) == FDFErcOK) return SUCCESS;
return FAILURE;
}
+
/* {{{ proto int fdf_open(string filename)
- Opens a new FDF document */
-PHP_FUNCTION(fdf_open) {
- pval **file;
- int id;
+ Open a new FDF document */
+PHP_FUNCTION(fdf_open)
+{
+ zval **file;
FDFDoc fdf;
FDFErc err;
- FDF_TLS_VARS;
-
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &file) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(file);
-
- err = FDFOpen((*file)->value.str.val, 0, &fdf);
- if(err != FDFErcOK)
- printf("Aiii, error\n");
- if(!fdf)
- RETURN_FALSE;
-
- id = zend_list_insert(fdf,FDF_GLOBAL(le_fdf));
- RETURN_LONG(id);
-} /
Re: [PHP-CVS] cvs: php4 /ext/fdf fdf.c php_fdf.h
On Sat, 7 Apr 2001 [EMAIL PROTECTED] wrote: >Why are you changing in the describtions of protos "Sets" to "Set", "Adds" >to "Add" and so on? I think the former was the right english description. >Please look into CODING_STANDARDS at php.net and phpdoc/funcsummary.txt. hmm..well, I checked the documentation and there they seem to be differently written. And it seems our 'example' code, mysql extension, doesn't follow these standards either. >Notice also, some people are adding a punctuation mark, which looks bad. I >hope Rasmus will give some advice, how we should do this in the future. Ok. >I have just reread that small chapter "Documentation and Folding Hooks" in >CODING_STANDARDS. Compare the two examples and you know what I am speaking >off (add a "s" to Return in the first example and remove the punctuation >mark in the second example). Eh..that 'standard' seems to suggest two different ways of doing it.. :) --Jani -- 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/fdf fdf.c
sniper Fri Apr 6 19:48:20 2001 EDT
Modified files:
/php4/ext/fdf fdf.c
Log:
fixed protos
Index: php4/ext/fdf/fdf.c
diff -u php4/ext/fdf/fdf.c:1.44 php4/ext/fdf/fdf.c:1.45
--- php4/ext/fdf/fdf.c:1.44 Fri Apr 6 16:17:31 2001
+++ php4/ext/fdf/fdf.c Fri Apr 6 19:48:19 2001
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fdf.c,v 1.44 2001/04/06 23:17:31 sniper Exp $ */
+/* $Id: fdf.c,v 1.45 2001/04/07 02:48:19 sniper Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -162,7 +162,7 @@
/* {{{ proto int fdf_open(string filename)
- Open a new FDF document */
+ Opens a new FDF document */
PHP_FUNCTION(fdf_open)
{
zval **file;
@@ -188,7 +188,7 @@
/* {{{ proto int fdf_create(void)
- Create a new FDF document */
+ Creates a new FDF document */
PHP_FUNCTION(fdf_create)
{
FDFDoc fdf;
@@ -207,7 +207,7 @@
/* {{{ proto bool fdf_close(int fdfdoc)
- Close the FDF document */
+ Closes the FDF document */
PHP_FUNCTION(fdf_close)
{
zval **fdfp;
@@ -224,7 +224,7 @@
/* {{{ proto string fdf_get_value(int fdfdoc, string fieldname)
- Get the value of a field as string */
+ Gets the value of a field as string */
PHP_FUNCTION(fdf_get_value)
{
zval **fdfp, **fieldname;
@@ -261,7 +261,7 @@
/* {{{ proto bool fdf_set_value(int fdfdoc, string fieldname, string value, int
isname)
- Set the value of a field */
+ Sets the value of a field */
PHP_FUNCTION(fdf_set_value)
{
zval **fdfp, **fieldname, **value, **isname;
@@ -289,7 +289,7 @@
/* {{{ proto string fdf_next_field_name(int fdfdoc [, string fieldname])
- Get the name of the next field name or the first field name */
+ Gets the name of the next field name or the first field name */
PHP_FUNCTION(fdf_next_field_name)
{
zval **fdfp, **field;
@@ -331,7 +331,7 @@
/* {{{ proto bool fdf_set_ap(int fdfdoc, string fieldname, int face, string filename,
int pagenr)
- Set the appearence of a field */
+ Sets the appearence of a field */
PHP_FUNCTION(fdf_set_ap)
{
zval **fdfp, **fieldname, **face, **filename, **pagenr;
@@ -381,7 +381,7 @@
/* {{{ proto bool fdf_set_status(int fdfdoc, string status)
- Set the value of /Status key */
+ Sets the value of /Status key */
PHP_FUNCTION(fdf_set_status)
{
zval **fdfp, **status;
@@ -408,7 +408,7 @@
/* {{{ proto string fdf_get_status(int fdfdoc)
- Get the value of /Status key */
+ Gets the value of /Status key */
PHP_FUNCTION(fdf_get_status)
{
zval **fdfp;
@@ -444,7 +444,7 @@
/* {{{ proto bool fdf_set_file(int fdfdoc, string filename)
- Set the value of /F key */
+ Sets the value of /F key */
PHP_FUNCTION(fdf_set_file)
{
zval **fdfp, **filename;
@@ -471,7 +471,7 @@
/* {{{ proto string fdf_get_file(int fdfdoc)
- Get the value of /F key */
+ Gets the value of /F key */
PHP_FUNCTION(fdf_get_file)
{
zval **fdfp;
@@ -507,7 +507,7 @@
/* {{{ proto bool fdf_save(int fdfdoc, string filename)
- Write out the FDF file */
+ Writes out the FDF file */
PHP_FUNCTION(fdf_save)
{
zval **fdfp, **filename;
@@ -534,7 +534,7 @@
/* {{{ proto bool fdf_add_template(int fdfdoc, int newpage, string filename, string
template, int rename)
- Add a template into the FDF document */
+ Adds a template into the FDF document */
PHP_FUNCTION(fdf_add_template)
{
zval **fdfp, **newpage, **filename, **template, **rename;
@@ -574,7 +574,7 @@
/* {{{ proto bool fdf_set_flags(int fdfdoc, string fieldname, int whichflags, int
newflags)
- Set flags for a field in the FDF document. */
+ Sets flags for a field in the FDF document */
PHP_FUNCTION(fdf_set_flags)
{
zval **fdfp, **fieldname, **flags, **newflags;
@@ -603,7 +603,7 @@
/* {{{ proto bool fdf_set_opt(int fdfdoc, string fieldname, int element, string
value, string name)
- Set a value in the opt array for a field. */
+ Sets a value in the opt array for a field */
PHP_FUNCTION(fdf_set_opt)
{
zval **fdfp, **fieldname, **element, **value, **name;
@@ -632,7 +632,7 @@
/* {{{ proto bool fdf_set_submit_form_action(int fdfdoc, string fieldname, int
whichtrigger, string url, int flags)
- Set the submit form action for a field. */
+ Sets the submit form action for a field */
PHP_FUNCTION(fdf_set_submit_form_action)
{
zval **fdfp, **fieldname, **trigger, **url, **flags;
@@ -661,7 +661,7 @@
/* {{{ proto bool fdf_set_javascript_action(int fdfdoc, string fieldname, int
whichtrigger, string script)
- Set the javascript action for a field. */
+ Sets the javascript action for a field */
PHP_FUNCTION(fdf_set_javascript_action)
{
zval **fdfp, **fieldname, **trigger, **script;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe,
Re: [PHP-CVS] cvs: php4 /ext/fdf fdf.c
On Fri, 6 Apr 2001, Sterling Hughes wrote: >On Sat, 7 Apr 2001, Jani Taskinen wrote: > >> sniper Fri Apr 6 19:48:20 2001 EDT >> >> Modified files: >> /php4/ext/fdffdf.c >> Log: >> fixed protos >> > > >Yikes, it seems like you moved the grammar backwards... > >>From what I remember of english, the active voice is the correct voice for >you to use in this case. Egon told me that they should be like that.. :) And those are only comments so what's the big deal anyway? --Jani -- 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]
