Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
01bd7985
Commit
01bd7985
authored
May 14, 2015
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Shuffle order of functions
parent
6764fbb5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
61 additions
and
61 deletions
+61
-61
cache_esi_deliver.c
bin/varnishd/cache/cache_esi_deliver.c
+61
-61
No files found.
bin/varnishd/cache/cache_esi_deliver.c
View file @
01bd7985
...
...
@@ -219,67 +219,6 @@ ved_decode_len(uint8_t **pp)
return
(
l
);
}
/*---------------------------------------------------------------------
* If a gzip'ed ESI object includes a ungzip'ed object, we need to make
* it looked like a gzip'ed data stream. The official way to do so would
* be to fire up libvgz and gzip it, but we don't, we fake it.
*
* First, we cannot know if it is ungzip'ed on purpose, the admin may
* know something we don't.
*
* What do you mean "BS ?"
*
* All right then...
*
* The matter of the fact is that we simply will not fire up a gzip in
* the output path because it costs too much memory and CPU, so we simply
* wrap the data in very convenient "gzip copy-blocks" and send it down
* the stream with a bit more overhead.
*/
static
int
__match_proto__
(
vdp_bytes
)
ved_pretend_gzip
(
struct
req
*
req
,
enum
vdp_action
act
,
void
**
priv
,
const
void
*
pv
,
ssize_t
l
)
{
uint8_t
buf1
[
5
],
buf2
[
5
];
const
uint8_t
*
p
;
uint16_t
lx
;
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
(
void
)
priv
;
if
(
act
==
VDP_INIT
||
act
==
VDP_FINI
)
return
(
0
);
p
=
pv
;
lx
=
65535
;
buf1
[
0
]
=
0
;
vle16enc
(
buf1
+
1
,
lx
);
vle16enc
(
buf1
+
3
,
~
lx
);
while
(
l
>
0
)
{
if
(
l
>=
65535
)
{
lx
=
65535
;
if
(
VDP_bytes
(
req
,
VDP_NULL
,
buf1
,
sizeof
buf1
))
return
(
-
1
);
}
else
{
lx
=
(
uint16_t
)
l
;
buf2
[
0
]
=
0
;
vle16enc
(
buf2
+
1
,
lx
);
vle16enc
(
buf2
+
3
,
~
lx
);
if
(
VDP_bytes
(
req
,
VDP_NULL
,
buf2
,
sizeof
buf2
))
return
(
-
1
);
}
if
(
VDP_bytes
(
req
,
VDP_NULL
,
p
,
lx
))
return
(
-
1
);
req
->
crc
=
crc32
(
req
->
crc
,
p
,
lx
);
req
->
l_crc
+=
lx
;
l
-=
lx
;
p
+=
lx
;
}
/* buf2 is local, have to flush */
return
(
VDP_bytes
(
req
,
VDP_FLUSH
,
NULL
,
0
));
}
/*---------------------------------------------------------------------
*/
...
...
@@ -473,6 +412,67 @@ VDP_ESI(struct req *req, enum vdp_action act, void **priv,
}
}
/*---------------------------------------------------------------------
* If a gzip'ed ESI object includes a ungzip'ed object, we need to make
* it looked like a gzip'ed data stream. The official way to do so would
* be to fire up libvgz and gzip it, but we don't, we fake it.
*
* First, we cannot know if it is ungzip'ed on purpose, the admin may
* know something we don't.
*
* What do you mean "BS ?"
*
* All right then...
*
* The matter of the fact is that we simply will not fire up a gzip in
* the output path because it costs too much memory and CPU, so we simply
* wrap the data in very convenient "gzip copy-blocks" and send it down
* the stream with a bit more overhead.
*/
static
int
__match_proto__
(
vdp_bytes
)
ved_pretend_gzip
(
struct
req
*
req
,
enum
vdp_action
act
,
void
**
priv
,
const
void
*
pv
,
ssize_t
l
)
{
uint8_t
buf1
[
5
],
buf2
[
5
];
const
uint8_t
*
p
;
uint16_t
lx
;
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
(
void
)
priv
;
if
(
act
==
VDP_INIT
||
act
==
VDP_FINI
)
return
(
0
);
p
=
pv
;
lx
=
65535
;
buf1
[
0
]
=
0
;
vle16enc
(
buf1
+
1
,
lx
);
vle16enc
(
buf1
+
3
,
~
lx
);
while
(
l
>
0
)
{
if
(
l
>=
65535
)
{
lx
=
65535
;
if
(
VDP_bytes
(
req
,
VDP_NULL
,
buf1
,
sizeof
buf1
))
return
(
-
1
);
}
else
{
lx
=
(
uint16_t
)
l
;
buf2
[
0
]
=
0
;
vle16enc
(
buf2
+
1
,
lx
);
vle16enc
(
buf2
+
3
,
~
lx
);
if
(
VDP_bytes
(
req
,
VDP_NULL
,
buf2
,
sizeof
buf2
))
return
(
-
1
);
}
if
(
VDP_bytes
(
req
,
VDP_NULL
,
p
,
lx
))
return
(
-
1
);
req
->
crc
=
crc32
(
req
->
crc
,
p
,
lx
);
req
->
l_crc
+=
lx
;
l
-=
lx
;
p
+=
lx
;
}
/* buf2 is local, have to flush */
return
(
VDP_bytes
(
req
,
VDP_FLUSH
,
NULL
,
0
));
}
/*---------------------------------------------------------------------
* Include an object in a gzip'ed ESI object delivery
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment