]> granicus.if.org Git - php/commitdiff
- make getservbyname on windows behaves like *nux when proto is an empty string
authorPierre Joye <pajoye@php.net>
Sun, 24 Jan 2010 13:36:08 +0000 (13:36 +0000)
committerPierre Joye <pajoye@php.net>
Sun, 24 Jan 2010 13:36:08 +0000 (13:36 +0000)
ext/standard/basic_functions.c

index 5818d370de535463cc383d4268e6e94bfd7635f7..270d0fb898c02169bc8532bff70073ed663d4853 100644 (file)
@@ -5661,6 +5661,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) {