[PHP-CVS] cvs: php-src /ext/mnogosearch php_mnogo.c
gluke Wed Nov 12 02:40:17 2003 EDT
Modified files:
/php-src/ext/mnogosearchphp_mnogo.c
Log:
- A bug in WORDINFO calculation in mnogosearch extension was fixed.
Index: php-src/ext/mnogosearch/php_mnogo.c
diff -u php-src/ext/mnogosearch/php_mnogo.c:1.83
php-src/ext/mnogosearch/php_mnogo.c:1.84
--- php-src/ext/mnogosearch/php_mnogo.c:1.83Sat Nov 8 09:36:31 2003
+++ php-src/ext/mnogosearch/php_mnogo.c Wed Nov 12 02:40:16 2003
@@ -1,5 +1,5 @@
/* $Source: /usr/repository/php-src/ext/mnogosearch/php_mnogo.c,v $ */
-/* $Id: php_mnogo.c,v 1.83 2003/11/08 14:36:31 gluke Exp $ */
+/* $Id: php_mnogo.c,v 1.84 2003/11/12 07:40:16 gluke Exp $ */
/*
+--+
@@ -2247,7 +2247,6 @@
} else if (Res->WWList.Word[i].origin ==
UDM_WORD_ORIGIN_QUERY) {
sprintf(UDM_STREND(wordinfo),"%s%s : %d / %d",
(*wordinfo) ? ", " : "", Res->WWList.Word[i].word, Res->WWList.Word[i].count, ccount);
} else continue;
- sprintf(UDM_STREND(wordinfo)," / %d", ccount);
}
RETURN_STRING(wordinfo,1);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mnogosearch php_mnogo.c
gluke Wed Nov 12 02:52:57 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mnogosearchphp_mnogo.c
Log:
- A WORDINFO calculation in mnogosearch extension was fixed
Index: php-src/ext/mnogosearch/php_mnogo.c
diff -u php-src/ext/mnogosearch/php_mnogo.c:1.66.2.9
php-src/ext/mnogosearch/php_mnogo.c:1.66.2.10
--- php-src/ext/mnogosearch/php_mnogo.c:1.66.2.9Sat Nov 8 09:39:14 2003
+++ php-src/ext/mnogosearch/php_mnogo.c Wed Nov 12 02:52:56 2003
@@ -1,5 +1,5 @@
/* $Source: /usr/repository/php-src/ext/mnogosearch/php_mnogo.c,v $ */
-/* $Id: php_mnogo.c,v 1.66.2.9 2003/11/08 14:39:14 gluke Exp $ */
+/* $Id: php_mnogo.c,v 1.66.2.10 2003/11/12 07:52:56 gluke Exp $ */
/*
+--+
@@ -2247,7 +2247,6 @@
} else if (Res->WWList.Word[i].origin ==
UDM_WORD_ORIGIN_QUERY) {
sprintf(UDM_STREND(wordinfo),"%s%s : %d / %d",
(*wordinfo) ? ", " : "", Res->WWList.Word[i].word, Res->WWList.Word[i].count, ccount);
} else continue;
- sprintf(UDM_STREND(wordinfo)," / %d", ccount);
}
RETURN_STRING(wordinfo,1);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ming ming.c
helly Wed Nov 12 04:12:51 2003 EDT
Modified files:
/php-src/ext/ming ming.c
Log:
Compiler fixes for older ming versions
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.58 php-src/ext/ming/ming.c:1.59
--- php-src/ext/ming/ming.c:1.58Thu Nov 6 20:17:31 2003
+++ php-src/ext/ming/ming.c Wed Nov 12 04:12:50 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ming.c,v 1.58 2003/11/07 01:17:31 iliaa Exp $ */
+/* $Id: ming.c,v 1.59 2003/11/12 09:12:50 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -68,7 +68,9 @@
static SWFMorph getMorph(zval *id TSRMLS_DC);
static SWFMovieClip getSprite(zval *id TSRMLS_DC);
static SWFSound getSound(zval *id TSRMLS_DC);
+#ifdef HAVE_NEW_MING
static SWFSoundInstance getSoundInstance(zval *id TSRMLS_DC);
+#endif
#define PHP_MING_FILE_CHK(file) \
if ((PG(safe_mode) && !php_checkuid((file), NULL,
CHECKUID_CHECK_FILE_AND_DIR)) || php_check_open_basedir((file) TSRMLS_CC)) { \
@@ -140,7 +142,6 @@
static int le_swfgradientp;
static int le_swfbitmapp;
static int le_swffontp;
-static int le_swffontcharp;
static int le_swftextp;
static int le_swftextfieldp;
static int le_swfdisplayitemp;
@@ -150,7 +151,10 @@
static int le_swfspritep;
static int le_swfinputp;
static int le_swfsoundp;
+#ifdef HAVE_NEW_MING
+static int le_swffontcharp;
static int le_swfsoundinstancep;
+#endif
static zend_class_entry *movie_class_entry_ptr;
static zend_class_entry *shape_class_entry_ptr;
@@ -158,7 +162,6 @@
static zend_class_entry *gradient_class_entry_ptr;
static zend_class_entry *bitmap_class_entry_ptr;
static zend_class_entry *font_class_entry_ptr;
-static zend_class_entry *fontchar_class_entry_ptr;
static zend_class_entry *text_class_entry_ptr;
static zend_class_entry *textfield_class_entry_ptr;
static zend_class_entry *displayitem_class_entry_ptr;
@@ -167,7 +170,10 @@
static zend_class_entry *morph_class_entry_ptr;
static zend_class_entry *sprite_class_entry_ptr;
static zend_class_entry *sound_class_entry_ptr;
+#ifdef HAVE_NEW_MING
+static zend_class_entry *fontchar_class_entry_ptr;
static zend_class_entry *soundinstance_class_entry_ptr;
+#endif
/* {{{ internal function SWFgetProperty
*/
@@ -1294,6 +1300,7 @@
/* }}} */
/* }}} */
+#ifdef HAVE_NEW_MING
/* {{{ SWFFontCharacter */
static zend_function_entry swffontchar_functions[] = {
@@ -1351,8 +1358,9 @@
SWFFontCharacter_addUTF8Chars(getFontCharacter(getThis() TSRMLS_CC),
Z_STRVAL_PP(zstring));
}
/* }}} */
-
/* }}} */
+#endif
+
/* {{{ SWFFont
*/
static zend_function_entry swffont_functions[] = {
@@ -1552,6 +1560,7 @@
free(result);
}
/* }}} */
+/* }}} */
#endif
/* }}} */
@@ -1722,7 +1731,6 @@
/* }}} */
/* {{{ proto class swfsound_init(string filename, int flags)
Returns a new SWFSound object from given file */
-
PHP_FUNCTION(swfsound_init)
{
zval **zfile, **zflags;
@@ -1757,7 +1765,11 @@
else
input = getInput(zfile TSRMLS_CC);
+#ifdef HAVE_NEW_MING
sound = newSWFSound_fromInput(input, flags);
+#else
+ sound = newSWFSound_fromInput(input);
+#endif
ret = zend_list_insert(sound, le_swfsoundp);
@@ -3412,8 +3424,10 @@
PHP_FALIAS(setcolor, swftextfield_setColor,NULL)
PHP_FALIAS(setname, swftextfield_setName, NULL)
PHP_FALIAS(addstring, swftextfield_addString, NULL)
+#ifdef HAVE_NEW_MING
PHP_FALIAS(setpadding,swftextfield_setPadding, NULL)
PHP_FALIAS(addchars, swftextfield_addChars,NULL)
+#endif
{ NULL, NULL, NULL }
};
@@ -3653,6 +3667,7 @@
}
/* }}} */
+#ifdef HAVE_NEW_MING
/* {{{ proto void swftextfield_setPadding(float padding)
Sets the padding of this textfield */
PHP_FUNCTION(swftextfield_setPadding)
@@ -3685,7 +3700,7 @@
}
/* }}} */
-/* }}} */
+#endif
zend_module_entry ming_module_entry = {
STANDARD_MODULE_HEADER,
@@ -3754,7 +3769,6 @@
zend_class_entry text_class_entry;
zend_class_entry textfield_class_entry;
zend_class_entry font_class_entry;
- zend_class_entry fontchar_class_entry;
zend_class_entry displayitem_class_entry;
zend_class_entry movie_class_entry;
zend_class_entry button_class_entry;
@@ -3762,7 +3776,10 @@
zend_class_entry morph_class_entry;
zend_class_entry sprite_class_entry;
zend_class_entry sound_class_entry;
+#ifdef HAVE_NEW_MING
+ zend_class_entry fontchar_class_entry;
zend_class_entry soundinstance_class_entry;
+#endif
Ming_setErrorFunction((void *) php_ming_error);
@@ -3823,7 +3840,6 @@
le_swftextp = zend_register_list_destructors_ex(destroy_SWFText_resource,
NULL, "SWFText", module_number);
le_swftextfieldp =
zend_register_list_destructors_ex(destroy_SWFTextField_resource, NU
[PHP-CVS] cvs: php-src / NEWS
abies Wed Nov 12 06:29:27 2003 EDT Modified files: /php-srcNEWS Log: Added new ibase array handling (was already present in b2) Index: php-src/NEWS diff -u php-src/NEWS:1.1493 php-src/NEWS:1.1494 --- php-src/NEWS:1.1493 Fri Nov 7 23:44:26 2003 +++ php-src/NEWSWed Nov 12 06:29:25 2003 @@ -21,6 +21,7 @@ . Added support for multiple databases into ibase_trans() . Added support for CREATE DATABASE, SET TRANSACTION and EXECUTE PROCEDURE statements into ibase_query() + . Added ability to bind PHP arrays to native Interbase arrays . Added ibase_commit_ret() and ibase_rollback_ret() . Added ibase_drop_db() . Added ibase_gen_id() -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dba dba.c php_dba.h
helly Wed Nov 12 16:43:04 2003 EDT
Modified files:
/php-src/ext/dbadba.c php_dba.h
Log:
Add helper function that splits inifile keys into an array which again
can be used in dba_fetch calls.
Index: php-src/ext/dba/dba.c
diff -u php-src/ext/dba/dba.c:1.100 php-src/ext/dba/dba.c:1.101
--- php-src/ext/dba/dba.c:1.100 Thu Aug 28 13:56:41 2003
+++ php-src/ext/dba/dba.c Wed Nov 12 16:43:03 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dba.c,v 1.100 2003/08/28 17:56:41 iliaa Exp $ */
+/* $Id: dba.c,v 1.101 2003/11/12 21:43:03 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -66,6 +66,7 @@
PHP_FE(dba_sync, NULL)
PHP_FE(dba_handlers, NULL)
PHP_FE(dba_list, NULL)
+ PHP_FE(dba_key_split, NULL)
{NULL, NULL, NULL}
};
/* }}} */
@@ -907,6 +908,27 @@
}
DBA_ID_DONE;
RETURN_FALSE;
+}
+/* }}} */
+
+/* {{{ proto array dba_key_split(string key)
+ Splits an inifile key into an array of the form array(0=>group,1=>value_name) */
+PHP_FUNCTION(dba_key_split)
+{
+ char *key, *name;
+ int key_len;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &key, &key_len) ==
FAILURE) {
+ return;
+ }
+ array_init(return_value);
+ if (key[0] == '[' && (name = strchr(key, ']')) != NULL) {
+ add_next_index_stringl(return_value, key+1, name - (key + 1), 1);
+ add_next_index_stringl(return_value, name+1, key_len - (name - key +
1), 1);
+ } else {
+ add_next_index_stringl(return_value, "", 0, 1);
+ add_next_index_stringl(return_value, key, key_len, 1);
+ }
}
/* }}} */
Index: php-src/ext/dba/php_dba.h
diff -u php-src/ext/dba/php_dba.h:1.25 php-src/ext/dba/php_dba.h:1.26
--- php-src/ext/dba/php_dba.h:1.25 Tue Jun 10 16:03:26 2003
+++ php-src/ext/dba/php_dba.h Wed Nov 12 16:43:03 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_dba.h,v 1.25 2003/06/10 20:03:26 imajes Exp $ */
+/* $Id: php_dba.h,v 1.26 2003/11/12 21:43:03 helly Exp $ */
#ifndef PHP_DBA_H
#define PHP_DBA_H
@@ -138,6 +138,7 @@
PHP_FUNCTION(dba_sync);
PHP_FUNCTION(dba_handlers);
PHP_FUNCTION(dba_list);
+PHP_FUNCTION(dba_key_split);
#else
#define dba_module_ptr NULL
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
helly Wed Nov 12 16:48:21 2003 EDT Modified files: /php-srcNEWS Log: Update Index: php-src/NEWS diff -u php-src/NEWS:1.1494 php-src/NEWS:1.1495 --- php-src/NEWS:1.1494 Wed Nov 12 06:29:25 2003 +++ php-src/NEWSWed Nov 12 16:48:19 2003 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? Oct 2003, PHP 5 Beta 3 +- Added dba_key_split() to split inifile keys in an array. (Marcus) - Fixed bug #26083 (Non-working write support in ext/dom). (Ilia) - Fixed bug #24394 (Serializing cross-referenced objects causes segfault). (Moriyoshi) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard fsock.c
jay Wed Nov 12 17:01:03 2003 EDT
Modified files:
/php-src/ext/standard fsock.c
Log:
Plugged a small memleak when errstr isn't efree()'d.
Index: php-src/ext/standard/fsock.c
diff -u php-src/ext/standard/fsock.c:1.116 php-src/ext/standard/fsock.c:1.117
--- php-src/ext/standard/fsock.c:1.116 Thu Aug 28 12:49:57 2003
+++ php-src/ext/standard/fsock.cWed Nov 12 17:01:02 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: fsock.c,v 1.116 2003/08/28 16:49:57 sas Exp $ */
+/* $Id: fsock.c,v 1.117 2003/11/12 22:01:02 jay Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -100,6 +100,10 @@
zval_dtor(zerrstr);
ZVAL_STRING(zerrstr, errstr, 0);
}
+ else if (!zerrstr && errstr) {
+ efree(errstr);
+ }
+
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
iliaa Wed Nov 12 17:02:38 2003 EDT
Modified files:
/php-srcNEWS
/php-src/ext/standard basic_functions.c basic_functions.h
Log:
Added nanosleep(), in addition to allowing setting of very short states.
This function is signal safe.
Index: php-src/NEWS
diff -u php-src/NEWS:1.1495 php-src/NEWS:1.1496
--- php-src/NEWS:1.1495 Wed Nov 12 16:48:19 2003
+++ php-src/NEWSWed Nov 12 17:02:36 2003
@@ -1,7 +1,9 @@
PHPNEWS
|||
?? Oct 2003, PHP 5 Beta 3
-- Added dba_key_split() to split inifile keys in an array. (Marcus)
+- Added new functions:
+ . dba_key_split() to split inifile keys in an array. (Marcus)
+ . nanosleep() signal safe sleep (Magnus, Ilia)
- Fixed bug #26083 (Non-working write support in ext/dom). (Ilia)
- Fixed bug #24394 (Serializing cross-referenced objects causes segfault).
(Moriyoshi)
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.638
php-src/ext/standard/basic_functions.c:1.639
--- php-src/ext/standard/basic_functions.c:1.638Sun Nov 9 23:12:38 2003
+++ php-src/ext/standard/basic_functions.c Wed Nov 12 17:02:37 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.638 2003/11/10 04:12:38 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.639 2003/11/12 22:02:37 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -301,6 +301,7 @@
PHP_FE(bin2hex,
NULL)
PHP_FE(sleep,
NULL)
PHP_FE(usleep,
NULL)
+ PHP_FE(nanosleep,
NULL)
PHP_FE(time,
NULL)
PHP_FE(mktime,
NULL)
PHP_FE(gmmktime,
NULL)
@@ -1687,6 +1688,34 @@
convert_to_long_ex(num);
usleep(Z_LVAL_PP(num));
#endif
+}
+/* }}} */
+
+/* {{{ proto mixed nanosleep(long seconds, long nanoseconds)
+ Delay for a number of seconds and nano seconds */
+PHP_FUNCTION(nanosleep)
+{
+ long tv_sec, tv_nsec;
+ struct timespec php_req, php_rem;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &tv_sec, &tv_nsec))
{
+ WRONG_PARAM_COUNT;
+ }
+
+ php_req.tv_sec = (time_t) tv_sec;
+ php_req.tv_nsec = tv_nsec;
+ if (!nanosleep(&php_req, &php_rem)) {
+ RETURN_TRUE;
+ } else if (errno == EINTR) {
+ array_init(return_value);
+ add_assoc_long_ex(return_value, "seconds", sizeof("seconds"),
php_rem.tv_sec);
+ add_assoc_long_ex(return_value, "nanoseconds", sizeof("nanoseconds"),
php_rem.tv_nsec);
+ return;
+ } else if (errno == EINVAL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "nanoseconds was not in
the range 0 to 999 999 999 or seconds was negative");
+ }
+
+ RETURN_FALSE;
}
/* }}} */
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.125
php-src/ext/standard/basic_functions.h:1.126
--- php-src/ext/standard/basic_functions.h:1.125Fri Nov 7 04:26:18 2003
+++ php-src/ext/standard/basic_functions.h Wed Nov 12 17:02:37 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.h,v 1.125 2003/11/07 09:26:18 helly Exp $ */
+/* $Id: basic_functions.h,v 1.126 2003/11/12 22:02:37 iliaa Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -48,6 +48,7 @@
PHP_FUNCTION(toggle_short_open_tag);
PHP_FUNCTION(sleep);
PHP_FUNCTION(usleep);
+PHP_FUNCTION(nanosleep);
PHP_FUNCTION(flush);
PHP_FUNCTION(ip2long);
PHP_FUNCTION(long2ip);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /main rfc1867.c
sesser Wed Nov 12 17:34:35 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main rfc1867.c
Log:
Fix odd increments to repair the boundary checks.
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.122.2.15 php-src/main/rfc1867.c:1.122.2.16
--- php-src/main/rfc1867.c:1.122.2.15 Thu Nov 6 10:41:37 2003
+++ php-src/main/rfc1867.c Wed Nov 12 17:34:34 2003
@@ -16,7 +16,7 @@
| Jani Taskinen <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: rfc1867.c,v 1.122.2.15 2003/11/06 15:41:37 hirokawa Exp $ */
+/* $Id: rfc1867.c,v 1.122.2.16 2003/11/12 22:34:34 sesser Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -72,6 +72,10 @@
void php_mb_gpc_realloc_buffer(char ***pval_list, int **plen_list, int *num_vars_max,
int inc TSRMLS_DC)
{
+ /* allow only even increments */
+ if (inc & 1) {
+ inc++;
+ }
(*num_vars_max) += inc;
*pval_list = (char **)erealloc(*pval_list, (*num_vars_max+2)*sizeof(char *));
*plen_list = (int *)erealloc(*plen_list, (*num_vars_max+2)*sizeof(int));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main rfc1867.c
sesser Wed Nov 12 17:34:59 2003 EDT
Modified files:
/php-src/main rfc1867.c
Log:
Fix odd increments to repair the boundary checks.
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.145 php-src/main/rfc1867.c:1.146
--- php-src/main/rfc1867.c:1.145Wed Nov 5 18:27:41 2003
+++ php-src/main/rfc1867.c Wed Nov 12 17:34:58 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: rfc1867.c,v 1.145 2003/11/05 23:27:41 hirokawa Exp $ */
+/* $Id: rfc1867.c,v 1.146 2003/11/12 22:34:58 sesser Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -73,6 +73,10 @@
void php_mb_gpc_realloc_buffer(char ***pval_list, int **plen_list, int *num_vars_max,
int inc TSRMLS_DC)
{
+ /* allow only even increments */
+ if (inc & 1) {
+ inc++;
+ }
(*num_vars_max) += inc;
*pval_list = (char **)erealloc(*pval_list, (*num_vars_max+2)*sizeof(char *));
*plen_list = (int *)erealloc(*plen_list, (*num_vars_max+2)*sizeof(int));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard image.c
helly Wed Nov 12 17:51:22 2003 EDT
Modified files:
/php-src/ext/standard image.c
Log:
Bugfix #26216: ("getimagesize(): stream does not support seeking" when
using remote files)
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.94 php-src/ext/standard/image.c:1.95
--- php-src/ext/standard/image.c:1.94 Sat Oct 25 10:06:26 2003
+++ php-src/ext/standard/image.cWed Nov 12 17:51:22 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: image.c,v 1.94 2003/10/25 14:06:26 helly Exp $ */
+/* $Id: image.c,v 1.95 2003/11/12 22:51:22 helly Exp $ */
#include "php.h"
#include
@@ -1201,7 +1201,7 @@
WRONG_PARAM_COUNT;
}
- stream = php_stream_open_wrapper(Z_STRVAL_PP(arg1), "rb",
REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL);
+ stream = php_stream_open_wrapper(Z_STRVAL_PP(arg1), "rb",
STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL);
if (!stream) {
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard image.c
helly Wed Nov 12 17:56:09 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard image.c
Log:
MFH Bugfix #26216: ("getimagesize(): stream does not support seeking" when
using remote files)
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.72.2.12 php-src/ext/standard/image.c:1.72.2.13
--- php-src/ext/standard/image.c:1.72.2.12 Mon Nov 3 20:38:33 2003
+++ php-src/ext/standard/image.cWed Nov 12 17:56:09 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: image.c,v 1.72.2.12 2003/11/04 01:38:33 iliaa Exp $ */
+/* $Id: image.c,v 1.72.2.13 2003/11/12 22:56:09 helly Exp $ */
#include "php.h"
#include
@@ -1201,7 +1201,7 @@
WRONG_PARAM_COUNT;
}
- stream = php_stream_open_wrapper(Z_STRVAL_PP(arg1), "rb",
REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL);
+ stream = php_stream_open_wrapper(Z_STRVAL_PP(arg1), "rb",
STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL);
if (!stream) {
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
helly Wed Nov 12 17:58:01 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
Log:
BFN
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.466 php-src/NEWS:1.1247.2.467
--- php-src/NEWS:1.1247.2.466 Tue Nov 11 22:05:24 2003
+++ php-src/NEWSWed Nov 12 17:58:00 2003
@@ -3,6 +3,8 @@
?? ??? 2003, Version 4.3.5
- Fixed header handler in NSAPI SAPI module (header->replace was ignored,
send_default_content_type now sends value from php.ini). (Uwe Schindler)
+- Fixed bug #26216 ("getimagesize(): stream does not support seeking" when
+ using remote files). (Marcus)
- Fixed bug #26201 (crash in ibase_trans() on invalid link handle). (Ilia)
- Fixed bug #26198 (strtotime() handling of M/F Y date format). (Ilia)
- Fixed bug #26176 (Fixed handling of numeric keys in INI files). (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
Hmm, did you ever think of an idea of allowing float values for usleep() instead of adding one more redundancy to the existing two look-alikes? Moriyoshi On 2003/11/13, at 7:02, Ilia Alshanetsky wrote: iliaa Wed Nov 12 17:02:38 2003 EDT Modified files: /php-src NEWS /php-src/ext/standard basic_functions.c basic_functions.h Log: Added nanosleep(), in addition to allowing setting of very short states. This function is signal safe. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
On Wed, Nov 12, 2003 at 10:02:38PM -, Ilia Alshanetsky wrote:
> iliaa Wed Nov 12 17:02:38 2003 EDT
>
> Modified files:
> /php-src NEWS
> /php-src/ext/standard basic_functions.c basic_functions.h
> Log:
> Added nanosleep(), in addition to allowing setting of very short states.
> This function is signal safe.
nanosleep() does not exist on all Unixes at least, this will need an
autoconf check...
> +/* {{{ proto mixed nanosleep(long seconds, long nanoseconds)
> + Delay for a number of seconds and nano seconds */
> +PHP_FUNCTION(nanosleep)
> +{
> + long tv_sec, tv_nsec;
> + struct timespec php_req, php_rem;
> +
> + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &tv_sec, &tv_nsec))
> {
> + WRONG_PARAM_COUNT;
> + }
> +
> + php_req.tv_sec = (time_t) tv_sec;
> + php_req.tv_nsec = tv_nsec;
> + if (!nanosleep(&php_req, &php_rem)) {
> + RETURN_TRUE;
> + } else if (errno == EINTR) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
On November 12, 2003 06:02 pm, Moriyoshi Koizumi wrote: > Hmm, did you ever think of an idea of allowing float values for usleep() > instead of adding one more redundancy to the existing two look-alikes? Actually I have, but you'll notice that unlike other sleep functions nanosleep() can return an array, which allows resuming of sleep if it was interrupted by a signal. Changing functionality of existing functions would break backwards compatibility. Also, unlike usleep() which is BSD 4.3 (not avaliable on all systems) nanosleep is POSIX. Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main rfc1867.c
sesser Wed Nov 12 17:34:59 2003 EDT Modified files: /php-src/main rfc1867.c Log: Fix odd increments to repair the boundary checks. I might be missing something, but what is the exact problem behind the description? As far as I'm concerned, that weird increment is necessary because the variable name and its value are stored alternately in the vector. Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
On 2003/11/13, at 8:14, Ilia Alshanetsky wrote: On November 12, 2003 06:02 pm, Moriyoshi Koizumi wrote: Hmm, did you ever think of an idea of allowing float values for usleep() instead of adding one more redundancy to the existing two look-alikes? Actually I have, but you'll notice that unlike other sleep functions nanosleep() can return an array, which allows resuming of sleep if it was interrupted by a signal. Changing functionality of existing functions would break backwards compatibility. Also, unlike usleep() which is BSD 4.3 (not avaliable on all systems) nanosleep is POSIX. Well, then it looks like I have to wonder, if there is any option to get them combined into an unified function, hopefully by deprecating two of those? Moriyoshi Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
On November 12, 2003 06:16 pm, Moriyoshi Koizumi wrote: > Well, then it looks like I have to wonder, if there is any option to > get them combined into an unified function, hopefully by deprecating > two of those? What would be the advantage of such an approach? Code wise you won't gain any reduction and you may change the behaviour of an existing function. Each function is based on a different underlying C function is a wrapper of said function, why change that? Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
On 2003/11/13, at 8:31, Ilia Alshanetsky wrote: On November 12, 2003 06:16 pm, Moriyoshi Koizumi wrote: Well, then it looks like I have to wonder, if there is any option to get them combined into an unified function, hopefully by deprecating two of those? What would be the advantage of such an approach? Code wise you won't gain any reduction and you may change the behaviour of an existing function. Each function is based on a different underlying C function is a wrapper of said function, why change that? I think it'd rather belong to a matter of stupidity that the user has to choose the available function in order to accomplish a common purpose. Actually they don't act like one another though. Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/dom config.m4 /ext/libxml config.m4 config0.m4 /ext/simplexml config.m4 /ext/xml config.m4
sniper Wed Nov 12 18:42:38 2003 EDT Added files: /php-src/ext/libxml config0.m4 Removed files: /php-src/ext/libxml config.m4 Modified files: /php-srcNEWS /php-src/ext/simplexml config.m4 /php-src/ext/xmlconfig.m4 /php-src/ext/domconfig.m4 Log: - Fixed bug #26072 (--disable-libxml does not work). Index: php-src/NEWS diff -u php-src/NEWS:1.1496 php-src/NEWS:1.1497 --- php-src/NEWS:1.1496 Wed Nov 12 17:02:36 2003 +++ php-src/NEWSWed Nov 12 18:42:35 2003 @@ -4,6 +4,7 @@ - Added new functions: . dba_key_split() to split inifile keys in an array. (Marcus) . nanosleep() signal safe sleep (Magnus, Ilia) +- Fixed bug #26072 (--disable-libxml does not work). (Jani) - Fixed bug #26083 (Non-working write support in ext/dom). (Ilia) - Fixed bug #24394 (Serializing cross-referenced objects causes segfault). (Moriyoshi) Index: php-src/ext/simplexml/config.m4 diff -u php-src/ext/simplexml/config.m4:1.6 php-src/ext/simplexml/config.m4:1.7 --- php-src/ext/simplexml/config.m4:1.6 Mon Jun 30 13:23:52 2003 +++ php-src/ext/simplexml/config.m4 Wed Nov 12 18:42:35 2003 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.6 2003/06/30 17:23:52 sniper Exp $ +dnl $Id: config.m4,v 1.7 2003/11/12 23:42:35 sniper Exp $ dnl config.m4 for extension simplexml PHP_ARG_ENABLE(simplexml, whether to enable simplexml support, @@ -9,7 +9,7 @@ [ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix], no, no) fi -if test "$PHP_SIMPLEXML" != "no"; then +if test "$PHP_SIMPLEXML" != "no" && test "$PHP_LIBXML" != "no"; then PHP_SETUP_LIBXML(SIMPLEXML_SHARED_LIBADD, [ AC_DEFINE(HAVE_SIMPLEXML,1,[ ]) Index: php-src/ext/xml/config.m4 diff -u php-src/ext/xml/config.m4:1.47 php-src/ext/xml/config.m4:1.48 --- php-src/ext/xml/config.m4:1.47 Mon Jun 30 13:23:52 2003 +++ php-src/ext/xml/config.m4 Wed Nov 12 18:42:36 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.47 2003/06/30 17:23:52 sniper Exp $ +dnl $Id: config.m4,v 1.48 2003/11/12 23:42:36 sniper Exp $ dnl PHP_ARG_ENABLE(xml,whether to enable XML support, @@ -13,7 +13,7 @@ PHP_ARG_WITH(libexpat-dir, libexpat install dir, [ --with-libexpat-dir=DIR XML: libexpat install prefix (deprecated)], no, no) -if test "$PHP_XML" != "no"; then +if test "$PHP_XML" != "no" && test "$PHP_LIBXML" != "no" -o "$PHP_LIBEXPAT_DIR" != "no"; then dnl dnl Default to libxml2. dnl @@ -24,7 +24,7 @@ AC_MSG_ERROR([xml2-config not found. Use --with-libxml-dir=]) fi ]) - + dnl dnl Check for expat only if --with-libexpat-dir is used. dnl Index: php-src/ext/dom/config.m4 diff -u php-src/ext/dom/config.m4:1.11 php-src/ext/dom/config.m4:1.12 --- php-src/ext/dom/config.m4:1.11 Thu Jul 24 09:18:40 2003 +++ php-src/ext/dom/config.m4 Wed Nov 12 18:42:37 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.11 2003/07/24 13:18:40 rrichards Exp $ +dnl $Id: config.m4,v 1.12 2003/11/12 23:42:37 sniper Exp $ dnl PHP_ARG_ENABLE(dom, whether to enable DOM support, @@ -10,7 +10,7 @@ [ --with-libxml-dir[=DIR] DOM: libxml2 install prefix.], no, no) fi -if test "$PHP_DOM" != "no"; then +if test "$PHP_DOM" != "no" && test "$PHP_LIBXML" != "no"; then PHP_SETUP_LIBXML(DOM_SHARED_LIBADD, [ AC_DEFINE(HAVE_DOM,1,[ ]) @@ -22,7 +22,7 @@ documenttype.c domimplementationlist.c entity.c \ nodelist.c text.c comment.c domconfiguration.c \ domimplementationsource.c entityreference.c \ - notation.c xpath.c \ +notation.c xpath.c \ typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c], $ext_shared) PHP_SUBST(DOM_SHARED_LIBADD) Index: php-src/ext/libxml/config0.m4 +++ php-src/ext/libxml/config0.m4 dnl dnl $Id: config0.m4,v 1.1 2003/11/12 23:42:38 sniper Exp $ dnl PHP_ARG_ENABLE(libxml, whether to enable LIBXML support, [ --disable-libxmlDisable new LIBXML support.], yes) if test -z "$PHP_LIBXML_DIR"; then PHP_ARG_WITH(libxml-dir, libxml2 install dir, [ --with-libxml-dir[=DIR] libxml2 install prefix.], no, no) fi if test "$PHP_LIBXML" != "no"; then dnl This extension can not be build as shared ext_shared=no PHP_SETUP_LIBXML(LIBXML_SHARED_LIBADD, [ AC_DEFINE(HAVE_LIBXML,1,[ ]) PHP_NEW_EXTENSION(libxml, [libxml.c], $ext_shared) ], [ AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.]) ]) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
On November 12, 2003 06:34 pm, Moriyoshi Koizumi wrote:Moriyoshi > I think it'd rather belong to a matter of stupidity that the user has to > choose the available function in order to accomplish a common purpose. > Actually they don't act like one another though. Well, the 3 sleep functions we now have are actually quite different. sleep() offers a basic second based functionality. As far as glibc goes sleep() on many platforms is implemented using nanosleep(). usleep() allows sleeping at 1/1,000,000 intervals nanosleep() allows an easy way to sleep for given amount of seconds and sleep precision of up to 1/1,000,000,000 of a second. In addition allowing you to resume sleep if it was interrupted by a signal. To me it seems like each of the 3 functions offer distinct functionality and the user now has greater flexibility, when it comes to pausing their scripts. Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /ext/standard basic_functions.c basic_functions.h
iliaa Wed Nov 12 18:43:47 2003 EDT
Modified files:
/php-srcconfigure.in
/php-src/ext/standard basic_functions.h basic_functions.c
Log:
Added configure check for nanosleep() availability.
Index: php-src/configure.in
diff -u php-src/configure.in:1.476 php-src/configure.in:1.477
--- php-src/configure.in:1.476 Thu Oct 30 10:14:29 2003
+++ php-src/configure.inWed Nov 12 18:43:46 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.476 2003/10/30 15:14:29 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.477 2003/11/12 23:43:46 iliaa Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -526,6 +526,7 @@
tzset \
unsetenv \
usleep \
+nanosleep \
utime \
vsnprintf \
)
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.126
php-src/ext/standard/basic_functions.h:1.127
--- php-src/ext/standard/basic_functions.h:1.126Wed Nov 12 17:02:37 2003
+++ php-src/ext/standard/basic_functions.h Wed Nov 12 18:43:46 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.h,v 1.126 2003/11/12 22:02:37 iliaa Exp $ */
+/* $Id: basic_functions.h,v 1.127 2003/11/12 23:43:46 iliaa Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -48,7 +48,9 @@
PHP_FUNCTION(toggle_short_open_tag);
PHP_FUNCTION(sleep);
PHP_FUNCTION(usleep);
+#if HAVE_NANOSLEEP
PHP_FUNCTION(nanosleep);
+#endif
PHP_FUNCTION(flush);
PHP_FUNCTION(ip2long);
PHP_FUNCTION(long2ip);
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.639
php-src/ext/standard/basic_functions.c:1.640
--- php-src/ext/standard/basic_functions.c:1.639Wed Nov 12 17:02:37 2003
+++ php-src/ext/standard/basic_functions.c Wed Nov 12 18:43:46 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.639 2003/11/12 22:02:37 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.640 2003/11/12 23:43:46 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -301,7 +301,9 @@
PHP_FE(bin2hex,
NULL)
PHP_FE(sleep,
NULL)
PHP_FE(usleep,
NULL)
+#if HAVE_NANOSLEEP
PHP_FE(nanosleep,
NULL)
+#endif
PHP_FE(time,
NULL)
PHP_FE(mktime,
NULL)
PHP_FE(gmmktime,
NULL)
@@ -1691,6 +1693,7 @@
}
/* }}} */
+#if HAVE_NANOSLEEP
/* {{{ proto mixed nanosleep(long seconds, long nanoseconds)
Delay for a number of seconds and nano seconds */
PHP_FUNCTION(nanosleep)
@@ -1718,6 +1721,7 @@
RETURN_FALSE;
}
/* }}} */
+#endif
/* {{{ proto string get_current_user(void)
Get the name of the owner of the current PHP script */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
Ilia Alshanetsky wrote: On November 12, 2003 06:34 pm, Moriyoshi Koizumi wrote:Moriyoshi I think it'd rather belong to a matter of stupidity that the user has to choose the available function in order to accomplish a common purpose. Actually they don't act like one another though. Well, the 3 sleep functions we now have are actually quite different. sleep() offers a basic second based functionality. As far as glibc goes sleep() on many platforms is implemented using nanosleep(). usleep() allows sleeping at 1/1,000,000 intervals nanosleep() allows an easy way to sleep for given amount of seconds and sleep precision of up to 1/1,000,000,000 of a second. In addition allowing you to resume sleep if it was interrupted by a signal. To me it seems like each of the 3 functions offer distinct functionality and the user now has greater flexibility, when it comes to pausing their scripts. Ilia In my opinion as a user, I would say allow sleep() to accept floats, and depreciate usleep(). If sleep() is implemented with nanosleep() anyway, is there a point to having both? If you allow sleep() to accept floats, people using integers will still have support anyway. The only people that require adjusting their code eventually once usleep() is depreciated will be the ones using usleep(). Nathan -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
On November 12, 2003 06:58 pm, Nathan Sullivan wrote: > In my opinion as a user, I would say allow sleep() to accept floats, and > depreciate usleep(). If sleep() is implemented with nanosleep() anyway, > is there a point to having both? Yes, some systems do not have nanosleep, in those cases sleep() is implemented using alarm(). Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
