Changeset 1995

Timestamp:

09/09/2007 11:59:22 AM (12 months ago)

Author:

jan

Message:

fixed #1341

- use strchr*( instead of index() to be POSIX compliant
- MYSQL_OPT_RECONNECT is 5.0.3+ only

Files:

• trunk/src/mod_mysql_vhost.c (modified) (2 diffs)

trunk/src/mod_mysql_vhost.c

@@ -140 +140 @@
                 buffer_copy_string_buffer(sel, s->core->select_vhost);
 
-                if (sel->used && (qmark = index(sel->ptr, '?'))) {
+                if (sel->used && (qmark = strchr(sel->ptr, '?'))) {
                         *qmark = '\0';
                         buffer_copy_string(s->mysql_pre, sel->ptr);
@@ -172 +172 @@
                         }
 
+#if MYSQL_VERSION_ID >= 50003
                         /* in mysql versions above 5.0.3 the reconnect flag is off by default */
                         my_bool reconnect = 1;
                         mysql_options(s->mysql, MYSQL_OPT_RECONNECT, &reconnect);
+#endif
 
 #define FOO(x) (s->core->x->used ? s->core->x->ptr : NULL)