]> granicus.if.org Git - php/commitdiff
- make getservbyname on windows behaves like *nux when proto is an empty string
authorPierre Joye <pajoye@php.net>
Thu, 4 Feb 2010 09:04:37 +0000 (09:04 +0000)
committerPierre Joye <pajoye@php.net>
Thu, 4 Feb 2010 09:04:37 +0000 (09:04 +0000)
ext/standard/basic_functions.c

index f29df3cec3bc92520c89de1b88b02912c0225053..c3693f74b82045aac6b2d7092c865d192ae530a2 100644 (file)
@@ -5582,6 +5582,15 @@ PHP_FUNCTION(getservbyname)
                return;
        }
 
+
+/* empty string behaves like NULL on windows implementation of 
+   getservbyname. Let be portable instead. */
+#ifdef PHP_WIN32
+       if (proto_len == 0) {
+               RETURN_FALSE;
+       }
+#endif
+
        serv = getservbyname(name, proto);
 
        if (serv == NULL) {