Changed files:
php-no_php_pcre_in_SAPI_c.patch -> 1.2.2.1
-diff -Nur php-4.1.2.orig/main/SAPI.c php-4.1.2/main/SAPI.c
---- php-4.1.2.orig/main/SAPI.c Mon Jan 14 14:43:03 2002
-+++ php-4.1.2/main/SAPI.c Wed Feb 27 15:21:13 2002
-@@ -25,9 +25,6 @@
+diff -urN php-4_2_0RC3.org/main/SAPI.c php-4_2_0RC3/main/SAPI.c
+--- php-4_2_0RC3.org/main/SAPI.c Sat Apr 13 01:18:30 2002
++++ php-4_2_0RC3/main/SAPI.c Sat Apr 13 01:38:42 2002
+@@ -27,9 +27,6 @@
#include "SAPI.h"
#include "ext/standard/php_string.h"
#include "ext/standard/pageinfo.h"
#include "SAPI.h"
#include "ext/standard/php_string.h"
#include "ext/standard/pageinfo.h"
#ifdef ZTS
#include "TSRM.h"
#endif
#ifdef ZTS
#include "TSRM.h"
#endif
} else if (!STRCASECMP(header_line, "WWW-Authenticate")) { /* HTTP Authentication */
int newlen;
char *result, *newheader;
} else if (!STRCASECMP(header_line, "WWW-Authenticate")) { /* HTTP Authentication */
int newlen;
char *result, *newheader;
- efree(result);
- conv_len = sprintf(conv_temp," realm=\"%ld\"",myuid);
- result = emalloc(ptr_len+conv_len+1);
- efree(result);
- conv_len = sprintf(conv_temp," realm=\"%ld\"",myuid);
- result = emalloc(ptr_len+conv_len+1);
-- result_len = ptr_len + conv_len;
+- result_len = ptr_len+conv_len;
- memcpy(result, ptr, ptr_len);
- memcpy(result+ptr_len, conv_temp, conv_len);
- *(result+ptr_len+conv_len) = '\0';
- memcpy(result, ptr, ptr_len);
- memcpy(result+ptr_len, conv_temp, conv_len);
- *(result+ptr_len+conv_len) = '\0';
- efree(result);
- efree(Z_STRVAL_P(repl_temp));
- efree(repl_temp);
- efree(result);
- efree(Z_STRVAL_P(repl_temp));
- efree(repl_temp);
-#else
if(PG(safe_mode)) {
myuid = php_getuid();
result = emalloc(32);
-#else
if(PG(safe_mode)) {
myuid = php_getuid();
result = emalloc(32);
sapi_header.header_len = newlen;
efree(result);
}
sapi_header.header_len = newlen;
efree(result);
}