comparison: src/server/util/uri.cpp
src/server/util/uri.cpp
- changeset 24
- 1a7853a4257e
- parent 14
- b8bf95b39952
- child 70
- 4e6e812c1d97
equal
deleted
inserted
replaced
| 23:a2c8fc23c90e | 24:1a7853a4257e |
|---|---|
| 356 PRBool success = PR_TRUE; | 356 PRBool success = PR_TRUE; |
| 357 const char *in_ptr = uri; | 357 const char *in_ptr = uri; |
| 358 int in = 0; | 358 int in = 0; |
| 359 int in_len = len; | 359 int in_len = len; |
| 360 | 360 |
| 361 PR_ASSERT(uri != NULL); | 361 //PR_ASSERT(uri != NULL); // TODO |
| 362 | 362 |
| 363 char* canonPath = (char *)pool_malloc(pool, in_len+1); | 363 char* canonPath = (char *)pool_malloc(pool, in_len+1); |
| 364 char* out_ptr = canonPath; | 364 char* out_ptr = canonPath; |
| 365 | 365 |
| 366 if (!canonPath) { | 366 if (!canonPath) { |
| 485 | 485 |
| 486 /* ---------------------- util_canonicalize_redirect ---------------------- */ | 486 /* ---------------------- util_canonicalize_redirect ---------------------- */ |
| 487 | 487 |
| 488 NSAPI_PUBLIC char* util_canonicalize_redirect(pool_handle_t *pool, const char *baseUri, const char *newUri) | 488 NSAPI_PUBLIC char* util_canonicalize_redirect(pool_handle_t *pool, const char *baseUri, const char *newUri) |
| 489 { | 489 { |
| 490 PR_ASSERT(baseUri != NULL); | 490 //PR_ASSERT(baseUri != NULL); // TODO |
| 491 | 491 |
| 492 if (*newUri == '/') | 492 if (*newUri == '/') |
| 493 return util_canonicalize_uri(pool, newUri, strlen(newUri), NULL); | 493 return util_canonicalize_uri(pool, newUri, strlen(newUri), NULL); |
| 494 | 494 |
| 495 int bLen = strlen(baseUri); | 495 int bLen = strlen(baseUri); |
