[prev in list] [next in list] [prev in thread] [next in thread]
List: pecl-cvs
Subject: [PECL-CVS] =?utf-8?q?svn:_/pecl/cubrid/trunk/_package.xml_php=5Fcubrid.c_php=5Fcubrid=5Fversion.h?=
From: Esen_Sagynov <cubrid () php ! net>
Date: 2012-08-28 9:28:48
Message-ID: svn-cubrid-1346146128-327337-533795873 () svn ! php ! net
[Download RAW message or body]
cubrid Tue, 28 Aug 2012 09:28:48 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=327337
Log:
Release PHP-8.4.1.0005
Changed paths:
U pecl/cubrid/trunk/package.xml
U pecl/cubrid/trunk/php_cubrid.c
U pecl/cubrid/trunk/php_cubrid_version.h
Modified: pecl/cubrid/trunk/package.xml
===================================================================
--- pecl/cubrid/trunk/package.xml 2012-08-28 05:04:19 UTC (rev 327336)
+++ pecl/cubrid/trunk/package.xml 2012-08-28 09:28:48 UTC (rev 327337)
@@ -10,10 +10,10 @@
<email>esen.sagynov@nhn.com</email>
<active>yes</active>
</lead>
- <date>2012-07-04</date>
- <time>14:31:30</time>
+ <date>2012-08-28</date>
+ <time>17:30:30</time>
<version>
- <release>8.4.1.0004</release>
+ <release>8.4.1.0005</release>
<api>8.4.1</api>
</version>
<stability>
@@ -22,6 +22,52 @@
</stability>
<license uri="http://www.php.net/license">PHP</license>
<notes>
+Fixed bugs:
+
+1) APIS-241: Fixed cubrid_real_escape_string function.
+ </notes>
+ <contents>
+ <dir name="/">
+ <file md5sum="83d1c567fc619477af5ce0a19510f545" name="win/php_cubrid.sln" \
role="src" /> + <file md5sum="769fdd8cd3d7e0cbce55b92903bda588" \
name="win/php_cubrid.vcproj" role="src" /> + <file \
md5sum="7c108dc1965c782a9b91f08e6cb7b6df" name="config.m4" role="src" /> + <file \
md5sum="811067abe7a4fbe9bfea53bce3fdd27b" name="config.w32" role="src" /> + <file \
md5sum="5f32e9def29b93c88f0db39c0df5048f" name="php_cubrid.c" role="src" /> + <file \
md5sum="443c969aab27b6f8ac4b9fe0a9755d35" name="php_cubrid.h" role="src" /> + <file \
md5sum="0f642f749c88681e8001b1ebc5c673cd" name="php_cubrid_version.h" role="src" /> + \
<file md5sum="f738b80e679d8c3b7739b40f7f455e07" name="php_cubrid.dsp" role="src" /> + \
<file md5sum="99bcccf262562820d7939b78420c1a77" name="README" role="doc" /> + <file \
md5sum="a92db66f7a23a574bde7aba8a7194839" name="build-guide.html" role="doc" /> + \
<file md5sum="4d5204301dd8f00f3d5016039bc5478d" name="release-notes.html" role="doc" \
/> + </dir>
+ </contents>
+ <dependencies>
+ <required>
+ <php>
+ <min>5.2.0</min>
+ </php>
+ <pearinstaller>
+ <min>1.4.0</min>
+ </pearinstaller>
+ </required>
+ </dependencies>
+ <providesextension>CUBRID</providesextension>
+ <extsrcrelease>
+ <configureoption default="autodetect" name="with-cubrid" prompt="CUBRID base \
install dir" /> + </extsrcrelease>
+ <changelog>
+
+ <release>
+ <version>
+ <release>8.4.1.0004</release>
+ <api>8.4.1</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.php.net/license">PHP</license>
+ <notes>
We have added functions about lob object in this version and these functions have \
been tested carefully. If you want to get more information about the bugs or if you \
need help, please go to http://jira.cubrid.org/browse/APIS.
@@ -57,37 +103,8 @@
Fixed bugs:
1) APIS-176: Resolve the memory growth when continually execute SQL statements on \
one connection and don't close request.
- </notes>
- <contents>
- <dir name="/">
- <file md5sum="83d1c567fc619477af5ce0a19510f545" name="win/php_cubrid.sln" \
role="src" />
- <file md5sum="769fdd8cd3d7e0cbce55b92903bda588" name="win/php_cubrid.vcproj" \
role="src" />
- <file md5sum="7c108dc1965c782a9b91f08e6cb7b6df" name="config.m4" role="src" />
- <file md5sum="811067abe7a4fbe9bfea53bce3fdd27b" name="config.w32" role="src" />
- <file md5sum="5f32e9def29b93c88f0db39c0df5048f" name="php_cubrid.c" role="src" />
- <file md5sum="443c969aab27b6f8ac4b9fe0a9755d35" name="php_cubrid.h" role="src" />
- <file md5sum="0f642f749c88681e8001b1ebc5c673cd" name="php_cubrid_version.h" \
role="src" />
- <file md5sum="f738b80e679d8c3b7739b40f7f455e07" name="php_cubrid.dsp" role="src" \
/>
- <file md5sum="99bcccf262562820d7939b78420c1a77" name="README" role="doc" />
- <file md5sum="a92db66f7a23a574bde7aba8a7194839" name="build-guide.html" \
role="doc" />
- <file md5sum="4d5204301dd8f00f3d5016039bc5478d" name="release-notes.html" \
role="doc" />
- </dir>
- </contents>
- <dependencies>
- <required>
- <php>
- <min>5.2.0</min>
- </php>
- <pearinstaller>
- <min>1.4.0</min>
- </pearinstaller>
- </required>
- </dependencies>
- <providesextension>CUBRID</providesextension>
- <extsrcrelease>
- <configureoption default="autodetect" name="with-cubrid" prompt="CUBRID base \
install dir" />
- </extsrcrelease>
- <changelog>
+ </notes>
+ </release>
<release>
<version>
Modified: pecl/cubrid/trunk/php_cubrid.c
===================================================================
--- pecl/cubrid/trunk/php_cubrid.c 2012-08-28 05:04:19 UTC (rev 327336)
+++ pecl/cubrid/trunk/php_cubrid.c 2012-08-28 09:28:48 UTC (rev 327337)
@@ -165,9 +165,6 @@
/* Max Cubrid supported charsets */
#define MAX_DB_CHARSETS 5
-/* Max Cubrid unescaped string len */
-#define MAX_UNESCAPED_STR_LEN 4096
-
typedef struct
{
int err_code;
@@ -4199,17 +4196,13 @@
ZEND_FUNCTION(cubrid_real_escape_string)
{
zval *conn_id = NULL;
- zend_bool no_backslash_escapes = TRUE;
char *unescaped_str = NULL;
int unescaped_str_len = 0;
- char *escaped_str;
- int escaped_str_len = 0;
+ char *escaped_str, *s;
+ int escaped_str_len = 0, i;
- char *s1, *s2;
- int i;
-
init_error();
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r",
@@ -4217,86 +4210,34 @@
return;
}
- if (unescaped_str_len > MAX_UNESCAPED_STR_LEN) {
- RETURN_FALSE;
- }
-
- s1 = unescaped_str;
for (i = 0; i < unescaped_str_len; i++) {
- switch (s1[i]) {
- case '\'':
+ if (unescaped_str[i] == '\'') {
escaped_str_len++;
-
- break;
- case '\n':
- case '\r':
- case '\t':
- case '_':
- case '%':
- case '`':
- case '"':
- case '\\':
- if (!no_backslash_escapes) {
- escaped_str_len++;
- }
-
- break;
- default:
- break;
}
-
escaped_str_len++;
}
- escaped_str = safe_emalloc(escaped_str_len + 1, sizeof(char), 0);
+ if (escaped_str_len == unescaped_str_len) {
+ RETURN_STRINGL(unescaped_str, unescaped_str_len, 1);
+ }
- s1 = unescaped_str;
- s2 = escaped_str;
- for (i = 0; i < unescaped_str_len; i++) {
- switch (s1[i]) {
- case '\'':
- if (!no_backslash_escapes) {
- *s2++ = '\\';
- } else {
- *s2++ = '\'';
- }
+ escaped_str = (char *) emalloc(unescaped_str_len + 1);
+ if (!escaped_str) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Memory allocation error");
+ RETURN_FALSE;
+ }
- break;
- case '\n':
- case '\r':
- case '\t':
- case '_':
- case '%':
- case '`':
- case '"':
- case '\\':
- if (!no_backslash_escapes) {
- *s2++ = '\\';
- }
-
- break;
- default:
- break;
+ s = escaped_str;
+ for (i = 0; i < unescaped_str_len; i++) {
+ if (unescaped_str[i] == '\'') {
+ *s++ = '\'';
+ *s++ = '\'';
+ } else {
+ *s++ = unescaped_str[i];
}
-
- switch (s1[i]) {
- case '\r':
- *s2++ = no_backslash_escapes ? s1[i] : 'r';
- break;
- case '\n':
- *s2++ = no_backslash_escapes ? s1[i] : 'n';
- break;
- case '\t':
- *s2++ = no_backslash_escapes ? s1[i] : 't';
- break;
- default:
- *s2++ = s1[i];
- break;
- }
}
- *s2 = '\0';
-
+ escaped_str[escaped_str_len] = '\0';
RETURN_STRINGL(escaped_str, escaped_str_len, 0);
}
Modified: pecl/cubrid/trunk/php_cubrid_version.h
===================================================================
--- pecl/cubrid/trunk/php_cubrid_version.h 2012-08-28 05:04:19 UTC (rev 327336)
+++ pecl/cubrid/trunk/php_cubrid_version.h 2012-08-28 09:28:48 UTC (rev 327337)
@@ -28,4 +28,4 @@
*
*/
-#define PHP_CUBRID_VERSION "8.4.1.0004"
+#define PHP_CUBRID_VERSION "8.4.1.0005"
--
PECL CVS Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic