cvs: php-src(PHP_4_3) /ext/sysvmsg sysvmsg.c /ext/sysvmsg/tests 002.phpt
| From: | Antony Dovgal | Date: | Mon, 24 Jan 2005 14:23:37 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /ext/sysvmsg sysvmsg.c /ext/sysvmsg/tests 002.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-30095@lists.php.net to get a copy of this message | ||
tony2001 Mon Jan 24 09:23:37 2005 EDT
Added files: (Branch: PHP_4_3)
/php-src/ext/sysvmsg/tests 002.phpt
Modified files:
/php-src/ext/sysvmsg sysvmsg.c
Log:
MFH: fix msg_recieve() & add test
http://cvs.php.net/diff.php/php-src/ext/sysvmsg/sysvmsg.c?r1=1.4.2.3&r2=1.4.2.4&ty=u
Index: php-src/ext/sysvmsg/sysvmsg.c
diff -u php-src/ext/sysvmsg/sysvmsg.c:1.4.2.3 php-src/ext/sysvmsg/sysvmsg.c:1.4.2.4
--- php-src/ext/sysvmsg/sysvmsg.c:1.4.2.3 Mon Sep 22 19:28:08 2003
+++ php-src/ext/sysvmsg/sysvmsg.c Mon Jan 24 09:23:36 2005
@@ -15,7 +15,7 @@
| Authors: Wez Furlong <wez@thebrainroom.com |
+----------------------------------------------------------------------+
*/
-/* $Id: sysvmsg.c,v 1.4.2.3 2003/09/22 23:28:08 iliaa Exp $ */
+/* $Id: sysvmsg.c,v 1.4.2.4 2005/01/24 14:23:36 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -120,7 +120,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "sysvmsg support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.4.2.3 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.4.2.4 $");
php_info_print_table_end();
}
/* }}} */
@@ -307,6 +307,7 @@
/* got it! */
ZVAL_LONG(out_msgtype, messagebuffer->mtype);
+ RETVAL_TRUE;
if (do_unserialize) {
php_unserialize_data_t var_hash;
zval *tmp = NULL;
@@ -324,7 +325,6 @@
} else {
ZVAL_STRINGL(out_message, messagebuffer->mtext, result, 1);
}
- RETVAL_TRUE;
} else if (zerrcode) {
ZVAL_LONG(zerrcode, errno);
}
http://cvs.php.net/co.php/php-src/ext/sysvmsg/tests/002.phpt?r=1.1&p=1
Index: php-src/ext/sysvmsg/tests/002.phpt
+++ php-src/ext/sysvmsg/tests/002.phpt
--TEST--
msg_recieve() should return false when unserialize() failed
--SKIPIF--
<?php if (!extension_loaded("sysvmsg")) die("skip sysvmsg extenions is not
available")?>
--FILE--
<?php
$queue = msg_get_queue (ftok(__FILE__, 'r'), 0600);
if (!msg_send ($queue, 1, 'Hi', false /* ! no_ser*/, true/*block*/, $msg_err)) {
die("error\n");
}
var_dump($res = msg_receive ($queue, 1, $msg_type, 16384, $msg, true, 0, $msg_error));
echo "Done\n";
?>
--EXPECTF--
Warning: msg_receive(): message corrupted in %s002.php on line %d
bool(false)
Done