[PHP-CVS-DAILY] cvs: php4 / ChangeLog
changelog Sat Mar 15 20:32:49 2003 EDT Modified files: /php4 ChangeLog Log: ChangeLog update Index: php4/ChangeLog diff -u php4/ChangeLog:1.1295 php4/ChangeLog:1.1296 --- php4/ChangeLog:1.1295 Fri Mar 14 20:32:07 2003 +++ php4/ChangeLog Sat Mar 15 20:32:48 2003 @@ -1,3 +1,62 @@ +2003-03-15 Moriyoshi Koizumi [EMAIL PROTECTED] + +* tests/lang/bug22592.phpt: + + Added test for bug22592 + +2003-03-15 Hartmut Holzgraefe [EMAIL PROTECTED] + +* ext/mysqli/mysqli_api.c + ext/mysqli/mysqli_nonapi.c + ext/mysqli/mysqli_profiler.c: + lots of proto stuff + +* scripts/ext_skel_ng/extension_parser.php: + docbook fixes + +* scripts/ext_skel_ng/php_constant.php: + thinko fix to kill warnings + +* scripts/ext_skel_ng/php_resource.php: + docbook typo fix + +* scripts/ext_skel_ng/php_function.php: + make sure the function name in the proto matches the function + +2003-03-15 Marcus Boerger [EMAIL PROTECTED] + +* main/main.c: + fix Bug #21751 - the parameter was wrong when this code was introduced + +2003-03-15 Wez Furlong [EMAIL PROTECTED] + +* main/streams/cast.c + main/streams/plain_wrapper.c + main/streams/xp_socket.c: + 64bit fixes + +* ext/openssl/openssl.c: + fix proto + +* (PHP_4_3) + main/network.c + main/streams.c: + 64 bit fixes + +2003-03-15 Jani Taskinen [EMAIL PROTECTED] + +* NEWS: + And this never existed in any release either.. + +* (PHP_4_3) + php.ini-dist + php.ini-recommended: + MFH: allow_webdav_methods does not exist / is not needed anymore + +* php.ini-dist + php.ini-recommended: + allow_webdav_methods does not exist / is not needed anymore + 2003-03-14 Jay Smith [EMAIL PROTECTED] * ext/standard/browscap.c: @@ -1882,7 +1941,7 @@ * sapi/apache/libpre.c sapi/apache/php_apache_http.h: - Added missing headers and $Id: ChangeLog,v 1.1295 2003/03/15 01:32:07 changelog Exp $ tags. + Added missing headers and $Id: ChangeLog,v 1.1296 2003/03/16 01:32:48 changelog Exp $ tags. * sapi/cgi/config9.m4: MFB: Fixed bug #22356 (Do not add empty -I flags). @@ -2441,7 +2500,7 @@ main/streams/plain_wrapper.c main/streams/streams.c main/streams/userspace.c: - ws fixes + missing $Id: ChangeLog,v 1.1295 2003/03/15 01:32:07 changelog Exp $ tags, headers added + ws fixes + missing $Id: ChangeLog,v 1.1296 2003/03/16 01:32:48 changelog Exp $ tags, headers added 2003-02-19 Corne' Cornelius [EMAIL PROTECTED] @@ -3359,7 +3418,7 @@ * (PHP_4_3) sapi/cgi/cgi_main.c: - Added missing $Id: ChangeLog,v 1.1295 2003/03/15 01:32:07 changelog Exp $ tag + Added missing $Id: ChangeLog,v 1.1296 2003/03/16 01:32:48 changelog Exp $ tag 2003-02-14 Thies C. Arntzen [EMAIL PROTECTED]
[PHP-CVS] cvs: php4(PHP_4_3) /main network.c streams.c
wez Sat Mar 15 08:25:38 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main network.c streams.c
Log:
64 bit fixes
Index: php4/main/network.c
diff -u php4/main/network.c:1.83.2.4 php4/main/network.c:1.83.2.5
--- php4/main/network.c:1.83.2.4Tue Mar 4 20:28:45 2003
+++ php4/main/network.c Sat Mar 15 08:25:36 2003
@@ -16,7 +16,7 @@
| Streams work by Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: network.c,v 1.83.2.4 2003/03/05 01:28:45 wez Exp $ */
+/* $Id: network.c,v 1.83.2.5 2003/03/15 13:25:36 wez Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -1081,7 +1081,7 @@
return FAILURE;
#endif
if (ret){
- *ret = fdopen(sock-socket, stream-mode);
+ *(FILE**)ret = fdopen(sock-socket, stream-mode);
if (*ret)
return SUCCESS;
return FAILURE;
@@ -1094,7 +1094,7 @@
return FAILURE;
#endif
if (ret)
- *ret = (void*)sock-socket;
+ *(int*)ret = sock-socket;
return SUCCESS;
default:
return FAILURE;
Index: php4/main/streams.c
diff -u php4/main/streams.c:1.125.2.37 php4/main/streams.c:1.125.2.38
--- php4/main/streams.c:1.125.2.37 Thu Mar 6 15:58:19 2003
+++ php4/main/streams.c Sat Mar 15 08:25:38 2003
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: streams.c,v 1.125.2.37 2003/03/06 20:58:19 sesser Exp $ */
+/* $Id: streams.c,v 1.125.2.38 2003/03/15 13:25:38 wez Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -1517,7 +1517,7 @@
switch (castas) {
case PHP_STREAM_AS_STDIO:
if (ret) {
- *ret = data-file;
+ *(FILE**)ret = data-file;
data-fd = -1;
}
return SUCCESS;
@@ -1532,7 +1532,7 @@
}
if (ret) {
fflush(data-file);
- *ret = (void*)fd;
+ *(int**)ret = fd;
}
return SUCCESS;
default:
@@ -1959,7 +1959,7 @@
if (castas == PHP_STREAM_AS_STDIO) {
if (stream-stdiocast) {
if (ret) {
- *ret = stream-stdiocast;
+ *(FILE**)ret = stream-stdiocast;
}
goto exit_success;
}
@@ -1979,7 +1979,7 @@
if (ret == NULL)
goto exit_success;
- *ret = fopencookie(stream, stream-mode, PHP_STREAM_COOKIE_FUNCTIONS);
+ *(FILE**)ret = fopencookie(stream, stream-mode,
PHP_STREAM_COOKIE_FUNCTIONS);
if (*ret != NULL) {
off_t pos;
@@ -2022,7 +2022,7 @@
int retcode = php_stream_cast(newstream,
castas | flags, ret, show_err);
if (retcode == SUCCESS)
- rewind((FILE*)*ret);
+ rewind(*(FILE**)ret);
/* do some specialized cleanup */
if ((flags PHP_STREAM_CAST_RELEASE)) {
@@ -2071,7 +2071,7 @@
}
if (castas == PHP_STREAM_AS_STDIO ret)
- stream-stdiocast = *ret;
+ stream-stdiocast = *(FILE**)ret;
if (flags PHP_STREAM_CAST_RELEASE) {
php_stream_free(stream, PHP_STREAM_FREE_CLOSE_CASTED);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/openssl openssl.c
wez Sat Mar 15 08:29:34 2003 EDT
Modified files:
/php4/ext/openssl openssl.c
Log:
fix proto
Index: php4/ext/openssl/openssl.c
diff -u php4/ext/openssl/openssl.c:1.69 php4/ext/openssl/openssl.c:1.70
--- php4/ext/openssl/openssl.c:1.69 Thu Mar 6 18:07:26 2003
+++ php4/ext/openssl/openssl.c Sat Mar 15 08:29:34 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.69 2003/03/06 23:07:26 ddhill Exp $ */
+/* $Id: openssl.c,v 1.70 2003/03/15 13:29:34 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1587,7 +1587,7 @@
}
/* }}} */
-/* {{{ proto bool openssl_csr_new(array dn, resource privkey [, array extraattribs,
array configargs])
+/* {{{ proto bool openssl_csr_new(array dn, resource privkey [, array configargs,
array extraattribs])
Generates a privkey and CSR */
PHP_FUNCTION(openssl_csr_new)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /main/streams cast.c plain_wrapper.c xp_socket.c
wez Sat Mar 15 08:29:56 2003 EDT
Modified files:
/php4/main/streams cast.c plain_wrapper.c xp_socket.c
Log:
64bit fixes
Index: php4/main/streams/cast.c
diff -u php4/main/streams/cast.c:1.5 php4/main/streams/cast.c:1.6
--- php4/main/streams/cast.c:1.5Thu Feb 27 12:43:38 2003
+++ php4/main/streams/cast.cSat Mar 15 08:29:56 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: cast.c,v 1.5 2003/02/27 17:43:38 wez Exp $ */
+/* $Id: cast.c,v 1.6 2003/03/15 13:29:56 wez Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -163,7 +163,7 @@
if (castas == PHP_STREAM_AS_STDIO) {
if (stream-stdiocast) {
if (ret) {
- *ret = stream-stdiocast;
+ *(FILE**)ret = stream-stdiocast;
}
goto exit_success;
}
@@ -183,7 +183,7 @@
if (ret == NULL)
goto exit_success;
- *ret = fopencookie(stream, stream-mode, PHP_STREAM_COOKIE_FUNCTIONS);
+ *(FILE**)ret = fopencookie(stream, stream-mode,
PHP_STREAM_COOKIE_FUNCTIONS);
if (*ret != NULL) {
off_t pos;
@@ -226,7 +226,7 @@
int retcode = php_stream_cast(newstream,
castas | flags, ret, show_err);
if (retcode == SUCCESS)
- rewind((FILE*)*ret);
+ rewind(*(FILE**)ret);
/* do some specialized cleanup */
if ((flags PHP_STREAM_CAST_RELEASE)) {
@@ -275,7 +275,7 @@
}
if (castas == PHP_STREAM_AS_STDIO ret)
- stream-stdiocast = *ret;
+ stream-stdiocast = *(FILE**)ret;
if (flags PHP_STREAM_CAST_RELEASE) {
php_stream_free(stream, PHP_STREAM_FREE_CLOSE_CASTED);
Index: php4/main/streams/plain_wrapper.c
diff -u php4/main/streams/plain_wrapper.c:1.9 php4/main/streams/plain_wrapper.c:1.10
--- php4/main/streams/plain_wrapper.c:1.9 Sat Mar 1 12:27:23 2003
+++ php4/main/streams/plain_wrapper.c Sat Mar 15 08:29:56 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.9 2003/03/01 17:27:23 wez Exp $ */
+/* $Id: plain_wrapper.c,v 1.10 2003/03/15 13:29:56 wez Exp $ */
#include php.h
#include php_globals.h
@@ -487,7 +487,7 @@
data-file = fdopen(data-fd, stream-mode);
}
- *ret = data-file;
+ *(FILE**)ret = data-file;
data-fd = -1;
}
return SUCCESS;
@@ -505,7 +505,7 @@
fflush(data-file);
}
if (ret) {
- *ret = (void*)fd;
+ *(int*)ret = fd;
}
return SUCCESS;
default:
Index: php4/main/streams/xp_socket.c
diff -u php4/main/streams/xp_socket.c:1.7 php4/main/streams/xp_socket.c:1.8
--- php4/main/streams/xp_socket.c:1.7 Mon Mar 3 14:57:18 2003
+++ php4/main/streams/xp_socket.c Sat Mar 15 08:29:56 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_socket.c,v 1.7 2003/03/03 19:57:18 iliaa Exp $ */
+/* $Id: xp_socket.c,v 1.8 2003/03/15 13:29:56 wez Exp $ */
#include php.h
#include ext/standard/file.h
@@ -267,7 +267,7 @@
switch(castas) {
case PHP_STREAM_AS_STDIO:
if (ret){
- *ret = fdopen(sock-socket, stream-mode);
+ *(FILE**)ret = fdopen(sock-socket, stream-mode);
if (*ret)
return SUCCESS;
return FAILURE;
@@ -276,7 +276,7 @@
case PHP_STREAM_AS_FD:
case PHP_STREAM_AS_SOCKETD:
if (ret)
- *ret = (void*)sock-socket;
+ *(int*)ret = sock-socket;
return SUCCESS;
default:
return FAILURE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /main main.c
helly Sat Mar 15 11:39:35 2003 EDT
Modified files:
/php4/main main.c
Log:
fix Bug #21751 - the parameter was wrong when this code was introduced
Index: php4/main/main.c
diff -u php4/main/main.c:1.538 php4/main/main.c:1.539
--- php4/main/main.c:1.538 Wed Mar 12 07:00:22 2003
+++ php4/main/main.cSat Mar 15 11:39:35 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.538 2003/03/12 12:00:22 sesser Exp $ */
+/* $Id: main.c,v 1.539 2003/03/15 16:39:35 helly Exp $ */
/* {{{ includes
*/
@@ -959,7 +959,7 @@
php_start_ob_buffer_named(PG(output_handler), 0, 1 TSRMLS_CC);
} else if (PG(output_buffering)) {
if (PG(output_buffering)1) {
- php_start_ob_buffer(NULL, PG(output_buffering), 0
TSRMLS_CC);
+ php_start_ob_buffer(NULL, PG(output_buffering), 1
TSRMLS_CC);
} else {
php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /scripts/ext_skel_ng php_function.php
hholzgraSat Mar 15 17:34:33 2003 EDT
Modified files:
/php4/scripts/ext_skel_ng php_function.php
Log:
make sure the function name in the proto matches the function
Index: php4/scripts/ext_skel_ng/php_function.php
diff -u php4/scripts/ext_skel_ng/php_function.php:1.5
php4/scripts/ext_skel_ng/php_function.php:1.6
--- php4/scripts/ext_skel_ng/php_function.php:1.5 Fri Feb 28 01:37:05 2003
+++ php4/scripts/ext_skel_ng/php_function.php Sat Mar 15 17:34:32 2003
@@ -34,6 +34,11 @@
$return_type = ($this-is_type($tokens[$n])) ? $tokens[$n++] :
void;
if(! $this-is_name($tokens[$n])) return($tokens[$n] is not a
valid function name);
$function_name = $tokens[$n++];
+
+ if($function_name != $this-name) {
+ return proto function name is '$function_name'
instead of '{$this-name}';
+ }
+
if($tokens[$n]!='(') return('(' expected instead of
'$tokens[$n]');
if($tokens[++$n]!=')') {
for($param=0;$tokens[$n];$n++,$param++) {
@@ -192,7 +197,7 @@
function docbook_xml() {
$xml =
'?xml version=1.0 encoding=iso-8859-1?
-!-- $Revision: 1.5 $ --
+!-- $Revision: 1.6 $ --
refentry id=function.'.strtolower(str_replace(_,-,$this-name)).'
refnamediv
refname'.$this-name.'/refname
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /scripts/ext_skel_ng php_resource.php
hholzgraSat Mar 15 17:35:35 2003 EDT
Modified files:
/php4/scripts/ext_skel_ng php_resource.php
Log:
docbook typo fix
Index: php4/scripts/ext_skel_ng/php_resource.php
diff -u php4/scripts/ext_skel_ng/php_resource.php:1.1
php4/scripts/ext_skel_ng/php_resource.php:1.2
--- php4/scripts/ext_skel_ng/php_resource.php:1.1 Wed Feb 26 05:06:47 2003
+++ php4/scripts/ext_skel_ng/php_resource.php Sat Mar 15 17:35:34 2003
@@ -19,7 +19,7 @@
function docbook_xml($base) {
return
section id='$base.resources.{$this-name}'
- titlelitera{$this-name}/literal/title
+ titleliteral{$this-name}/literal/title
para
{$this-description}
/para
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /scripts/ext_skel_ng php_constant.php
hholzgraSat Mar 15 17:37:03 2003 EDT
Modified files:
/php4/scripts/ext_skel_ng php_constant.php
Log:
thinko fix to kill warnings
Index: php4/scripts/ext_skel_ng/php_constant.php
diff -u php4/scripts/ext_skel_ng/php_constant.php:1.1
php4/scripts/ext_skel_ng/php_constant.php:1.2
--- php4/scripts/ext_skel_ng/php_constant.php:1.1 Wed Feb 19 05:07:22 2003
+++ php4/scripts/ext_skel_ng/php_constant.php Sat Mar 15 17:37:03 2003
@@ -25,7 +25,7 @@
return trim(
row
entry
- constant
id='constant.strtolower(str_replace(_,-,$this-name)).'$name/constant
+ constant
id='constant.strtolower(str_replace(_,-,$this-name)).'{$this-name}/constant
(link linkend='language.types.integer'integer/link)
/entry
entry{$this-value}/entry
@@ -35,4 +35,4 @@
}
}
-?
\ No newline at end of file
+?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/mysqli mysqli_api.c mysqli_nonapi.c mysqli_profiler.c
hholzgraSat Mar 15 17:51:49 2003 EDT
Modified files:
/php4/ext/mysqlimysqli_api.c mysqli_nonapi.c mysqli_profiler.c
Log:
lots of proto stuff
Index: php4/ext/mysqli/mysqli_api.c
diff -u php4/ext/mysqli/mysqli_api.c:1.19 php4/ext/mysqli/mysqli_api.c:1.20
--- php4/ext/mysqli/mysqli_api.c:1.19 Mon Mar 10 20:19:21 2003
+++ php4/ext/mysqli/mysqli_api.cSat Mar 15 17:51:49 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.19 2003/03/11 01:19:21 georg Exp $
+ $Id: mysqli_api.c,v 1.20 2003/03/15 22:51:49 hholzgra Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -31,7 +31,7 @@
/* {{{ proto mixed mysqli_affected_rows(resource link)
-*/
+ Get number of affected rows in previous MySQL operation */
PHP_FUNCTION(mysqli_affected_rows)
{
MYSQL *mysql;
@@ -54,7 +54,7 @@
/* }}} */
/* {{{ proto bool mysqli_autocommit(resource link, bool mode)
-*/
+ Turn auto commit on or of */
PHP_FUNCTION(mysqli_autocommit)
{
MYSQL *mysql;
@@ -77,7 +77,8 @@
}
/* }}} */
-/* {{{ proto bool mysqli_bind_param(resource stmt, mixed, [mixed,])
+/* {{{ proto bool mysqli_bind_param(resource stmt, mixed variable, int type
[,mixed,])
+ Bind variables to a prepared statement as parameters
*/
PHP_FUNCTION(mysqli_bind_param)
@@ -204,7 +205,8 @@
}
/* }}} */
-/* {{{ proto bool mysqli_bind_result(resource stmt, mixed var, long len,
[mixed,long])
+/* {{{ proto bool mysqli_bind_result(resource stmt, mixed var, int len
[,mixed,int])
+ Bind variables to a prepared statement for result storage
*/
/* TODO:
@@ -358,7 +360,7 @@
/* }}} */
/* {{{ proto bool mysqli_change_user(resource link, string user, string password,
string database)
-*/
+ Change logged in user of the active connection */
PHP_FUNCTION(mysqli_change_user)
{
MYSQL *mysql;
@@ -386,6 +388,7 @@
/* }}} */
/* {{{ proto string mysqli_character_set_name(resource link)
+ Returns the name of the charater set used for this connection
*/
PHP_FUNCTION(mysqli_character_set_name)
{
@@ -410,7 +413,7 @@
/* }}} */
/* {{{ proto bool mysqli_close(resource link)
- close connection */
+ Close connection */
PHP_FUNCTION(mysqli_close)
{
zval*mysql_link;
@@ -439,6 +442,7 @@
/* }}} */
/* {{{ proto bool mysqli_commit(resource link)
+ Commit outstanding actions and close transaction
*/
PHP_FUNCTION(mysqli_commit)
{
@@ -460,7 +464,7 @@
/* }}} */
/* {{{ proto void mysqli_data_seek(resource result)
-*/
+ Move internal result pointer */
PHP_FUNCTION(mysqli_data_seek)
{
MYSQL_RES *result;
@@ -615,7 +619,7 @@
/* }}} */
/* {{{ proto int mysqli_errno(resource link)
-*/
+ Returns the numerical value of the error message from previous MySQL operation */
PHP_FUNCTION(mysqli_errno)
{
MYSQL *mysql;
@@ -631,7 +635,7 @@
/* }}} */
/* {{{ proto string mysql_error(resource link)
-*/
+ Returns the text of the error message from previous MySQL operation */
PHP_FUNCTION(mysqli_error)
{
MYSQL *mysql;
@@ -647,6 +651,7 @@
/* }}} */
/* {{{ proto int mysqli_execute(resource stmt)
+ Execute a prepared statement
*/
PHP_FUNCTION(mysqli_execute)
{
@@ -691,6 +696,7 @@
/* }}} */
/* {{{ proto int mysqli_fetch(resource stmt)
+ Fetch results from a prepared statement into the bound variables
*/
PHP_FUNCTION(mysqli_fetch)
{
@@ -761,7 +767,7 @@
/* }}} */
/* {{{ proto int mysql_fetch_field (resource result)
-*/
+ Get column information from a result and return as an object */
PHP_FUNCTION(mysqli_fetch_field)
{
MYSQL_RES *result;
@@ -874,7 +880,7 @@
/* }}} */
/* {{{ proto array mysqli_fetch_lengths (resource result)
-*/
+ Get the length of each output in a result */
PHP_FUNCTION(mysqli_fetch_lengths)
{
MYSQL_RES *result;
@@ -903,7 +909,7 @@
/* }}} */
/* {{{ proto array mysqli_fetch_row (resource result)
-*/
+ Get a result row as an enumerated array */
PHP_FUNCTION(mysqli_fetch_row)
{
php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_NUM);
@@ -928,7 +934,7 @@
/* }}} */
/* {{{ proto int mysqli_field_seek(resource link, int fieldnr)
-*/
+ Set result pointer to a specified field offset */
PHP_FUNCTION(mysqli_field_seek)
{
MYSQL_RES *result;
@@ -952,7 +958,7 @@
/* }}} */
/* {{{ proto int mysqli_field_tell(resource result)
-*/
+ Get current field offset of result pointer */
PHP_FUNCTION(mysqli_field_tell)
{
MYSQL_RES *result;
@@ -969,7 +975,7 @@
/* }}} */
/* {{{ proto int mysqli_free_result(resource result)
-*/
+ Free result memory */
PHP_FUNCTION(mysqli_free_result)
{
MYSQL_RES *result;
@@ -991,8 +997,8 @@
}
/* }}} */
-/* {{{ proto
[PHP-CVS] cvs: php4(PHP_4_3) /tests/lang bug22592.phpt
moriyoshi Sat Mar 15 18:37:53 2003 EDT
Added files: (Branch: PHP_4_3)
/php4/tests/langbug22592.phpt
Log:
MFH: added test for bug #22592
Index: php4/tests/lang/bug22592.phpt
+++ php4/tests/lang/bug22592.phpt
--TEST--
Bug #22592 (cascading assignments to strings with curly braces broken)
--FILE--
?php
function error_hdlr($errno, $errstr) {
echo [$errstr]\n;
}
set_error_handler('error_hdlr');
$i = 4;
$s = string;
$result = * *-*;
var_dump($result);
$result{6} = '*';
var_dump($result);
$result{1} = $i;
var_dump($result);
$result{3} = $s;
var_dump($result);
$result{7} = 0;
var_dump($result);
$a = $result{1} = $result{3} = '-';
var_dump($result);
$b = $result{3} = $result{5} = $s;
var_dump($result);
$c = $result{0} = $result{2} = $result{4} = $i;
var_dump($result);
$d = $result{6} = $result{8} = 5;
var_dump($result);
$e = $result{1} = $result{6};
var_dump($result);
var_dump($a, $b, $c, $d, $e);
$result{-1} = 'a';
?
--EXPECT--
string(5) * *-*
string(7) * *-* *
string(7) *4*-* *
string(7) *4*s* *
string(8) *4*s* *0
string(8) *-*-* *0
string(8) *-*s*s*0
string(8) 4-4s4s*0
string(9) 4-4s4s505
string(9) 454s4s505
string(1) -
string(6) string
int(4)
int(5)
string(1) 5
[Illegal string offset: -1]
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS /main main.c
helly Sat Mar 15 19:03:29 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main main.c
/php4 NEWS
Log:
MFH bugfix #21751
Index: php4/main/main.c
diff -u php4/main/main.c:1.512.2.16 php4/main/main.c:1.512.2.17
--- php4/main/main.c:1.512.2.16 Wed Mar 12 07:01:01 2003
+++ php4/main/main.cSat Mar 15 19:03:26 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.512.2.16 2003/03/12 12:01:01 sesser Exp $ */
+/* $Id: main.c,v 1.512.2.17 2003/03/16 00:03:26 helly Exp $ */
/* {{{ includes
*/
@@ -923,7 +923,7 @@
php_start_ob_buffer_named(PG(output_handler), 0, 1 TSRMLS_CC);
} else if (PG(output_buffering)) {
if (PG(output_buffering)1) {
- php_start_ob_buffer(NULL, PG(output_buffering), 0
TSRMLS_CC);
+ php_start_ob_buffer(NULL, PG(output_buffering), 1
TSRMLS_CC);
} else {
php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC);
}
Index: php4/NEWS
diff -u php4/NEWS:1.1247.2.141 php4/NEWS:1.1247.2.142
--- php4/NEWS:1.1247.2.141 Fri Mar 14 19:45:44 2003
+++ php4/NEWS Sat Mar 15 19:03:27 2003
@@ -89,6 +89,7 @@
- Fixed bug #21815 (fpassthru() ignored buffered data but complained anyway).
(Wez)
- Fixed bug #21809 (select would not always timeout during socket shutdown). (Wez)
+- Fixed bug #21751 (default output buffer could not be deleted). (Marcus)
- Fixed bug #21725 (return behaviour differs between include and require). (Zeev)
- Fixed bug #21713 (include remote files leaks descriptors on Solaris). (Wez)
- Fixed bug #21708 (ucwords() trouble again). (Moriyoshi)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/interbase interbase.c
sniper Sat Mar 15 19:37:01 2003 EDT
Modified files:
/php4/ext/interbase interbase.c
Log:
- Fixed bug #22709 (crash within interbase when database unavailable)
Index: php4/ext/interbase/interbase.c
diff -u php4/ext/interbase/interbase.c:1.101 php4/ext/interbase/interbase.c:1.102
--- php4/ext/interbase/interbase.c:1.101Fri Mar 14 12:37:44 2003
+++ php4/ext/interbase/interbase.c Sat Mar 15 19:37:01 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: interbase.c,v 1.101 2003/03/14 17:37:44 sniper Exp $ */
+/* $Id: interbase.c,v 1.102 2003/03/16 00:37:01 sniper Exp $ */
/* TODO: Arrays, roles?
@@ -609,7 +609,7 @@
php_info_print_table_start();
php_info_print_table_row(2, Interbase Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.101 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.102 $);
#ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, Dynamic Module, yes);
#endif
@@ -1578,6 +1578,11 @@
{
TSRMLS_FETCH();
+ if (ib_link == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid database link);
+ return FAILURE;
+ }
+
if (trans_n == 0 ib_link-trans[0] == NULL) {
if (isc_start_transaction(IB_STATUS, ib_link-trans[0], 1,
ib_link-link, 0, NULL)) {
_php_ibase_error(TSRMLS_C);
@@ -1613,6 +1618,11 @@
default:
WRONG_PARAM_COUNT;
break;
+ }
+
+ if (ib_link == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid database link);
+ RETURN_FALSE;
}
if (ib_link-trans[trans_n] == NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/interbase interbase.c
sniper Sun Mar 16 00:00:52 2003 EDT
Modified files:
/php4/ext/interbase interbase.c
Log:
WS CS fixes + some TSRM_FETCH() removals + pval - zval
Index: php4/ext/interbase/interbase.c
diff -u php4/ext/interbase/interbase.c:1.102 php4/ext/interbase/interbase.c:1.103
--- php4/ext/interbase/interbase.c:1.102Sat Mar 15 19:37:01 2003
+++ php4/ext/interbase/interbase.c Sun Mar 16 00:00:50 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: interbase.c,v 1.102 2003/03/16 00:37:01 sniper Exp $ */
+/* $Id: interbase.c,v 1.103 2003/03/16 05:00:50 sniper Exp $ */
/* TODO: Arrays, roles?
@@ -115,8 +115,7 @@
{NULL, NULL, NULL}
};
-zend_module_entry ibase_module_entry =
-{
+zend_module_entry ibase_module_entry = {
STANDARD_MODULE_HEADER,
interbase,
ibase_functions,
@@ -125,23 +124,19 @@
PHP_RINIT(ibase),
PHP_RSHUTDOWN(ibase),
PHP_MINFO(ibase),
-NO_VERSION_YET,
+ NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
};
#ifdef COMPILE_DL_INTERBASE
ZEND_GET_MODULE(ibase)
-
#define DL_MALLOC(size) malloc(size)
#define DL_STRDUP(str) strdup(str)
#define DL_FREE(ptr) free(ptr)
-
#else
-
#define DL_MALLOC(size) emalloc(size)
#define DL_STRDUP(str) estrdup(str)
#define DL_FREE(ptr) efree(ptr)
-
#endif
/* True globals, no need for thread safety */
@@ -155,9 +150,10 @@
#define IB_STATUS (IBG(status))
-/* Fill ib_link and trans_n with the correct database link and transaction slot
number. */
-
-static void get_link_trans(INTERNAL_FUNCTION_PARAMETERS, zval **link_id,
ibase_db_link **ib_link, int *trans_n, int *trans_id) {
+/* Fill ib_link and trans_n with the correct database link and transaction slot
number.
+ */
+static void get_link_trans(INTERNAL_FUNCTION_PARAMETERS, zval **link_id,
ibase_db_link **ib_link, int *trans_n, int *trans_id)
+{
int type;
void *resource = NULL;
ibase_tr_link *ib_trans;
@@ -184,12 +180,11 @@
}
#define RESET_ERRMSG { IBG(errmsg)[0] = '\0';}
-
#define TEST_ERRMSG ( IBG(errmsg)[0] != '\0')
/* sql variables union
- used for convert and binding input variables
-*/
+ * used for convert and binding input variables
+ */
typedef struct {
union {
short sval;
@@ -204,17 +199,16 @@
short sqlind;
} BIND_BUF;
-
/* get blob identifier from argument
- on empty unset argument ib_blob set to NULL
-*/
+ * on empty unset argument ib_blob set to NULL
+ */
#define GET_BLOB_ID_ARG(blob_arg, ib_blob)\
{\
if (Z_TYPE_P(blob_arg) == IS_STRING Z_STRLEN_P(blob_arg) == 0) {\
ib_blob = NULL;\
} else if (Z_TYPE_P(blob_arg) != IS_STRING\
|| Z_STRLEN_P(blob_arg) != sizeof(ibase_blob_handle)\
-|| ((ibase_blob_handle *)(Z_STRVAL_P(blob_arg)))-bl_handle
!= 0){\
+|| ((ibase_blob_handle *)(Z_STRVAL_P(blob_arg)))-bl_handle
!= 0) {\
_php_ibase_module_error(Invalid blob id);\
RETURN_FALSE;\
} else {\
@@ -222,10 +216,9 @@
}\
}
-
/* get blob handle from argument
- note: blob already open when handle active
-*/
+ * note: blob already open when handle active
+ */
#define GET_BLOB_HANDLE_ARG(blob_arg, blob_ptr) \
{ \
int type; \
@@ -237,7 +230,8 @@
} \
}
-/* blob information struct */
+/* blob information struct
+ */
typedef struct {
ISC_LONG max_segment; /* Length of longest segment */
ISC_LONG num_segments; /* Total number of segments */
@@ -260,12 +254,13 @@
if (IBG(errmsg[0])) {
RETURN_STRING(IBG(errmsg), 1);
}
+
RETURN_FALSE;
}
/* }}} */
/* {{{ _php_ibase_error(TSRMLS_D)
-print interbase error and save it for ibase_errmsg() */
+ print interbase error and save it for ibase_errmsg() */
static void _php_ibase_error(TSRMLS_D)
{
char *s;
@@ -273,16 +268,18 @@
s = IBG(errmsg);
statusp = IB_STATUS;
+
while ((s - IBG(errmsg)) MAX_ERRMSG - (IBASE_MSGSIZE + 2)
isc_interprete(s, statusp)) {
strcat(IBG(errmsg), );
s = IBG(errmsg) + strlen(IBG(errmsg));
}
+
php_error_docref(NULL TSRMLS_CC, E_WARNING, %s, IBG(errmsg));
}
/* }}} */
/* {{{ _php_ibase_module_error()
- print php interbase module error and save it for ibase_errmsg() */
+ print php interbase module error and save it for ibase_errmsg() */
static void _php_ibase_module_error(char *msg, ...)
{
va_list ap;
@@ -300,8 +297,8 @@
/* destructors -- */
-/* {{{ _php_ibase_free_xsqlda() */
-/* not actual destructor ... */
+/* {{{ _php_ibase_free_xsqlda() (not actual destructor)
+ */
static void _php_ibase_free_xsqlda(XSQLDA *sqlda)
{
int i;
@@ -313,19 +310,20 @@
var = sqlda-sqlvar;
