base

Merge change 21442 into eclair

* changes:
  Fix a cookie bug. If "secure" is in the end of the string, it was ignored.