[PHP-CVS] cvs: php4 /scripts/ext_skel_ng php_logo.php php_resource.php
hholzgraWed Feb 26 05:06:47 2003 EDT
Added files:
/php4/scripts/ext_skel_ng php_logo.php php_resource.php
Log:
forgot to add these two on my last commit :(
Index: php4/scripts/ext_skel_ng/php_logo.php
+++ php4/scripts/ext_skel_ng/php_logo.php
?php
class php_logo extends php_element {
function php_logo($name, $attr) {
$this-name = $name;
$this-attr = $attr;
$this-id = ''.strtoupper($name).'_LOGO_ID';
$this-data = file_get_contents($attr['src']);
$this-size = strlen($this-data);
$this-mime_type = image/gif;
}
function docbook_xml($base) {
return ;
}
function minit_code() {
return php_register_info_logo({$this-id},
\{$this-mime_type}\, {$this-name}_logo, {$this-size});\n;
}
function c_code() {
return
static unsigned char {$this-name}_logo[] = {
#include \{$this-name}_logo.h\
};
;
}
function h_code() {
$len = strlen($this-data);
$code = ;
$i=0;
for($n = 0; $n $len; $n++) {
$code .= sprintf( %3d,ord($this-data[$n]));
if($n == $len - 1) break;
$code .= ,;
if(++$i==8) {
$code .= \n ;
$i=0;
}
}
$code .= \n;
return $code;
}
}
?
Index: php4/scripts/ext_skel_ng/php_resource.php
+++ php4/scripts/ext_skel_ng/php_resource.php
?php
class php_resource extends php_element {
function php_resource($name, $payload, $destruct, $description) {
$this-name = $name;
$this-payload = $payload;
$this-destruct = $destruct;
$this-description = $description;
if (empty($this-destruct) strstr($this-payload, *)) {
$this-destruct = free(resource);\n;
}
if(empty($this-payload)) {
$this-payload = int;
}
}
function docbook_xml($base) {
return
section id='$base.resources.{$this-name}'
titlelitera{$this-name}/literal/title
para
{$this-description}
/para
/section
;
}
function minit_code() {
return
le_{$this-name} = zend_register_list_destructors_ex({$this-name}_dtor,
NULL,
\{$this-name}\,
module_number);
;
}
function c_code() {
return
int le_{$this-name};
void {$this-name}_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
{$this-payload} resource = ({$this-payload})(rsrc-ptr);
{$this-destruct}
}
;
}
function h_code() {
$upname = strtoupper($this-name);
return
#define {$upname}_FETCH(r, z) ZEND_FETCH_RESOURCE(r, {$this-payload}, z, -1,
${$this-name}, le_{$this-name }); \
if(!r) { RETURN_FALSE; }
#define {$upname}_REGISTER(r) ZEND_REGISTER_RESOURCE(return_value, r,
le_{$this-name });
;
}
}
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/yp yp.c
hholzgraWed Feb 26 11:06:07 2003 EDT
Modified files:
/php4/ext/ypyp.c
Log:
changed to emalloc just to be safe
Index: php4/ext/yp/yp.c
diff -u php4/ext/yp/yp.c:1.35 php4/ext/yp/yp.c:1.36
--- php4/ext/yp/yp.c:1.35 Mon Feb 24 08:35:06 2003
+++ php4/ext/yp/yp.cWed Feb 26 11:06:06 2003
@@ -16,7 +16,7 @@
| Fredrik Ohrn|
+--+
*/
-/* $Id: yp.c,v 1.35 2003/02/24 13:35:06 hholzgra Exp $ */
+/* $Id: yp.c,v 1.36 2003/02/26 16:06:06 hholzgra Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -296,12 +296,12 @@
if (!err)
{
if (inkeylen) {
- char *key = malloc(inkeylen+1);
+ char *key = emalloc(inkeylen+1);
if(key) {
strncpy(key, inkey, inkeylen);
key[inkeylen] = '\0';
add_assoc_stringl_ex((zval *) indata, key, inkeylen+1,
inval, invallen, 1);
- free(key);
+ efree(key);
} else {
php_error(E_WARNING, Can't allocate %d bytes for key
buffer in yp_cat());
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/yp yp.c
hholzgraWed Feb 26 12:38:02 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/ypyp.c
Log:
MFphp5
Index: php4/ext/yp/yp.c
diff -u php4/ext/yp/yp.c:1.31.8.1 php4/ext/yp/yp.c:1.31.8.2
--- php4/ext/yp/yp.c:1.31.8.1 Tue Dec 31 11:35:47 2002
+++ php4/ext/yp/yp.cWed Feb 26 12:38:02 2003
@@ -16,7 +16,7 @@
| Fredrik Ohrn|
+--+
*/
-/* $Id: yp.c,v 1.31.8.1 2002/12/31 16:35:47 sebastian Exp $ */
+/* $Id: yp.c,v 1.31.8.2 2003/02/26 17:38:02 hholzgra Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -291,8 +291,17 @@
if (!err)
{
- if (inkeylen)
- add_assoc_stringl_ex((zval *)
indata,inkey,inkeylen,inval,invallen,1);
+ if (inkeylen) {
+ char *key = emalloc(inkeylen+1);
+ if(key) {
+ strncpy(key, inkey, inkeylen);
+ key[inkeylen] = '\0';
+ add_assoc_stringl_ex((zval *) indata, key, inkeylen+1,
inval, invallen, 1);
+ efree(key);
+ } else {
+ php_error(E_WARNING, Can't allocate %d bytes for key
buffer in yp_cat());
+ }
+ }
return 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4) /ext/yp yp.c
hholzgraWed Feb 26 13:01:00 2003 EDT
Modified files: (Branch: PHP_4)
/php4/ext/ypyp.c
Log:
MFphp5
Index: php4/ext/yp/yp.c
diff -u php4/ext/yp/yp.c:1.31.8.1 php4/ext/yp/yp.c:1.31.8.1.2.1
--- php4/ext/yp/yp.c:1.31.8.1 Tue Dec 31 11:35:47 2002
+++ php4/ext/yp/yp.cWed Feb 26 13:00:59 2003
@@ -16,7 +16,7 @@
| Fredrik Ohrn|
+--+
*/
-/* $Id: yp.c,v 1.31.8.1 2002/12/31 16:35:47 sebastian Exp $ */
+/* $Id: yp.c,v 1.31.8.1.2.1 2003/02/26 18:00:59 hholzgra Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -291,8 +291,17 @@
if (!err)
{
- if (inkeylen)
- add_assoc_stringl_ex((zval *)
indata,inkey,inkeylen,inval,invallen,1);
+ if (inkeylen) {
+ char *key = emalloc(inkeylen+1);
+ if(key) {
+ strncpy(key, inkey, inkeylen);
+ key[inkeylen] = '\0';
+ add_assoc_stringl_ex((zval *) indata, key, inkeylen+1,
inval, invallen, 1);
+ efree(key);
+ } else {
+ php_error(E_WARNING, Can't allocate %d bytes for key
buffer in yp_cat());
+ }
+ }
return 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard basic_functions.c
derick Wed Feb 26 14:25:24 2003 EDT Modified files: /php4/ext/standard basic_functions.c Log: - Whitespace Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.588 php4/ext/standard/basic_functions.c:1.589 --- php4/ext/standard/basic_functions.c:1.588 Mon Feb 24 16:56:18 2003 +++ php4/ext/standard/basic_functions.c Wed Feb 26 14:25:24 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.588 2003/02/24 21:56:18 pollita Exp $ */ +/* $Id: basic_functions.c,v 1.589 2003/02/26 19:25:24 derick Exp $ */ #include php.h #include php_streams.h @@ -950,10 +950,10 @@ PHP_INI_BEGIN() PHP_INI_ENTRY_EX(safe_mode_protected_env_vars, SAFE_MODE_PROTECTED_ENV_VARS, PHP_INI_SYSTEM, OnUpdateSafeModeProtectedEnvVars, NULL) PHP_INI_ENTRY_EX(safe_mode_allowed_env_vars, SAFE_MODE_ALLOWED_ENV_VARS, PHP_INI_SYSTEM, OnUpdateSafeModeAllowedEnvVars, NULL) - PHP_INI_ENTRY(date.default_latitude, DATE_DEFAULT_LATITUDE, PHP_INI_ALL, NULL) - PHP_INI_ENTRY(date.default_longitude, DATE_DEFAULT_LONGITUDE, PHP_INI_ALL, NULL) - PHP_INI_ENTRY(date.sunset_zenith,DATE_SUNSET_ZENITH, PHP_INI_ALL, NULL) - PHP_INI_ENTRY(date.sunrise_zenith,DATE_SUNRISE_ZENITH, PHP_INI_ALL, NULL) + PHP_INI_ENTRY(date.default_latitude, DATE_DEFAULT_LATITUDE, PHP_INI_ALL, NULL) + PHP_INI_ENTRY(date.default_longitude, DATE_DEFAULT_LONGITUDE, PHP_INI_ALL, NULL) + PHP_INI_ENTRY(date.sunset_zenith, DATE_SUNSET_ZENITH, PHP_INI_ALL, NULL) + PHP_INI_ENTRY(date.sunrise_zenith, DATE_SUNRISE_ZENITH, PHP_INI_ALL, NULL) PHP_INI_END() -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard file.c
derick Wed Feb 26 14:34:16 2003 EDT
Modified files:
/php4/ext/standard file.c
Log:
- Fix proto
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.314 php4/ext/standard/file.c:1.315
--- php4/ext/standard/file.c:1.314 Tue Feb 25 15:12:18 2003
+++ php4/ext/standard/file.cWed Feb 26 14:34:16 2003
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.314 2003/02/25 20:12:18 moriyoshi Exp $ */
+/* $Id: file.c,v 1.315 2003/02/26 19:34:16 derick Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2082,7 +2082,7 @@
}
/* }}} */
-/* {{{ proto int readfile(string filename [, int use_include_path])
+/* {{{ proto int readfile(string filename [, bool use_include_path])
Output a file or a URL */
PHP_FUNCTION(readfile)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard mail.c /main main.c
derick Wed Feb 26 15:04:17 2003 EDT
Modified files:
/php4/ext/standard mail.c
/php4/main main.c
Log:
- Added an extra ini setting with which extra commands can be forced to
the sendmail deamon on a per-vhost base. The value in this ini setting
will override all extra commands passed as the 5th parameter to mail()
and will work in Safe Mode.
@- Added an extra ini setting (mail_force_extra_paramaters) which forces
@ the addition of the specified parameters to be passed as extra
@ parameters to the sendmail binary. These parameters will always replace
@ the value of the 5th parameter to mail(), even in safe mode. (Derick)
Index: php4/ext/standard/mail.c
diff -u php4/ext/standard/mail.c:1.69 php4/ext/standard/mail.c:1.70
--- php4/ext/standard/mail.c:1.69 Mon Feb 24 14:41:18 2003
+++ php4/ext/standard/mail.cWed Feb 26 15:04:15 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mail.c,v 1.69 2003/02/24 19:41:18 iliaa Exp $ */
+/* $Id: mail.c,v 1.70 2003/02/26 20:04:15 derick Exp $ */
#include stdlib.h
#include ctype.h
@@ -86,6 +86,7 @@
char *subject=NULL, *extra_cmd=NULL;
int to_len, message_len, headers_len;
int subject_len, extra_cmd_len, i;
+ char *force_extra_parameters = INI_STR(mail_force_extra_parameters);
if (PG(safe_mode) (ZEND_NUM_ARGS() == 5)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, SAFE MODE Restriction in
effect. The fifth parameter is disabled in SAFE MODE.);
@@ -137,7 +138,9 @@
}
}
- if (extra_cmd) {
+ if (force_extra_parameters) {
+ extra_cmd = estrdup(force_extra_parameters);
+ } else if (extra_cmd) {
extra_cmd = php_escape_shell_cmd(extra_cmd);
}
Index: php4/main/main.c
diff -u php4/main/main.c:1.528 php4/main/main.c:1.529
--- php4/main/main.c:1.528 Wed Feb 19 11:17:15 2003
+++ php4/main/main.cWed Feb 26 15:04:16 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.528 2003/02/19 16:17:15 phanto Exp $ */
+/* $Id: main.c,v 1.529 2003/02/26 20:04:16 derick Exp $ */
/* {{{ includes
*/
@@ -327,6 +327,7 @@
PHP_INI_ENTRY(precision, 14,
PHP_INI_ALL,OnSetPrecision)
PHP_INI_ENTRY(sendmail_from, NULL,
PHP_INI_ALL,NULL)
PHP_INI_ENTRY(sendmail_path, DEFAULT_SENDMAIL_PATH, PHP_INI_SYSTEM,
NULL)
+ PHP_INI_ENTRY(mail_force_extra_parameters,NULL,
PHP_INI_SYSTEM, NULL)
PHP_INI_ENTRY(disable_functions, ,
PHP_INI_SYSTEM, NULL)
STD_PHP_INI_BOOLEAN(allow_url_fopen, 1,PHP_INI_ALL,
OnUpdateBool, allow_url_fopen,
php_core_globals, core_globals)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/yp yp.c
Please use strlcpy() instead of strncpy().
At 01:35 PM 2/24/2003 +, Hartmut Holzgraefe wrote:
hholzgraMon Feb 24 08:35:06 2003 EDT
Modified files:
/php4/ext/ypyp.c
Log:
key has to be zero-delimited
Index: php4/ext/yp/yp.c
diff -u php4/ext/yp/yp.c:1.34 php4/ext/yp/yp.c:1.35
--- php4/ext/yp/yp.c:1.34 Fri Jan 24 11:34:18 2003
+++ php4/ext/yp/yp.cMon Feb 24 08:35:06 2003
@@ -16,7 +16,7 @@
| Fredrik Ohrn|
+--+
*/
-/* $Id: yp.c,v 1.34 2003/01/24 16:34:18 iliaa Exp $ */
+/* $Id: yp.c,v 1.35 2003/02/24 13:35:06 hholzgra Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -295,8 +295,17 @@
if (!err)
{
- if (inkeylen)
- add_assoc_stringl_ex((zval *)
indata,inkey,inkeylen,inval,invallen,1);
+ if (inkeylen) {
+ char *key = malloc(inkeylen+1);
+ if(key) {
+ strncpy(key, inkey, inkeylen);
+ key[inkeylen] = '\0';
+ add_assoc_stringl_ex((zval *) indata, key,
inkeylen+1, inval, invallen, 1);
+ free(key);
+ } else {
+ php_error(E_WARNING, Can't allocate %d
bytes for key buffer in yp_cat());
+ }
+ }
return 0;
}
--
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
[PHP-CVS] cvs: php4 /ext/dba/libinifile inifile.c
helly Wed Feb 26 17:03:02 2003 EDT
Modified files:
/php4/ext/dba/libinifileinifile.c
Log:
if skip param of dba_fetch is -1 stop do not restart search after last element
Index: php4/ext/dba/libinifile/inifile.c
diff -u php4/ext/dba/libinifile/inifile.c:1.4 php4/ext/dba/libinifile/inifile.c:1.5
--- php4/ext/dba/libinifile/inifile.c:1.4 Sat Feb 22 18:47:09 2003
+++ php4/ext/dba/libinifile/inifile.c Wed Feb 26 17:03:00 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: inifile.c,v 1.4 2003/02/22 23:47:09 helly Exp $ */
+/* $Id: inifile.c,v 1.5 2003/02/26 22:03:00 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -44,7 +44,7 @@
/* {{{ inifile_version */
char *inifile_version()
{
- return 1.0, $Revision: 1.4 $;
+ return 1.0, $Revision: 1.5 $;
}
/* }}} */
@@ -261,8 +261,8 @@
/* specific instance or not same key - restart search */
/* the slow way: restart and seacrch */
php_stream_rewind(dba-fp);
+ inifile_line_free(dba-next);
}
- inifile_line_free(dba-next);
if (skip == -1) {
skip = 0;
}
@@ -273,7 +273,7 @@
/* allow faster access by updating key read into next
*/
inifile_line_free(dba-next);
dba-next = ln;
- dba-next.pos = php_stream_tell(dba-fp);;
+ dba-next.pos = php_stream_tell(dba-fp);
return val;
}
skip--;
@@ -285,7 +285,7 @@
}
}
inifile_line_free(ln);
- inifile_line_free(dba-next);
+ dba-next.pos = php_stream_tell(dba-fp);
return ln.val;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dba/libcdb cdb.c
helly Wed Feb 26 17:03:55 2003 EDT
Modified files:
/php4/ext/dba/libcdbcdb.c
Log:
make it faster
Index: php4/ext/dba/libcdb/cdb.c
diff -u php4/ext/dba/libcdb/cdb.c:1.6 php4/ext/dba/libcdb/cdb.c:1.7
--- php4/ext/dba/libcdb/cdb.c:1.6 Tue Dec 31 11:06:25 2002
+++ php4/ext/dba/libcdb/cdb.c Wed Feb 26 17:03:55 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: cdb.c,v 1.6 2002/12/31 16:06:25 sebastian Exp $ */
+/* $Id: cdb.c,v 1.7 2003/02/26 22:03:55 helly Exp $ */
/* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/
@@ -64,23 +64,14 @@
}
/* }}} */
-/* {{{ cdb_hashadd */
-static uint32 cdb_hashadd(uint32 h, unsigned char c)
-{
- h += (h 5);
- return h ^ c;
-}
-/* }}} */
-
/* {{{ cdb_hash */
uint32 cdb_hash(char *buf, unsigned int len)
{
uint32 h;
h = CDB_HASHSTART;
- while (len) {
- h = cdb_hashadd(h, *buf++);
- --len;
+ while (len--) {
+ h = ( h + (h 5)) ^ (*buf++);
}
return h;
}
@@ -197,6 +188,6 @@
/* {{{ cdb_version */
char *cdb_version()
{
- return 0.75, $Revision: 1.6 $;
+ return 0.75, $Revision: 1.7 $;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dba dba_flatfile.c
helly Wed Feb 26 17:05:32 2003 EDT
Modified files:
/php4/ext/dba dba_flatfile.c
Log:
ws
Index: php4/ext/dba/dba_flatfile.c
diff -u php4/ext/dba/dba_flatfile.c:1.11 php4/ext/dba/dba_flatfile.c:1.12
--- php4/ext/dba/dba_flatfile.c:1.11Tue Dec 31 11:06:24 2002
+++ php4/ext/dba/dba_flatfile.c Wed Feb 26 17:05:32 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dba_flatfile.c,v 1.11 2002/12/31 16:06:24 sebastian Exp $ */
+/* $Id: dba_flatfile.c,v 1.12 2003/02/26 22:05:32 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -53,8 +53,9 @@
{
FLATFILE_DATA;
- if (dba-nextkey.dptr)
+ if (dba-nextkey.dptr) {
efree(dba-nextkey.dptr);
+ }
pefree(dba, info-flagsDBA_PERSISTENT);
}
@@ -67,8 +68,10 @@
FLATFILE_GKEY;
gval = flatfile_fetch(dba, gkey TSRMLS_CC);
- if(gval.dptr) {
- if(newlen) *newlen = gval.dsize;
+ if (gval.dptr) {
+ if (newlen) {
+ *newlen = gval.dsize;
+ }
new = estrndup(gval.dptr, gval.dsize);
efree(gval.dptr);
}
@@ -104,7 +107,7 @@
FLATFILE_GKEY;
gval = flatfile_fetch(dba, gkey TSRMLS_CC);
- if(gval.dptr) {
+ if (gval.dptr) {
efree(gval.dptr);
return SUCCESS;
}
@@ -122,12 +125,14 @@
{
FLATFILE_DATA;
- if (dba-nextkey.dptr)
+ if (dba-nextkey.dptr) {
efree(dba-nextkey.dptr);
+ }
dba-nextkey = flatfile_firstkey(dba TSRMLS_CC);
- if(dba-nextkey.dptr) {
- if(newlen)
+ if (dba-nextkey.dptr) {
+ if (newlen) {
*newlen = dba-nextkey.dsize;
+ }
return estrndup(dba-nextkey.dptr, dba-nextkey.dsize);
}
return NULL;
@@ -137,15 +142,18 @@
{
FLATFILE_DATA;
- if(!dba-nextkey.dptr)
+ if (!dba-nextkey.dptr) {
return NULL;
+ }
- if (dba-nextkey.dptr)
+ if (dba-nextkey.dptr) {
efree(dba-nextkey.dptr);
+ }
dba-nextkey = flatfile_nextkey(dba TSRMLS_CC);
- if(dba-nextkey.dptr) {
- if(newlen)
+ if (dba-nextkey.dptr) {
+ if (newlen) {
*newlen = dba-nextkey.dsize;
+ }
return estrndup(dba-nextkey.dptr, dba-nextkey.dsize);
}
return NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dba dba.c
helly Wed Feb 26 17:07:50 2003 EDT
Modified files:
/php4/ext/dba dba.c
Log:
allow keys as array(group, name) for handler inifile
Index: php4/ext/dba/dba.c
diff -u php4/ext/dba/dba.c:1.83 php4/ext/dba/dba.c:1.84
--- php4/ext/dba/dba.c:1.83 Sat Feb 22 12:20:05 2003
+++ php4/ext/dba/dba.c Wed Feb 26 17:07:50 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dba.c,v 1.83 2003/02/22 17:20:05 helly Exp $ */
+/* $Id: dba.c,v 1.84 2003/02/26 22:07:50 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -103,19 +103,60 @@
/* these are used to get the standard arguments */
#define DBA_GET1
\
- if(ac != 1 || zend_get_parameters_ex(ac, id) != SUCCESS) { \
+ if(ac != 1 || zend_get_parameters_ex(ac, id) != SUCCESS) { \
WRONG_PARAM_COUNT;
\
}
+/* {{{ php_dba_myke_key */
+static size_t php_dba_make_key(zval **key, char **key_str, char **key_free TSRMLS_DC)
+{
+ if (Z_TYPE_PP(key) == IS_ARRAY) {
+ zval **group, **name;
+ HashPosition pos;
+ size_t len;
+
+ if (zend_hash_num_elements(Z_ARRVAL_PP(key)) != 2) {
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, Key does not have
exactly two elements: (key, name));
+ return -1;
+ }
+ zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(key), pos);
+ zend_hash_get_current_data_ex(Z_ARRVAL_PP(key), (void **) group,
pos);
+ zend_hash_move_forward_ex(Z_ARRVAL_PP(key), pos);
+ zend_hash_get_current_data_ex(Z_ARRVAL_PP(key), (void **) name, pos);
+ convert_to_string_ex(group);
+ convert_to_string_ex(name);
+ if (Z_STRLEN_PP(group) == 0) {
+ *key_str = Z_STRVAL_PP(name);
+ *key_free = NULL;
+ return Z_STRLEN_PP(name);
+ }
+ len = spprintf(key_str, 0, [%s]%s, Z_STRVAL_PP(group),
Z_STRVAL_PP(name));
+ *key_free = *key_str;
+ return len;
+ } else {
+ convert_to_string_ex(key);
+ *key_str = Z_STRVAL_PP(key);
+ *key_free = NULL;
+ return Z_STRLEN_PP(key);
+ }
+}
+/* }}} */
+
#define DBA_GET2
\
zval **key;
\
+ char *key_str, *key_free;
\
+ size_t key_len;
\
if(ac != 2 || zend_get_parameters_ex(ac, key, id) != SUCCESS) { \
WRONG_PARAM_COUNT;
\
}
\
- convert_to_string_ex(key)
+ if ((key_len = php_dba_make_key(key, key_str, key_free TSRMLS_CC) 0)) {\
+ RETURN_FALSE;
\
+ }
#define DBA_GET2_3
\
zval **key;
\
+ char *key_str, *key_free;
\
+ size_t key_len;
\
zval **tmp;
\
int skip = 0;
\
switch(ac) {
\
@@ -134,7 +175,21 @@
default:
\
WRONG_PARAM_COUNT;
\
}
\
- convert_to_string_ex(key)
+ if ((key_len = php_dba_make_key(key, key_str, key_free TSRMLS_CC) 0)) {\
+ RETURN_FALSE;
[PHP-CVS] cvs: php4 /ext/standard exec.c exec.h
iliaa Wed Feb 26 17:11:12 2003 EDT
Modified files:
/php4/ext/standard exec.c exec.h
Log:
1) Make the output of system() binary safe
2) Solved a memory leak when the return_value variable passed by reference is
not an integer in system()/exec()/passthru().
3) Solved a bug in exec(), which would make it append to the 2nd parameter
(passed by reference) if the parameter is an array instead of overwriting it.
4) Changed the code to use the streams code, resulting in a smaller code base.
5) Various cleanups resulting in reduction of overall code base inside the file
by ~ 1/3.
6) Speed improvements of ~2.5 times compared to previous performance (based on
attached PHP script).
Index: php4/ext/standard/exec.c
diff -u php4/ext/standard/exec.c:1.97 php4/ext/standard/exec.c:1.98
--- php4/ext/standard/exec.c:1.97 Tue Feb 25 18:52:34 2003
+++ php4/ext/standard/exec.cWed Feb 26 17:11:12 2003
@@ -12,10 +12,11 @@
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+--+
- | Author: Rasmus Lerdorf |
+ | Author: Rasmus Lerdorf [EMAIL PROTECTED] |
+ | Ilia Alshanetsky [EMAIL PROTECTED] |
+--+
*/
-/* $Id: exec.c,v 1.97 2003/02/25 23:52:34 iliaa Exp $ */
+/* $Id: exec.c,v 1.98 2003/02/26 22:11:12 iliaa Exp $ */
#include stdio.h
#include php.h
@@ -49,278 +50,201 @@
#include unistd.h
#endif
-/* {{{ php_Exec
+/* {{{ php_exec
* If type==0, only last line of output is returned (exec)
* If type==1, all lines will be printed and last lined returned (system)
* If type==2, all lines will be saved to given array (exec with $array)
* If type==3, output will be printed binary, no lines will be saved or returned
(passthru)
*
*/
-int php_Exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC)
+int php_exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC)
{
FILE *fp;
char *buf, *tmp=NULL;
- int buflen = 0;
- int t, l, output=1;
- int overflow_limit, lcmd, ldir;
- char *b, *c, *d=NULL;
- php_stream *stream = NULL;
- int pclose_return = 0;
+ int buflen, l, pclose_return;
+ char *cmd_p, *b, *c, *d=NULL;
+ php_stream *stream;
+ size_t bufl = 0;
#if PHP_SIGCHILD
void (*sig_handler)();
#endif
- buf = (char *) emalloc(EXEC_INPUT_BUF);
- buflen = EXEC_INPUT_BUF;
-
if (PG(safe_mode)) {
- lcmd = strlen(cmd);
- ldir = strlen(PG(safe_mode_exec_dir));
- l = lcmd + ldir + 2;
- overflow_limit = l;
- c = strchr(cmd, ' ');
- if (c) *c = '\0';
+ if ((c = strchr(cmd, ' '))) {
+ *c = '\0';
+ c++;
+ }
if (strstr(cmd, ..)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, No '..'
components allowed in path);
- efree(buf);
- return -1;
+ goto err;
}
- d = emalloc(l);
- strcpy(d, PG(safe_mode_exec_dir));
- overflow_limit -= ldir;
b = strrchr(cmd, PHP_DIR_SEPARATOR);
- if (b) {
- strcat(d, b);
- overflow_limit -= strlen(b);
- } else {
- strcat(d, /);
- strcat(d, cmd);
- overflow_limit-=(strlen(cmd)+1);
- }
+ spprintf(d, 0, %s%s%s%s, PG(safe_mode_exec_dir), (b ? : /), (b
? b : cmd), (c ? : ), (c ? c : ));
if (c) {
- *c = ' ';
- strncat(d, c, overflow_limit);
+ *(c - 1) = ' ';
}
- tmp = php_escape_shell_cmd(d);
+ cmd_p = php_escape_shell_cmd(d);
efree(d);
- d = tmp;
-#if PHP_SIGCHILD
- sig_handler = signal (SIGCHLD, SIG_DFL);
-#endif
-#ifdef PHP_WIN32
- fp = VCWD_POPEN(d, rb);
-#else
- fp = VCWD_POPEN(d, r);
-#endif
- if (!fp) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to fork
[%s], d);
- efree(d);
- efree(buf);
-#if PHP_SIGCHILD
- signal (SIGCHLD, sig_handler);
-#endif
- return -1;
- }
+ d = cmd_p;
+ } else {
+ cmd_p = cmd;
+ }
- } else { /* not safe_mode */
#if PHP_SIGCHILD
-
[PHP-CVS] cvs: php4(PHP_4_3) /main main.c
rasmus Wed Feb 26 17:17:35 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main main.c
Log:
Get rid of an unnecessary syscall on non-Windows. We don't need two
setitimer() calls here in order to reset the timer.
Index: php4/main/main.c
diff -u php4/main/main.c:1.512.2.11 php4/main/main.c:1.512.2.12
--- php4/main/main.c:1.512.2.11 Wed Feb 19 11:17:34 2003
+++ php4/main/main.cWed Feb 26 17:17:35 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.512.2.11 2003/02/19 16:17:34 phanto Exp $ */
+/* $Id: main.c,v 1.512.2.12 2003/02/26 22:17:35 rasmus Exp $ */
/* {{{ includes
*/
@@ -1581,7 +1581,9 @@
#if defined(ZEND_MULTIBYTE) defined(HAVE_MBSTRING)
php_mb_set_zend_encoding(TSRMLS_C);
#endif /* ZEND_MULTIBYTE HAVE_MBSTRING */
+#ifdef PHP_WIN32
zend_unset_timeout(TSRMLS_C);
+#endif
zend_set_timeout(INI_INT(max_execution_time));
retval = (zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, NULL, 3,
prepend_file_p, primary_file, append_file_p) == SUCCESS);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /main main.c
rasmus Wed Feb 26 17:19:01 2003 EDT
Modified files:
/php4/main main.c
Log:
MFB: Get rid of a redundant syscall on non-Windows
Index: php4/main/main.c
diff -u php4/main/main.c:1.529 php4/main/main.c:1.530
--- php4/main/main.c:1.529 Wed Feb 26 15:04:16 2003
+++ php4/main/main.cWed Feb 26 17:19:01 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.529 2003/02/26 20:04:16 derick Exp $ */
+/* $Id: main.c,v 1.530 2003/02/26 22:19:01 rasmus Exp $ */
/* {{{ includes
*/
@@ -1729,7 +1729,9 @@
#if defined(ZEND_MULTIBYTE) defined(HAVE_MBSTRING)
php_mb_set_zend_encoding(TSRMLS_C);
#endif /* ZEND_MULTIBYTE HAVE_MBSTRING */
+#ifdef PHP_WIN32
zend_unset_timeout(TSRMLS_C);
+#endif
zend_set_timeout(INI_INT(max_execution_time));
retval = (zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, NULL, 3,
prepend_file_p, primary_file, append_file_p) == SUCCESS);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/standard file.c /main php_streams.h /main/streams plain_wrapper.c
At 02:39 25.02.2003, Ilia Alshanetsky wrote: iliaa Mon Feb 24 20:39:07 2003 EDT Log: Added locking to streams. Allow PHP to automatically release locks on files when terminating the stream. Fixed bugs in the handling of the 3rd optional parameter to flock(). What about updating README.STREAMS ? regards marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd php_gd.h
pajoye Wed Feb 26 18:21:45 2003 EDT Modified files: /php4/ext/gdphp_gd.h Log: add imagesavealpha wrapper (Jukka Holappa [EMAIL PROTECTED], Pierre-Alain Joye) Index: php4/ext/gd/php_gd.h diff -u php4/ext/gd/php_gd.h:1.51 php4/ext/gd/php_gd.h:1.52 --- php4/ext/gd/php_gd.h:1.51 Sat Jan 25 20:15:02 2003 +++ php4/ext/gd/php_gd.hWed Feb 26 18:21:44 2003 @@ -1,4 +1,4 @@ -/* +/* +--+ | PHP Version 4| +--+ @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_gd.h,v 1.51 2003/01/26 01:15:02 pollita Exp $ */ +/* $Id: php_gd.h,v 1.52 2003/02/26 23:21:44 pajoye Exp $ */ #ifndef PHP_GD_H #define PHP_GD_H @@ -93,6 +93,7 @@ PHP_FUNCTION(imagefilledellipse); PHP_FUNCTION(imagefilledarc); PHP_FUNCTION(imagealphablending); +PHP_FUNCTION(imagesavealpha); PHP_FUNCTION(imagecolorallocatealpha); PHP_FUNCTION(imagecolorresolvealpha); PHP_FUNCTION(imagecolorclosestalpha); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd gd.c
pajoye Wed Feb 26 18:22:09 2003 EDT
Modified files:
/php4/ext/gdgd.c
Log:
add imagesavealpha wrapper (Jukka Holappa [EMAIL PROTECTED],
2 Pierre-Alain Joye)
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.250 php4/ext/gd/gd.c:1.251
--- php4/ext/gd/gd.c:1.250 Sat Feb 1 18:23:59 2003
+++ php4/ext/gd/gd.cWed Feb 26 18:22:09 2003
@@ -18,9 +18,9 @@
+--+
*/
-/* $Id: gd.c,v 1.250 2003/02/01 23:23:59 helly Exp $ */
+/* $Id: gd.c,v 1.251 2003/02/26 23:22:09 pajoye Exp $ */
-/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
+/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
/* Note that there is no code from the gd package in this file */
@@ -188,6 +188,7 @@
PHP_FE(imagefilledarc, NULL)
PHP_FE(imagefilledellipse, NULL)
PHP_FE(imagealphablending, NULL)
+ PHP_FE(imagesavealpha, NULL)
PHP_FE(imagecolorallocatealpha, NULL)
PHP_FE(imagecolorresolvealpha, NULL)
PHP_FE(imagecolorclosestalpha, NULL)
@@ -292,7 +293,7 @@
PHP_FE(imagepsbbox,
NULL)
#endif
PHP_FE(imagetypes,
NULL)
-
+
#if defined(HAVE_GD_JPG) defined(HAVE_GD_WBMP)
PHP_FE(jpeg2wbmp,
NULL)
#endif
@@ -301,7 +302,7 @@
#endif
#ifdef HAVE_GD_WBMP
PHP_FE(image2wbmp,
NULL)
-#endif
+#endif
#if HAVE_GD_BUNDLED
PHP_FE(imagelayereffect,NULL)
PHP_FE(imagecolormatch, NULL)
@@ -634,7 +635,7 @@
/* {{{ proto int imageloadfont(string filename)
Load a new font */
-PHP_FUNCTION(imageloadfont)
+PHP_FUNCTION(imageloadfont)
{
zval **file;
int hdr_size = sizeof(gdFont) - sizeof(char *);
@@ -662,7 +663,7 @@
* byte 8-11: (int) pixel width of each character
* byte 12-15: (int) pixel height of each character
* bytes 16-: (char) array with character data, one byte per pixel
-*in each character, for a total of
+*in each character, for a total of
*(nchars*width*height) bytes.
*/
font = (gdFontPtr)emalloc(sizeof(gdFont));
@@ -744,7 +745,7 @@
stylearr = emalloc(sizeof(int) * zend_hash_num_elements(HASH_OF(*styles)));
zend_hash_internal_pointer_reset_ex(HASH_OF(*styles), pos);
-
+
for (index=0;; zend_hash_move_forward_ex(HASH_OF(*styles), pos)) {
zval ** item;
@@ -794,7 +795,7 @@
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, IM) == FAILURE) {
ZEND_WRONG_PARAM_COUNT();
}
-
+
ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd);
RETURN_BOOL(im-trueColor);
@@ -815,7 +816,7 @@
ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd);
convert_to_boolean_ex(dither);
convert_to_long_ex(ncolors);
-
+
gdImageTrueColorToPalette(im, Z_LVAL_PP(dither), Z_LVAL_PP(ncolors));
RETURN_TRUE;
@@ -873,7 +874,7 @@
ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd);
convert_to_long_ex(thick);
-
+
gdImageSetThickness(im, Z_LVAL_PP(thick));
RETURN_TRUE;
@@ -890,7 +891,7 @@
if (ZEND_NUM_ARGS() != 6 || zend_get_parameters_ex(6, IM, cx, cy, w, h,
color) == FAILURE) {
ZEND_WRONG_PARAM_COUNT();
}
-
+
ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd);
convert_to_long_ex(cx);
@@ -937,7 +938,7 @@
gdImageFilledArc(im, Z_LVAL_PP(cx), Z_LVAL_PP(cy), Z_LVAL_PP(w), Z_LVAL_PP(h),
st, e, Z_LVAL_PP(col), Z_LVAL_PP(style));
RETURN_TRUE;
}
-/* }}} */
+/* }}} */
/* {{{ proto void imagealphablending(resource im, bool on)
Turn alpha blending mode on or off for the given image */
@@ -952,13 +953,34 @@
ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd);
convert_to_boolean_ex(blend);
-
+
gdImageAlphaBlending(im, Z_LVAL_PP(blend));
RETURN_TRUE;
}
/* }}} */
+#if HAVE_LIBGD20
+/* {{{ proto void imagesavealpha(resource im, bool on)
+ Include alpha channel to a saved image */
+PHP_FUNCTION(imagesavealpha)
+{
+ zval **IM, **save;
+
Re: [PHP-CVS] cvs: php4 /ext/gd gd.c
On Wed, 26 Feb 2003 23:22:09 - Pierre-Alain Joye [EMAIL PROTECTED] wrote: pajoyeWed Feb 26 18:22:09 2003 EDT Modified files: /php4/ext/gd gd.c Log: add imagesavealpha wrapper (Jukka Holappa [EMAIL PROTECTED], 2 Pierre-Alain Joye) :/ something has gone wrong with the editor. Sorry -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Wed Feb 26 19:35:54 2003 EDT Modified files: /CVSROOTavail Log: pear karma for Björn Kraus Index: CVSROOT/avail diff -u CVSROOT/avail:1.598 CVSROOT/avail:1.599 --- CVSROOT/avail:1.598 Tue Feb 25 19:22:08 2003 +++ CVSROOT/avail Wed Feb 26 19:35:53 2003 @@ -45,7 +45,7 @@ # The PEAR Team has access to the full PEAR tree, the PEAR portion of # the PHP 4 tree, the PEAR website, and the PEAR documentation. -avail|moh,sterling,jon,rael,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,jeichorn,bjoern,chregu,bkelly,tfromm,subjective,cox,fireclaw,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,maehdros,jasonlotito,dallen,lsmith,timmyg,pajoye,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,djanubis,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,ruibarreiros,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar|pear,peardoc +avail|moh,sterling,jon,rael,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,jeichorn,bjoern,chregu,bkelly,tfromm,subjective,cox,fireclaw,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,maehdros,jasonlotito,dallen,lsmith,timmyg,pajoye,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,djanubis,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,ruibarreiros,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn|pear,peardoc avail|cox,mj,vblavet,dickmann,tal|php4/pear avail|alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,antonio|pearweb -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
