Re: com php-src: cleanup file headers.: sapi/litespeed/lsapilib.c sapi/litespeed/lsapilib.h

On Thu, Jul 10, 2014 at 10:00 PM, George Wang <gwang@php.net> wrote: > Commit: d2f62ca4d0e679c1ff6f165d64a21e4121e4e8db > Author: George Wang <gwang@php.net> Thu, 10 Jul 2014 15:12:43 > -0400 > Parents: ec7c9d93b2952842bf9d3c58cff7680974896de3 > Branches: PHP-5.6.0 > > Link: > > http://git.php.net/?p=php-src.git;a=commitdiff;h=d2f62ca4d0e679c1ff6f165d64a21e4121e4e8db > > Log: > cleanup file headers. > > Changed paths: > M sapi/litespeed/lsapilib.c > M sapi/litespeed/lsapilib.h > > > Diff: > diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c > index 31cdb57..92c169f 100644 > --- a/sapi/litespeed/lsapilib.c > +++ b/sapi/litespeed/lsapilib.c > @@ -48,14 +48,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > LIABILITY, OR TORT > OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > > > -/*************************************************************************** > - lsapilib.c - description > - ------------------- > - begin : Mon Feb 21 2005 > - copyright : (C) 2005 by George Wang > - email : gwang@litespeedtech.com > - > ***************************************************************************/ > - > > #include <ctype.h> > #include <dlfcn.h> > diff --git a/sapi/litespeed/lsapilib.h b/sapi/litespeed/lsapilib.h > index efa1f53..cae1863 100644 > --- a/sapi/litespeed/lsapilib.h > +++ b/sapi/litespeed/lsapilib.h > @@ -48,14 +48,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > LIABILITY, OR TORT > OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > > > -/*************************************************************************** > - lsapilib.h - description > - ------------------- > - begin : Mon Feb 21 2005 > - copyright : (C) 2005 by George Wang > - email : gwang@litespeedtech.com > - > ***************************************************************************/ > - > > #ifndef _LSAPILIB_H_ > #define _LSAPILIB_H_ > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > Hi George, The PHP-X.Y.Z branches are only used by the Release Managers to be a base for tagging the new versions, others shouldn't merge/cherry-pick there. If you are unsure about our current git workflow, please check out https://wiki.php.net/vcs/gitfaq and https://wiki.php.net/vcs/gitworkflow Basically developers commit to the lowest possible PHP-X.Y branch(currently 5.3 is a no-go, and 5.4 is a mostly bugfix status) and then merge the commit upwards (watch out for properly setting the NEWS driver as mentioned in the wiki) until the master branch. -- Ferenc Kovács @Tyr43l - http://tyrael.hu