projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix error: redefinition of typedef 'php_http_message_t' during RHEL build
[m6w6/ext-http]
/
php_http_misc.c
diff --git
a/php_http_misc.c
b/php_http_misc.c
index 416e95d4f7727231c7ff28709c83d18dc24d4ad5..e4411e0aaf39efb2e654e46913d8287ec0beb001 100644
(file)
--- a/
php_http_misc.c
+++ b/
php_http_misc.c
@@
-6,17
+6,14
@@
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-201
0
, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-201
1
, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
+--------------------------------------------------------------------+
*/
-/* $Id $ */
-
-#include "php_http.h"
+#include "php_http_api.h"
#include <ext/standard/php_lcg.h>
#include <ext/standard/php_lcg.h>
-#include <ext/standard/php_string.h>
-#include <Zend/zend_exceptions.h>
+#include <zend_exceptions.h>
/* SLEEP */
/* SLEEP */
@@
-39,7
+36,7
@@
PHP_HTTP_API void php_http_sleep(double s)
#else
struct timeval timeout;
#else
struct timeval timeout;
- timeout.tv
.
sec = (time_t) s;
+ timeout.tv
_
sec = (time_t) s;
timeout.tv_usec = PHP_HTTP_USEC(s) % PHP_HTTP_MCROSEC;
select(0, NULL, NULL, NULL, &timeout);
timeout.tv_usec = PHP_HTTP_USEC(s) % PHP_HTTP_MCROSEC;
select(0, NULL, NULL, NULL, &timeout);
@@
-53,6
+50,10
@@
int php_http_match(const char *haystack_str, const char *needle_str, int flags)
{
int result = 0;
{
int result = 0;
+ if (!haystack_str || !needle_str) {
+ return result;
+ }
+
if (flags & PHP_HTTP_MATCH_FULL) {
if (flags & PHP_HTTP_MATCH_CASE) {
result = !strcmp(haystack_str, needle_str);
if (flags & PHP_HTTP_MATCH_FULL) {
if (flags & PHP_HTTP_MATCH_CASE) {
result = !strcmp(haystack_str, needle_str);