cvs: php4(PHP_4_2_0) /main SAPI.c

derick          Wed Jul 24 06:01:33 2002 EDT

  Modified files:              (Branch: PHP_4_2_0)
    /php4/main  SAPI.c 
  Log:
  - MFH for fix for bug #18268
  
  
Index: php4/main/SAPI.c
diff -u php4/main/SAPI.c:1.129.2.1 php4/main/SAPI.c:1.129.2.2
--- php4/main/SAPI.c:1.129.2.1  Sun Jun 23 13:15:07 2002
+++ php4/main/SAPI.c    Wed Jul 24 06:01:31 2002
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: SAPI.c,v 1.129.2.1 2002/06/23 17:15:07 sesser Exp $ */
+/* $Id: SAPI.c,v 1.129.2.2 2002/07/24 10:01:31 derick Exp $ */
 
 #include <ctype.h>
 #include <sys/stat.h>
@@ -27,7 +27,7 @@
 #include "SAPI.h"
 #include "ext/standard/php_string.h"
 #include "ext/standard/pageinfo.h"
-#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
 #include "ext/pcre/php_pcre.h"
 #endif
 #ifdef ZTS
@@ -470,15 +470,16 @@
                        } else if (!STRCASECMP(header_line, 
"WWW-Authenticate")) { /* HTTP Authentication */
                                int newlen;
                                char *result, *newheader;
-#if HAVE_PCRE || HAVE_BUNDLED_PCRE
-                               zval *repl_temp;
-                               char *ptr = colon_offset+1;
-                               int ptr_len=0, result_len = 0;
-#endif
 
                                SG(sapi_headers).http_response_code = 401; /* 
authentication-required */
-#if HAVE_PCRE || HAVE_BUNDLED_PCRE
-                               if(PG(safe_mode)) {
+
+                               if(PG(safe_mode)) 
+#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
+                               {
+                                       zval *repl_temp;
+                                       char *ptr = colon_offset+1;
+                                       int ptr_len=0, result_len = 0;
+
                                        myuid = php_getuid();
 
                                        ptr_len = strlen(ptr);
@@ -529,7 +530,7 @@
                                        efree(repl_temp);
                                } 
 #else
-                               if(PG(safe_mode)) {
+                               {
                                        myuid = php_getuid();
                                        result = emalloc(32);
                                        newlen = sprintf(result, 
"WWW-Authenticate: %ld", myuid);       



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php