Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deduplicate macros, Fix memleak in PHP < 5.4 #916

Merged
merged 2 commits into from Jul 25, 2013
Merged

Deduplicate macros, Fix memleak in PHP < 5.4 #916

merged 2 commits into from Jul 25, 2013

Conversation

ghost
Copy link

@ghost ghost commented Jul 25, 2013

See #802, #910, #914

Bonus: free all allocated memory on fatal error without segmentation faults (should we backport this to 1.2.1?)

@phalcon
Copy link
Collaborator

phalcon commented Jul 25, 2013

This can't be merged, could you please rebase it?

@ghost
Copy link
Author

ghost commented Jul 25, 2013

Rebased against current HEAD

@ghost
Copy link
Author

ghost commented Jul 25, 2013

Build for 5.3.3 failed due to Travis error:

Cloning into 'php-tests/library/Mustache'...
fatal: Could not read from remote repository.

phalcon pushed a commit that referenced this pull request Jul 25, 2013
Deduplicate macros, Fix memleak in PHP < 5.4
@phalcon phalcon merged commit 07aeec0 into phalcon:1.3.0 Jul 25, 2013
@phalcon
Copy link
Collaborator

phalcon commented Jul 25, 2013

@niden merged 1.3.0 into master, so I expect developers install from master, no?

@ghost ghost deleted the issue-802 branch July 25, 2013 16:25
@ghost
Copy link
Author

ghost commented Jul 25, 2013

I have a branch, 1.2.1-sj with all bug fixes since 1.2.1 (only bug fixes, no new functionality). We can merge it as 1.2.2 if you want once all Travis tests pass.

@niden
Copy link
Member

niden commented Jul 25, 2013

Vladimir, please merge into 1.3.0 which right now is in sync with master.

Thanks!

@ghost
Copy link
Author

ghost commented Jul 25, 2013

OK, I want to try to fix #911 first.

1.3.0 is c307a28
master is 892bc34
1.2.1 is e2fa114

Am I missing something?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants