prepare v2.2.3

[m6w6/ext-pq] / src / php_pqconn.c

diff --git a/src/php_pqconn.c b/src/php_pqconn.c
index 32cc5264effd3e76264428d582ae7d5f25299415..19ea6f05ebcaebd0abb059d475c7bad802f29128 100644 (file)
--- a/src/php_pqconn.c
+++ b/src/php_pqconn.c
@@ -495,13 +495,8 @@ static void php_pqconn_object_write_def_auto_conv(void *o, zval *value)
 static void php_pqconn_object_read_lib_version(void *o, zval *return_value)
 {
        char ver[16];
-       int v = PQlibVersion();
 
-       if (v < 100000) {
-               slprintf(ver, sizeof(ver), "%d.%d.%d", v/10000, v/100%100, v%100);
-       } else {
-               slprintf(ver, sizeof(ver), "%d.%d", v/10000, v%100);
-       }
+       php_pq_version_to_string(PQlibVersion(), ver, sizeof(ver));
        RETVAL_STRING(ver);
 }
 #endif
@@ -518,13 +513,8 @@ static void php_pqconn_object_read_server_version(void *o, zval *return_value)
 {
        php_pqconn_object_t *obj = o;
        char ver[16];
-       int v = PQserverVersion(obj->intern->conn);
 
-       if (v < 100000) {
-               slprintf(ver, sizeof(ver), "%d.%d.%d", v/10000, v/100%100, v%100);
-       } else {
-               slprintf(ver, sizeof(ver), "%d.%d", v/10000, v%100);
-       }
+       php_pq_version_to_string(PQserverVersion(obj->intern->conn), ver, sizeof(ver));
        RETVAL_STRING(ver);
 }
 #endif
@@ -2170,19 +2160,19 @@ PHP_MINIT_FUNCTION(pqconn)
        ph.write = NULL;
 
 #ifdef HAVE_PQLIBVERSION
-       zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("libraryVersion"), ZEND_ACC_PUBLIC);
+       zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("libraryVersion"), ZEND_ACC_PUBLIC|ZEND_ACC_READONLY);
        ph.read = php_pqconn_object_read_lib_version;
        zend_hash_str_add_mem(&php_pqconn_object_prophandlers, ZEND_STRL("libraryVersion"), (void *) &ph, sizeof(ph));
 #endif
 
 #ifdef HAVE_PQPROTOCOLVERSION
-       zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("protocolVersion"), ZEND_ACC_PUBLIC);
+       zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("protocolVersion"), ZEND_ACC_PUBLIC|ZEND_ACC_READONLY);
        ph.read = php_pqconn_object_read_protocol_version;
        zend_hash_str_add_mem(&php_pqconn_object_prophandlers, ZEND_STRL("protocolVersion"), (void *) &ph, sizeof(ph));
 #endif
 
 #ifdef HAVE_PQSERVERVERSION
-       zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("serverVersion"), ZEND_ACC_PUBLIC);
+       zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("serverVersion"), ZEND_ACC_PUBLIC|ZEND_ACC_READONLY);
        ph.read = php_pqconn_object_read_server_version;
        zend_hash_str_add_mem(&php_pqconn_object_prophandlers, ZEND_STRL("serverVersion"), (void *) &ph, sizeof(ph));
 #endif