- convert unicode messages to strings

- mark functions unicode safe
- fix test

diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c
index 1bdb3c13a1f1011cfc4e6ab4573ac016503c0e7a..4e4620add210005eff0cc55246b063de9a465c69 100644 (file)
--- a/ext/sysvmsg/sysvmsg.c
+++ b/ext/sysvmsg/sysvmsg.c
@@ -149,7 +149,7 @@ PHP_MINFO_FUNCTION(sysvmsg)
 }
 /* }}} */
 
-/* {{{ proto bool msg_set_queue(resource queue, array data)
+/* {{{ proto bool msg_set_queue(resource queue, array data) U
    Set information for a message queue */
 PHP_FUNCTION(msg_set_queue)
 {
@@ -192,7 +192,7 @@ PHP_FUNCTION(msg_set_queue)
 }
 /* }}} */
 
-/* {{{ proto array msg_stat_queue(resource queue)
+/* {{{ proto array msg_stat_queue(resource queue) U
    Returns information about a message queue */
 PHP_FUNCTION(msg_stat_queue)
 {
@@ -225,7 +225,7 @@ PHP_FUNCTION(msg_stat_queue)
 }
 /* }}} */
 
-/* {{{ proto resource msg_get_queue(int key [, int perms])
+/* {{{ proto resource msg_get_queue(int key [, int perms]) U
    Attach to a message queue */
 PHP_FUNCTION(msg_get_queue)
 {
@@ -254,7 +254,7 @@ PHP_FUNCTION(msg_get_queue)
 }
 /* }}} */
 
-/* {{{ proto bool msg_remove_queue(resource queue)
+/* {{{ proto bool msg_remove_queue(resource queue) U
    Destroy the queue */
 PHP_FUNCTION(msg_remove_queue)
 {
@@ -275,7 +275,7 @@ PHP_FUNCTION(msg_remove_queue)
 }
 /* }}} */
 
-/* {{{ proto mixed msg_receive(resource queue, int desiredmsgtype, int &msgtype, int maxsize, mixed message [, bool unserialize=true [, int flags=0 [, int errorcode]]])
+/* {{{ proto mixed msg_receive(resource queue, int desiredmsgtype, int &msgtype, int maxsize, mixed message [, bool unserialize=true [, int flags=0 [, int errorcode]]]) U
    Send a message of type msgtype (must be > 0) to a message queue */
 PHP_FUNCTION(msg_receive)
 {
@@ -358,7 +358,7 @@ PHP_FUNCTION(msg_receive)
 }
 /* }}} */
 
-/* {{{ proto bool msg_send(resource queue, int msgtype, mixed message [, bool serialize=true [, bool blocking=true [, int errorcode]]])
+/* {{{ proto bool msg_send(resource queue, int msgtype, mixed message [, bool serialize=true [, bool blocking=true [, int errorcode]]]) U
    Send a message of type msgtype (must be > 0) to a message queue */
 PHP_FUNCTION(msg_send)
 {
@@ -394,8 +394,14 @@ PHP_FUNCTION(msg_send)
                message_len = msg_var.len;
                smart_str_free(&msg_var);
        } else {
-               char *p;
+               char *p = NULL;
                switch (Z_TYPE_P(message)) {
+                       case IS_UNICODE:
+                               if (SUCCESS != zend_unicode_to_string(UG(runtime_encoding_conv), &p, &message_len, Z_USTRVAL_P(message), Z_USTRLEN_P(message) TSRMLS_CC)) {
+                                       RETURN_FALSE;
+                               }
+                               break;
+
                        case IS_STRING:
                                p = Z_STRVAL_P(message);
                                message_len = Z_STRLEN_P(message);

diff --git a/ext/sysvmsg/tests/001.phpt b/ext/sysvmsg/tests/001.phpt
index 4f57dba305137fd7d0c81b16317ab0a4583ffb58..3fb85a8ad686beccbad3852388c71293b750610d 100644 (file)
--- a/ext/sysvmsg/tests/001.phpt
+++ b/ext/sysvmsg/tests/001.phpt
@@ -5,7 +5,7 @@ send/receive serialized message.
 if (!extension_loaded("sysvmsg")) print "skip"; ?>
 --FILE--
 <?php 
-$key = ftok("./ext/sysvmsg/tests/001.phpt", "p");
+$key = ftok(__FILE__, "p");
 $q = msg_get_queue($key);
 msg_send($q, 1, "hello") or print "FAIL\n";
 $type = null;