dmitry Tue Jan 25 06:02:47 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/soap php_http.c
Log:
Fixed identation
http://cvs.php.net/diff.php/php-src/ext/soap/php_http.c?r1=1.55.2.9&r2=1.55.2.10&ty=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.55.2.9
php-src/ext/soap/php_http.c:1.55.2.10
--- php-src/ext/soap/php_http.c:1.55.2.9 Tue Jan 25 05:52:19 2005
+++ php-src/ext/soap/php_http.c Tue Jan 25 06:02:45 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_http.c,v 1.55.2.9 2005/01/25 10:52:19 dmitry Exp $ */
+/* $Id: php_http.c,v 1.55.2.10 2005/01/25 11:02:45 dmitry Exp $ */
#include "php_soap.h"
#include "ext/standard/base64.h"
@@ -430,7 +430,7 @@
/* HTTP Authentication */
if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_login",
sizeof("_login"), (void **)&login) == SUCCESS &&
Z_TYPE_PP(login) == IS_STRING) {
- zval **digest;
+ zval **digest;
if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_digest",
sizeof("_digest"), (void **)&digest) == SUCCESS) {
if (Z_TYPE_PP(digest) == IS_ARRAY) {
@@ -447,7 +447,7 @@
if (zend_hash_find(Z_ARRVAL_PP(digest),
"nc", sizeof("nc"), (void **)&tmp) == SUCCESS &&
Z_TYPE_PP(tmp) == IS_LONG) {
Z_LVAL_PP(tmp)++;
- sprintf(nc, "%08d",
Z_LVAL_PP(tmp));
+ sprintf(nc, "%08ld",
Z_LVAL_PP(tmp));
} else {
add_assoc_long(*digest, "nc",
1);
strcpy(nc, "00000001");
@@ -830,9 +830,9 @@
char *loc;
if ((loc = get_http_header_value(http_headers,"Location: ")) !=
NULL) {
- php_url *new_url = php_url_parse(loc);
- char *body;
- int body_size;
+ php_url *new_url = php_url_parse(loc);
+ char *body;
+ int body_size;
if (new_url != NULL) {
if (get_http_body(stream, !http_1_1,
http_headers, &body, &body_size TSRMLS_CC)) {
@@ -846,19 +846,19 @@
efree(http_body);
efree(loc);
if (new_url->scheme == NULL && new_url->path !=
NULL) {
- new_url->scheme = estrdup(phpurl->scheme);
- new_url->host = estrdup(phpurl->host);
- new_url->port = phpurl->port;
+ new_url->scheme =
estrdup(phpurl->scheme);
+ new_url->host = estrdup(phpurl->host);
+ new_url->port = phpurl->port;
if (new_url->path && new_url->path[0]
!= '/') {
- char *t =
phpurl->path?phpurl->path:"/";
- char *p = strrchr(t, '/');
- char *s = emalloc((p - t) +
strlen(new_url->path) + 2);
-
- strncpy(s, t, (p - t) + 1);
- s[(p - t) + 1] = 0;
- strcat(s, new_url->path);
- efree(new_url->path);
- new_url->path = s;
+ char *t =
phpurl->path?phpurl->path:"/";
+ char *p = strrchr(t, '/');
+ char *s = emalloc((p - t) +
strlen(new_url->path) + 2);
+
+ strncpy(s, t, (p - t) + 1);
+ s[(p - t) + 1] = 0;
+ strcat(s, new_url->path);
+ efree(new_url->path);
+ new_url->path = s;
}
}
phpurl = new_url;
@@ -892,8 +892,8 @@
*s = '\0';
++s;
if (*s == '"') {
- ++s;
- val = s;
+ ++s;
+ val = s;
while (*s != '\0' && *s != '"')
++s;
} else {
val = s;
@@ -919,7 +919,7 @@
}
if (digest != NULL) {
- php_url *new_url = emalloc(sizeof(php_url));
+ php_url *new_url = emalloc(sizeof(php_url));
#ifdef ZEND_ENGINE_2
digest->refcount--;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
